diff --git a/aws/retry/middleware.go b/aws/retry/middleware.go index 03314d352b2..c1c32f824e3 100644 --- a/aws/retry/middleware.go +++ b/aws/retry/middleware.go @@ -175,28 +175,20 @@ func setRetryMetadata(ctx context.Context, metadata retryMetadata) context.Conte return context.WithValue(ctx, retryMetadataKey{}, metadata) } -// AwsRetryMiddlewareConfig interface for retry middleware config -type AwsRetryMiddlewareConfig interface { - GetRetryer() Retryer -} - -// AwsRetryMiddlewares represents the Aws middleware's for Retry -type AwsRetryMiddlewares struct { - AttemptMiddleware *AttemptMiddleware - MetricsHeaderMiddleware *MetricsHeaderMiddleware +// AddRetryMiddlewaresOptions is the set of options that can be passed to AddRetryMiddlewares for configuring retry +// associated middleware. +type AddRetryMiddlewaresOptions struct { + Retryer Retryer } // AddRetryMiddlewares adds retry middleware to operation middleware stack -func AddRetryMiddlewares(stack *smithymiddle.Stack, cfg AwsRetryMiddlewareConfig, optsFn ...func(*AwsRetryMiddlewares)) { - attemptMiddleware := NewAttemptMiddleware(cfg.GetRetryer(), http.RequestCloner) - m := AwsRetryMiddlewares{ - AttemptMiddleware: &attemptMiddleware, - MetricsHeaderMiddleware: &MetricsHeaderMiddleware{}, +func AddRetryMiddlewares(stack *smithymiddle.Stack, options AddRetryMiddlewaresOptions) error { + attemptMiddleware := NewAttemptMiddleware(options.Retryer, http.RequestCloner) + if err := stack.Finalize.Add(&attemptMiddleware, smithymiddle.After); err != nil { + return err } - for _, fn := range optsFn { - fn(&m) + if err := stack.Finalize.Add(&MetricsHeaderMiddleware{}, smithymiddle.After); err != nil { + return err } - - stack.Finalize.Add(m.AttemptMiddleware, smithymiddle.After) - stack.Finalize.Add(m.MetricsHeaderMiddleware, smithymiddle.After) + return nil } diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AssembleMiddlewareStack.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AssembleMiddlewareStack.java index ac20af46ab8..e61cc144df0 100644 --- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AssembleMiddlewareStack.java +++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AssembleMiddlewareStack.java @@ -87,11 +87,11 @@ public List getClientPlugins() { .build()) .build(), - // Add newAttempt middleware to operation stack + // Add retryer middleware to operation stack RuntimeClientPlugin.builder() .registerMiddleware(MiddlewareRegistrar.builder() .resolvedFunction(SymbolUtils.createValueSymbolBuilder( - "AddRetryMiddlewares", AwsGoDependency.AWS_RETRY) + AwsRetryMiddlewareHelper.ADD_RETRY_MIDDLEWARES_HELPER) .build()) .useClientOptions() .build()) diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsRetryMiddlewareHelper.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsRetryMiddlewareHelper.java new file mode 100644 index 00000000000..2c167f3805f --- /dev/null +++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsRetryMiddlewareHelper.java @@ -0,0 +1,59 @@ +/* + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package software.amazon.smithy.aws.go.codegen; + +import software.amazon.smithy.codegen.core.Symbol; +import software.amazon.smithy.codegen.core.SymbolProvider; +import software.amazon.smithy.go.codegen.GoDelegator; +import software.amazon.smithy.go.codegen.GoSettings; +import software.amazon.smithy.go.codegen.GoWriter; +import software.amazon.smithy.go.codegen.SmithyGoDependency; +import software.amazon.smithy.go.codegen.SymbolUtils; +import software.amazon.smithy.go.codegen.integration.GoIntegration; +import software.amazon.smithy.model.Model; + +public class AwsRetryMiddlewareHelper implements GoIntegration { + public static final String ADD_RETRY_MIDDLEWARES_HELPER = "addRetryMiddlewares"; + + @Override + public void writeAdditionalFiles( + GoSettings settings, + Model model, + SymbolProvider symbolProvider, + GoDelegator delegator + ) { + delegator.useShapeWriter(settings.getService(model), this::generateRetryMiddlewareHelpers); + } + + private void generateRetryMiddlewareHelpers(GoWriter writer) { + Symbol stackSymbol = SymbolUtils.createPointableSymbolBuilder("Stack", SmithyGoDependency.SMITHY_MIDDLEWARE) + .build(); + Symbol addRetryMiddlewares = SymbolUtils.createValueSymbolBuilder("AddRetryMiddlewares", + AwsGoDependency.AWS_RETRY).build(); + Symbol addOptions = SymbolUtils.createValueSymbolBuilder("AddRetryMiddlewaresOptions", + AwsGoDependency.AWS_RETRY).build(); + + writer.openBlock("func $L(stack $P, o Options) error {", "}", ADD_RETRY_MIDDLEWARES_HELPER, stackSymbol, + () -> { + writer.openBlock("mo := $T{", "}", addOptions, () -> { + writer.write("$L: o.$L,", AddAwsConfigFields.RETRYER_CONFIG_NAME, + AddAwsConfigFields.RETRYER_CONFIG_NAME); + }); + + writer.write("return $T(stack, mo)", addRetryMiddlewares); + }); + } +} 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 9c36f856519..7875e9b92c4 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 @@ -121,8 +121,7 @@ private void writeServiceSignerConfig(Model model, GoWriter writer, ServiceShape * @return if the SigV4 trait is used by the service. */ public static boolean isSupportedAuthentication(Model model, ServiceShape serviceShape) { - return model.getKnowledge(ServiceIndex.class) - .getAuthSchemes(serviceShape).values().stream().anyMatch(trait -> trait.getClass() + return ServiceIndex.of(model).getAuthSchemes(serviceShape).values().stream().anyMatch(trait -> trait.getClass() .equals(SigV4Trait.class)); } @@ -135,8 +134,7 @@ public static boolean isSupportedAuthentication(Model model, ServiceShape servic * @return if SigV4Trait is an auth scheme for the operation and service. */ public static boolean hasSigV4AuthScheme(Model model, ServiceShape service, OperationShape operation) { - ServiceIndex serviceIndex = model.getKnowledge(ServiceIndex.class); - Map auth = serviceIndex.getEffectiveAuthSchemes(service.getId(), operation.getId()); + Map auth = ServiceIndex.of(model).getEffectiveAuthSchemes(service.getId(), operation.getId()); return auth.containsKey(SigV4Trait.ID) && !operation.hasTrait(OptionalAuthTrait.class); } } diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/EndpointGenerator.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/EndpointGenerator.java index 83d809f6093..ffb1ed327c0 100644 --- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/EndpointGenerator.java +++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/EndpointGenerator.java @@ -45,7 +45,7 @@ */ final class EndpointGenerator implements Runnable { public static final String MIDDLEWARE_NAME = "ResolveEndpoint"; - public static final String ADD_MIDDLEWARE_HELPER_NAME = String.format("Add%sMiddleware", MIDDLEWARE_NAME); + public static final String ADD_MIDDLEWARE_HELPER_NAME = String.format("add%sMiddleware", MIDDLEWARE_NAME); public static final String RESOLVER_INTERFACE_NAME = "EndpointResolver"; public static final String RESOLVER_FUNC_NAME = "EndpointResolverFunc"; public static final String RESOLVER_OPTIONS = "ResolverOptions"; @@ -192,32 +192,22 @@ private void generateMiddleware(GoWriter writer) { Symbol stackSymbol = SymbolUtils.createPointableSymbolBuilder("Stack", SmithyGoDependency.SMITHY_MIDDLEWARE) .build(); - Symbol optionsSymbol = SymbolUtils.createValueSymbolBuilder(String.format("%sMiddlewareOptions", - MIDDLEWARE_NAME)).build(); - - // Generate Middleware options interface - writer.openBlock("type $T interface {", "}", optionsSymbol, () -> { - writer.write("GetEndpointResolver() $L", RESOLVER_INTERFACE_NAME); - writer.write("GetEndpointOptions() $L", RESOLVER_OPTIONS); - }); - writer.write(""); // Generate Middleware Adder Helper - writer.openBlock("func $L(stack $P, options $T) {", "}", ADD_MIDDLEWARE_HELPER_NAME, stackSymbol, - optionsSymbol, () -> { - writer.addUseImports(SmithyGoDependency.SMITHY_MIDDLEWARE); - String closeBlock = String.format("}, \"%s\", middleware.Before)", - ProtocolUtils.OPERATION_SERIALIZER_MIDDLEWARE_ID); - writer.openBlock("stack.Serialize.Insert(&$T{", closeBlock, - middleware.getMiddlewareSymbol(), - () -> { - writer.write("Resolver: options.GetEndpointResolver(),"); - writer.write("Options: options.GetEndpointOptions(),"); - }); - }); + writer.openBlock("func $L(stack $P, o Options) error {", "}", ADD_MIDDLEWARE_HELPER_NAME, stackSymbol, () -> { + writer.addUseImports(SmithyGoDependency.SMITHY_MIDDLEWARE); + String closeBlock = String.format("}, \"%s\", middleware.Before)", + ProtocolUtils.OPERATION_SERIALIZER_MIDDLEWARE_ID); + writer.openBlock("return stack.Serialize.Insert(&$T{", closeBlock, + middleware.getMiddlewareSymbol(), + () -> { + writer.write("Resolver: o.EndpointResolver,"); + writer.write("Options: o.EndpointOptions,"); + }); + }); writer.write(""); // Generate Middleware Remover Helper - writer.openBlock("func Remove$LMiddleware(stack $P) error {", "}", middleware.getMiddlewareSymbol(), + writer.openBlock("func remove$LMiddleware(stack $P) error {", "}", middleware.getMiddlewareSymbol(), stackSymbol, () -> { writer.write("return stack.Serialize.Remove((&$T{}).ID())", middleware.getMiddlewareSymbol()); }); diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/RestJsonProtocolGenerator.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/RestJsonProtocolGenerator.java index 40726af5ed0..3b3ef0ff350 100644 --- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/RestJsonProtocolGenerator.java +++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/RestJsonProtocolGenerator.java @@ -73,7 +73,7 @@ protected void generateOperationDocumentSerializer( OperationShape operation ) { Model model = context.getModel(); - HttpBindingIndex bindingIndex = model.getKnowledge(HttpBindingIndex.class); + HttpBindingIndex bindingIndex = HttpBindingIndex.of(model); Set documentBindings = bindingIndex.getRequestBindings(operation, HttpBinding.Location.DOCUMENT) .stream() .map(HttpBinding::getMember) @@ -184,7 +184,7 @@ protected void writeMiddlewareDocumentDeserializerDelegator( boolean isShapeWithPayloadBinding = isShapeWithResponseBindings(model, operation, HttpBinding.Location.PAYLOAD); if (isShapeWithPayloadBinding) { // since payload trait can only be applied to a single member in a output shape - MemberShape memberShape = model.getKnowledge(HttpBindingIndex.class) + MemberShape memberShape = HttpBindingIndex.of(model) .getResponseBindings(operation, HttpBinding.Location.PAYLOAD).stream() .findFirst() .orElseThrow(() -> new CodegenException("Expected payload binding member")) @@ -258,7 +258,7 @@ protected void generateOperationDocumentDeserializer( OperationShape operation ) { Model model = context.getModel(); - HttpBindingIndex bindingIndex = model.getKnowledge(HttpBindingIndex.class); + HttpBindingIndex bindingIndex = HttpBindingIndex.of(model); Set documentBindings = bindingIndex.getResponseBindings(operation, HttpBinding.Location.DOCUMENT) .stream() .map(HttpBinding::getMember) diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/RestXmlProtocolGenerator.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/RestXmlProtocolGenerator.java index 6f3164a8bae..a2a3eb7a8fd 100644 --- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/RestXmlProtocolGenerator.java +++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/RestXmlProtocolGenerator.java @@ -57,7 +57,7 @@ protected TimestampFormatTrait.Format getDocumentTimestampFormat() { @Override protected void generateOperationDocumentSerializer(GenerationContext context, OperationShape operation) { Model model = context.getModel(); - HttpBindingIndex bindingIndex = model.getKnowledge(HttpBindingIndex.class); + HttpBindingIndex bindingIndex = HttpBindingIndex.of(model); Set documentBindings = bindingIndex.getRequestBindings(operation, HttpBinding.Location.DOCUMENT) .stream() @@ -213,7 +213,7 @@ protected void writeMiddlewareDocumentDeserializerDelegator( if (isShapeWithResponseBindings(model, operation, HttpBinding.Location.PAYLOAD)) { // since payload trait can only be applied to a single member in a output shape - MemberShape memberShape = model.getKnowledge(HttpBindingIndex.class) + MemberShape memberShape = HttpBindingIndex.of(model) .getResponseBindings(operation, HttpBinding.Location.PAYLOAD).stream() .findFirst() .orElseThrow(() -> new CodegenException("Expected payload binding member")) @@ -239,7 +239,7 @@ protected void generateOperationDocumentDeserializer( GenerationContext context, OperationShape operation ) { Model model = context.getModel(); - HttpBindingIndex bindingIndex = model.getKnowledge(HttpBindingIndex.class); + HttpBindingIndex bindingIndex = HttpBindingIndex.of(model); Set documentBindings = bindingIndex.getResponseBindings(operation, HttpBinding.Location.DOCUMENT) .stream() .map(HttpBinding::getMember) diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/S3MetadataRetriever.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/S3MetadataRetriever.java index 89137a585b0..2f651948986 100644 --- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/S3MetadataRetriever.java +++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/S3MetadataRetriever.java @@ -30,7 +30,7 @@ public class S3MetadataRetriever implements GoIntegration { */ @Override public byte getOrder() { - return 127; + return 126; } @Override diff --git a/codegen/smithy-aws-go-codegen/src/main/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration b/codegen/smithy-aws-go-codegen/src/main/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration index deca474fa13..81a05865ad8 100644 --- a/codegen/smithy-aws-go-codegen/src/main/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration +++ b/codegen/smithy-aws-go-codegen/src/main/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration @@ -7,6 +7,7 @@ software.amazon.smithy.aws.go.codegen.AwsSignatureVersion4 software.amazon.smithy.aws.go.codegen.AwsIdempotencyTokenProvider software.amazon.smithy.aws.go.codegen.AwsClientUserAgent software.amazon.smithy.aws.go.codegen.AwsSdkServiceId +software.amazon.smithy.aws.go.codegen.AwsRetryMiddlewareHelper software.amazon.smithy.aws.go.codegen.AWSRequestIDRetriever software.amazon.smithy.aws.go.codegen.AWSResponseErrorWrapper software.amazon.smithy.aws.go.codegen.customization.DynamoDBValidateResponseChecksum diff --git a/credentials/endpointcreds/internal/client/client.go b/credentials/endpointcreds/internal/client/client.go index 298700f99ae..13a72d15f68 100644 --- a/credentials/endpointcreds/internal/client/client.go +++ b/credentials/endpointcreds/internal/client/client.go @@ -47,11 +47,6 @@ func (o Options) Copy() Options { return to } -// GetRetryer returns the configured retryer -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - // Client is an client for retrieving AWS credentials from an endpoint type Client struct { options Options @@ -96,7 +91,7 @@ func (c *Client) GetCredentials(ctx context.Context, params *GetCredentialsInput stack.Serialize.Add(&serializeOpGetCredential{}, smithymiddleware.After) stack.Build.Add(&buildEndpoint{Endpoint: options.Endpoint}, smithymiddleware.After) stack.Deserialize.Add(&deserializeOpGetCredential{}, smithymiddleware.After) - retry.AddRetryMiddlewares(stack, options) + retry.AddRetryMiddlewares(stack, retry.AddRetryMiddlewaresOptions{Retryer: options.Retryer}) middleware.AddUserAgentKey(ServiceID) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) smithyhttp.AddCloseResponseBodyMiddleware(stack) diff --git a/ec2imds/api_client.go b/ec2imds/api_client.go index c8c51c2287c..407f91e3cfb 100644 --- a/ec2imds/api_client.go +++ b/ec2imds/api_client.go @@ -149,13 +149,6 @@ type Options struct { disableAPIToken bool } -// GetRetryer returns the retryer. -// -// TODO remove this in favor of structured options. -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - // HTTPClient provides the interface for a client making HTTP requests with the // API. type HTTPClient interface { diff --git a/ec2imds/request_middleware.go b/ec2imds/request_middleware.go index 32af06c8bce..dc13949256e 100644 --- a/ec2imds/request_middleware.go +++ b/ec2imds/request_middleware.go @@ -86,7 +86,7 @@ func addRequestMiddleware(stack *middleware.Stack, } // Retry support - retry.AddRetryMiddlewares(stack, options) + retry.AddRetryMiddlewares(stack, retry.AddRetryMiddlewaresOptions{Retryer: options.Retryer}) return nil } diff --git a/internal/protocoltest/awsrestjson/api_client.go b/internal/protocoltest/awsrestjson/api_client.go index 10ac34edb9a..0787649f7a8 100644 --- a/internal/protocoltest/awsrestjson/api_client.go +++ b/internal/protocoltest/awsrestjson/api_client.go @@ -74,26 +74,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -150,6 +130,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/internal/protocoltest/awsrestjson/api_op_AllQueryStringTypes.go b/internal/protocoltest/awsrestjson/api_op_AllQueryStringTypes.go index bbe893ffa18..c97f5c9f373 100644 --- a/internal/protocoltest/awsrestjson/api_op_AllQueryStringTypes.go +++ b/internal/protocoltest/awsrestjson/api_op_AllQueryStringTypes.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/awsrestjson/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,8 +22,8 @@ func (c *Client) AllQueryStringTypes(ctx context.Context, params *AllQueryString addawsRestjson1_serdeOpAllQueryStringTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_ConstantAndVariableQueryString.go b/internal/protocoltest/awsrestjson/api_op_ConstantAndVariableQueryString.go index 4f6f5c09ca2..d128eac1345 100644 --- a/internal/protocoltest/awsrestjson/api_op_ConstantAndVariableQueryString.go +++ b/internal/protocoltest/awsrestjson/api_op_ConstantAndVariableQueryString.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) ConstantAndVariableQueryString(ctx context.Context, params *Con addawsRestjson1_serdeOpConstantAndVariableQueryStringMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_ConstantQueryString.go b/internal/protocoltest/awsrestjson/api_op_ConstantQueryString.go index f5725b87b01..e54dda11893 100644 --- a/internal/protocoltest/awsrestjson/api_op_ConstantQueryString.go +++ b/internal/protocoltest/awsrestjson/api_op_ConstantQueryString.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -24,8 +23,8 @@ func (c *Client) ConstantQueryString(ctx context.Context, params *ConstantQueryS addawsRestjson1_serdeOpConstantQueryStringMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_EmptyInputAndEmptyOutput.go b/internal/protocoltest/awsrestjson/api_op_EmptyInputAndEmptyOutput.go index f8f48608374..f3b8c66af14 100644 --- a/internal/protocoltest/awsrestjson/api_op_EmptyInputAndEmptyOutput.go +++ b/internal/protocoltest/awsrestjson/api_op_EmptyInputAndEmptyOutput.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -24,8 +23,8 @@ func (c *Client) EmptyInputAndEmptyOutput(ctx context.Context, params *EmptyInpu addawsRestjson1_serdeOpEmptyInputAndEmptyOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_GreetingWithErrors.go b/internal/protocoltest/awsrestjson/api_op_GreetingWithErrors.go index c145053533d..8de4e89b032 100644 --- a/internal/protocoltest/awsrestjson/api_op_GreetingWithErrors.go +++ b/internal/protocoltest/awsrestjson/api_op_GreetingWithErrors.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -35,8 +34,8 @@ func (c *Client) GreetingWithErrors(ctx context.Context, params *GreetingWithErr addawsRestjson1_serdeOpGreetingWithErrorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraits.go b/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraits.go index be43b60470c..4f0826ac0c3 100644 --- a/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraits.go +++ b/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraits.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -22,8 +21,8 @@ func (c *Client) HttpPayloadTraits(ctx context.Context, params *HttpPayloadTrait addawsRestjson1_serdeOpHttpPayloadTraitsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraitsWithMediaType.go b/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraitsWithMediaType.go index 970f976db4a..e67796c6e38 100644 --- a/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraitsWithMediaType.go +++ b/internal/protocoltest/awsrestjson/api_op_HttpPayloadTraitsWithMediaType.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -22,8 +21,8 @@ func (c *Client) HttpPayloadTraitsWithMediaType(ctx context.Context, params *Htt addawsRestjson1_serdeOpHttpPayloadTraitsWithMediaTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_HttpPayloadWithStructure.go b/internal/protocoltest/awsrestjson/api_op_HttpPayloadWithStructure.go index a5f08bd1979..2833ddfe4ba 100644 --- a/internal/protocoltest/awsrestjson/api_op_HttpPayloadWithStructure.go +++ b/internal/protocoltest/awsrestjson/api_op_HttpPayloadWithStructure.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/awsrestjson/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,8 +22,8 @@ func (c *Client) HttpPayloadWithStructure(ctx context.Context, params *HttpPaylo addawsRestjson1_serdeOpHttpPayloadWithStructureMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeaders.go b/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeaders.go index 9f882e7dd4d..26fa3ae7f12 100644 --- a/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeaders.go +++ b/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeaders.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) HttpPrefixHeaders(ctx context.Context, params *HttpPrefixHeader addawsRestjson1_serdeOpHttpPrefixHeadersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeadersResponse.go b/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeadersResponse.go index 945df4238c6..6d30586cdac 100644 --- a/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeadersResponse.go +++ b/internal/protocoltest/awsrestjson/api_op_HttpPrefixHeadersResponse.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) HttpPrefixHeadersResponse(ctx context.Context, params *HttpPref addawsRestjson1_serdeOpHttpPrefixHeadersResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_HttpRequestWithGreedyLabelInPath.go b/internal/protocoltest/awsrestjson/api_op_HttpRequestWithGreedyLabelInPath.go index fb8f8a32848..7f13fbcdd7e 100644 --- a/internal/protocoltest/awsrestjson/api_op_HttpRequestWithGreedyLabelInPath.go +++ b/internal/protocoltest/awsrestjson/api_op_HttpRequestWithGreedyLabelInPath.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -20,8 +19,8 @@ func (c *Client) HttpRequestWithGreedyLabelInPath(ctx context.Context, params *H addawsRestjson1_serdeOpHttpRequestWithGreedyLabelInPathMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_HttpRequestWithLabels.go b/internal/protocoltest/awsrestjson/api_op_HttpRequestWithLabels.go index 2450bf98581..6e6e53b960b 100644 --- a/internal/protocoltest/awsrestjson/api_op_HttpRequestWithLabels.go +++ b/internal/protocoltest/awsrestjson/api_op_HttpRequestWithLabels.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) HttpRequestWithLabels(ctx context.Context, params *HttpRequestW addawsRestjson1_serdeOpHttpRequestWithLabelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_HttpRequestWithLabelsAndTimestampFormat.go b/internal/protocoltest/awsrestjson/api_op_HttpRequestWithLabelsAndTimestampFormat.go index 1f7dbda5e59..446d3913d8f 100644 --- a/internal/protocoltest/awsrestjson/api_op_HttpRequestWithLabelsAndTimestampFormat.go +++ b/internal/protocoltest/awsrestjson/api_op_HttpRequestWithLabelsAndTimestampFormat.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) HttpRequestWithLabelsAndTimestampFormat(ctx context.Context, pa addawsRestjson1_serdeOpHttpRequestWithLabelsAndTimestampFormatMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_HttpResponseCode.go b/internal/protocoltest/awsrestjson/api_op_HttpResponseCode.go index fd1eff442f8..554e2460584 100644 --- a/internal/protocoltest/awsrestjson/api_op_HttpResponseCode.go +++ b/internal/protocoltest/awsrestjson/api_op_HttpResponseCode.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -20,8 +19,8 @@ func (c *Client) HttpResponseCode(ctx context.Context, params *HttpResponseCodeI addawsRestjson1_serdeOpHttpResponseCodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_IgnoreQueryParamsInResponse.go b/internal/protocoltest/awsrestjson/api_op_IgnoreQueryParamsInResponse.go index c92e4c6eef9..f93a1dbc67b 100644 --- a/internal/protocoltest/awsrestjson/api_op_IgnoreQueryParamsInResponse.go +++ b/internal/protocoltest/awsrestjson/api_op_IgnoreQueryParamsInResponse.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) IgnoreQueryParamsInResponse(ctx context.Context, params *Ignore addawsRestjson1_serdeOpIgnoreQueryParamsInResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_InlineDocument.go b/internal/protocoltest/awsrestjson/api_op_InlineDocument.go index 68bfb06612f..c6e4fa16c0e 100644 --- a/internal/protocoltest/awsrestjson/api_op_InlineDocument.go +++ b/internal/protocoltest/awsrestjson/api_op_InlineDocument.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) InlineDocument(ctx context.Context, params *InlineDocumentInput addawsRestjson1_serdeOpInlineDocumentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_InlineDocumentAsPayload.go b/internal/protocoltest/awsrestjson/api_op_InlineDocumentAsPayload.go index 99e9e5f8977..e8b9944ed66 100644 --- a/internal/protocoltest/awsrestjson/api_op_InlineDocumentAsPayload.go +++ b/internal/protocoltest/awsrestjson/api_op_InlineDocumentAsPayload.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) InlineDocumentAsPayload(ctx context.Context, params *InlineDocu addawsRestjson1_serdeOpInlineDocumentAsPayloadMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_InputAndOutputWithHeaders.go b/internal/protocoltest/awsrestjson/api_op_InputAndOutputWithHeaders.go index de1e0f238a1..27878b9eb21 100644 --- a/internal/protocoltest/awsrestjson/api_op_InputAndOutputWithHeaders.go +++ b/internal/protocoltest/awsrestjson/api_op_InputAndOutputWithHeaders.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/awsrestjson/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,8 +23,8 @@ func (c *Client) InputAndOutputWithHeaders(ctx context.Context, params *InputAnd addawsRestjson1_serdeOpInputAndOutputWithHeadersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_JsonBlobs.go b/internal/protocoltest/awsrestjson/api_op_JsonBlobs.go index d43b506a05f..908a1ff3034 100644 --- a/internal/protocoltest/awsrestjson/api_op_JsonBlobs.go +++ b/internal/protocoltest/awsrestjson/api_op_JsonBlobs.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) JsonBlobs(ctx context.Context, params *JsonBlobsInput, optFns . addawsRestjson1_serdeOpJsonBlobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_JsonEnums.go b/internal/protocoltest/awsrestjson/api_op_JsonEnums.go index 2b124ac09bf..12c0fd36542 100644 --- a/internal/protocoltest/awsrestjson/api_op_JsonEnums.go +++ b/internal/protocoltest/awsrestjson/api_op_JsonEnums.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/awsrestjson/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) JsonEnums(ctx context.Context, params *JsonEnumsInput, optFns . addawsRestjson1_serdeOpJsonEnumsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_JsonLists.go b/internal/protocoltest/awsrestjson/api_op_JsonLists.go index 670df36ac14..f5f8c62bfe9 100644 --- a/internal/protocoltest/awsrestjson/api_op_JsonLists.go +++ b/internal/protocoltest/awsrestjson/api_op_JsonLists.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/awsrestjson/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,8 +32,8 @@ func (c *Client) JsonLists(ctx context.Context, params *JsonListsInput, optFns . addawsRestjson1_serdeOpJsonListsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_JsonMaps.go b/internal/protocoltest/awsrestjson/api_op_JsonMaps.go index af8dd3e630e..fe5571b5063 100644 --- a/internal/protocoltest/awsrestjson/api_op_JsonMaps.go +++ b/internal/protocoltest/awsrestjson/api_op_JsonMaps.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/awsrestjson/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) JsonMaps(ctx context.Context, params *JsonMapsInput, optFns ... addawsRestjson1_serdeOpJsonMapsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_JsonTimestamps.go b/internal/protocoltest/awsrestjson/api_op_JsonTimestamps.go index 6069ddebc76..d1f3910b2f8 100644 --- a/internal/protocoltest/awsrestjson/api_op_JsonTimestamps.go +++ b/internal/protocoltest/awsrestjson/api_op_JsonTimestamps.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) JsonTimestamps(ctx context.Context, params *JsonTimestampsInput addawsRestjson1_serdeOpJsonTimestampsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_JsonUnions.go b/internal/protocoltest/awsrestjson/api_op_JsonUnions.go index 005f9fdd6f4..3bdc775e6fc 100644 --- a/internal/protocoltest/awsrestjson/api_op_JsonUnions.go +++ b/internal/protocoltest/awsrestjson/api_op_JsonUnions.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/awsrestjson/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) JsonUnions(ctx context.Context, params *JsonUnionsInput, optFns addawsRestjson1_serdeOpJsonUnionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_MediaTypeHeader.go b/internal/protocoltest/awsrestjson/api_op_MediaTypeHeader.go index 1b378588673..37bae88c0b7 100644 --- a/internal/protocoltest/awsrestjson/api_op_MediaTypeHeader.go +++ b/internal/protocoltest/awsrestjson/api_op_MediaTypeHeader.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) MediaTypeHeader(ctx context.Context, params *MediaTypeHeaderInp addawsRestjson1_serdeOpMediaTypeHeaderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_NoInputAndNoOutput.go b/internal/protocoltest/awsrestjson/api_op_NoInputAndNoOutput.go index aa532767ea0..2d6a8ce883d 100644 --- a/internal/protocoltest/awsrestjson/api_op_NoInputAndNoOutput.go +++ b/internal/protocoltest/awsrestjson/api_op_NoInputAndNoOutput.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) NoInputAndNoOutput(ctx context.Context, params *NoInputAndNoOut addawsRestjson1_serdeOpNoInputAndNoOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_NoInputAndOutput.go b/internal/protocoltest/awsrestjson/api_op_NoInputAndOutput.go index 6c5feb8e45a..f405a556278 100644 --- a/internal/protocoltest/awsrestjson/api_op_NoInputAndOutput.go +++ b/internal/protocoltest/awsrestjson/api_op_NoInputAndOutput.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) NoInputAndOutput(ctx context.Context, params *NoInputAndOutputI addawsRestjson1_serdeOpNoInputAndOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_NullAndEmptyHeadersClient.go b/internal/protocoltest/awsrestjson/api_op_NullAndEmptyHeadersClient.go index 1a7a2385e9b..7b904977afe 100644 --- a/internal/protocoltest/awsrestjson/api_op_NullAndEmptyHeadersClient.go +++ b/internal/protocoltest/awsrestjson/api_op_NullAndEmptyHeadersClient.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) NullAndEmptyHeadersClient(ctx context.Context, params *NullAndE addawsRestjson1_serdeOpNullAndEmptyHeadersClientMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_NullAndEmptyHeadersServer.go b/internal/protocoltest/awsrestjson/api_op_NullAndEmptyHeadersServer.go index acff284a923..6ae354a324d 100644 --- a/internal/protocoltest/awsrestjson/api_op_NullAndEmptyHeadersServer.go +++ b/internal/protocoltest/awsrestjson/api_op_NullAndEmptyHeadersServer.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) NullAndEmptyHeadersServer(ctx context.Context, params *NullAndE addawsRestjson1_serdeOpNullAndEmptyHeadersServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_OmitsNullSerializesEmptyString.go b/internal/protocoltest/awsrestjson/api_op_OmitsNullSerializesEmptyString.go index 93dd2ff2206..c904be0f763 100644 --- a/internal/protocoltest/awsrestjson/api_op_OmitsNullSerializesEmptyString.go +++ b/internal/protocoltest/awsrestjson/api_op_OmitsNullSerializesEmptyString.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) OmitsNullSerializesEmptyString(ctx context.Context, params *Omi addawsRestjson1_serdeOpOmitsNullSerializesEmptyStringMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_QueryIdempotencyTokenAutoFill.go b/internal/protocoltest/awsrestjson/api_op_QueryIdempotencyTokenAutoFill.go index 9fb0fe5d16e..cdbbc101118 100644 --- a/internal/protocoltest/awsrestjson/api_op_QueryIdempotencyTokenAutoFill.go +++ b/internal/protocoltest/awsrestjson/api_op_QueryIdempotencyTokenAutoFill.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -22,8 +21,8 @@ func (c *Client) QueryIdempotencyTokenAutoFill(ctx context.Context, params *Quer addawsRestjson1_serdeOpQueryIdempotencyTokenAutoFillMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_RecursiveShapes.go b/internal/protocoltest/awsrestjson/api_op_RecursiveShapes.go index ffb3efdde50..f4be8928789 100644 --- a/internal/protocoltest/awsrestjson/api_op_RecursiveShapes.go +++ b/internal/protocoltest/awsrestjson/api_op_RecursiveShapes.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/awsrestjson/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) RecursiveShapes(ctx context.Context, params *RecursiveShapesInp addawsRestjson1_serdeOpRecursiveShapesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_SimpleScalarProperties.go b/internal/protocoltest/awsrestjson/api_op_SimpleScalarProperties.go index 3305176c847..c151247a36e 100644 --- a/internal/protocoltest/awsrestjson/api_op_SimpleScalarProperties.go +++ b/internal/protocoltest/awsrestjson/api_op_SimpleScalarProperties.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -20,8 +19,8 @@ func (c *Client) SimpleScalarProperties(ctx context.Context, params *SimpleScala addawsRestjson1_serdeOpSimpleScalarPropertiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_StreamingTraits.go b/internal/protocoltest/awsrestjson/api_op_StreamingTraits.go index a8bba904d2d..f446a1b95b7 100644 --- a/internal/protocoltest/awsrestjson/api_op_StreamingTraits.go +++ b/internal/protocoltest/awsrestjson/api_op_StreamingTraits.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -24,8 +23,8 @@ func (c *Client) StreamingTraits(ctx context.Context, params *StreamingTraitsInp addawsRestjson1_serdeOpStreamingTraitsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_StreamingTraitsRequireLength.go b/internal/protocoltest/awsrestjson/api_op_StreamingTraitsRequireLength.go index c7d644cb182..d132e738ed9 100644 --- a/internal/protocoltest/awsrestjson/api_op_StreamingTraitsRequireLength.go +++ b/internal/protocoltest/awsrestjson/api_op_StreamingTraitsRequireLength.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -24,8 +23,8 @@ func (c *Client) StreamingTraitsRequireLength(ctx context.Context, params *Strea addawsRestjson1_serdeOpStreamingTraitsRequireLengthMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_StreamingTraitsWithMediaType.go b/internal/protocoltest/awsrestjson/api_op_StreamingTraitsWithMediaType.go index 561aa20076d..afb0ccd1135 100644 --- a/internal/protocoltest/awsrestjson/api_op_StreamingTraitsWithMediaType.go +++ b/internal/protocoltest/awsrestjson/api_op_StreamingTraitsWithMediaType.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -24,8 +23,8 @@ func (c *Client) StreamingTraitsWithMediaType(ctx context.Context, params *Strea addawsRestjson1_serdeOpStreamingTraitsWithMediaTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/api_op_TimestampFormatHeaders.go b/internal/protocoltest/awsrestjson/api_op_TimestampFormatHeaders.go index 69e151849fb..51083c00b27 100644 --- a/internal/protocoltest/awsrestjson/api_op_TimestampFormatHeaders.go +++ b/internal/protocoltest/awsrestjson/api_op_TimestampFormatHeaders.go @@ -5,7 +5,6 @@ package awsrestjson import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -22,8 +21,8 @@ func (c *Client) TimestampFormatHeaders(ctx context.Context, params *TimestampFo addawsRestjson1_serdeOpTimestampFormatHeadersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/awsrestjson/endpoints.go b/internal/protocoltest/awsrestjson/endpoints.go index 57da28dad11..6d4800bd6d0 100644 --- a/internal/protocoltest/awsrestjson/endpoints.go +++ b/internal/protocoltest/awsrestjson/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/internal/protocoltest/ec2query/api_client.go b/internal/protocoltest/ec2query/api_client.go index 6e60693546e..a4bd01f9038 100644 --- a/internal/protocoltest/ec2query/api_client.go +++ b/internal/protocoltest/ec2query/api_client.go @@ -74,26 +74,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -150,6 +130,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/internal/protocoltest/ec2query/api_op_EmptyInputAndEmptyOutput.go b/internal/protocoltest/ec2query/api_op_EmptyInputAndEmptyOutput.go index 66231eb6b60..d1741765c92 100644 --- a/internal/protocoltest/ec2query/api_op_EmptyInputAndEmptyOutput.go +++ b/internal/protocoltest/ec2query/api_op_EmptyInputAndEmptyOutput.go @@ -5,7 +5,6 @@ package ec2query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) EmptyInputAndEmptyOutput(ctx context.Context, params *EmptyInpu addawsEc2query_serdeOpEmptyInputAndEmptyOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/ec2query/api_op_GreetingWithErrors.go b/internal/protocoltest/ec2query/api_op_GreetingWithErrors.go index f6f6f1d7850..ef51655bff2 100644 --- a/internal/protocoltest/ec2query/api_op_GreetingWithErrors.go +++ b/internal/protocoltest/ec2query/api_op_GreetingWithErrors.go @@ -5,7 +5,6 @@ package ec2query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -29,8 +28,8 @@ func (c *Client) GreetingWithErrors(ctx context.Context, params *GreetingWithErr addawsEc2query_serdeOpGreetingWithErrorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/ec2query/api_op_IgnoresWrappingXmlName.go b/internal/protocoltest/ec2query/api_op_IgnoresWrappingXmlName.go index 5f1b678b997..da6618a704f 100644 --- a/internal/protocoltest/ec2query/api_op_IgnoresWrappingXmlName.go +++ b/internal/protocoltest/ec2query/api_op_IgnoresWrappingXmlName.go @@ -5,7 +5,6 @@ package ec2query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -22,8 +21,8 @@ func (c *Client) IgnoresWrappingXmlName(ctx context.Context, params *IgnoresWrap addawsEc2query_serdeOpIgnoresWrappingXmlNameMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/ec2query/api_op_NestedStructures.go b/internal/protocoltest/ec2query/api_op_NestedStructures.go index 417347ba4ea..fe045754b4a 100644 --- a/internal/protocoltest/ec2query/api_op_NestedStructures.go +++ b/internal/protocoltest/ec2query/api_op_NestedStructures.go @@ -5,7 +5,6 @@ package ec2query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/ec2query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) NestedStructures(ctx context.Context, params *NestedStructuresI addawsEc2query_serdeOpNestedStructuresMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/ec2query/api_op_NoInputAndOutput.go b/internal/protocoltest/ec2query/api_op_NoInputAndOutput.go index 51825257fa5..113e0451c93 100644 --- a/internal/protocoltest/ec2query/api_op_NoInputAndOutput.go +++ b/internal/protocoltest/ec2query/api_op_NoInputAndOutput.go @@ -5,7 +5,6 @@ package ec2query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) NoInputAndOutput(ctx context.Context, params *NoInputAndOutputI addawsEc2query_serdeOpNoInputAndOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/ec2query/api_op_QueryIdempotencyTokenAutoFill.go b/internal/protocoltest/ec2query/api_op_QueryIdempotencyTokenAutoFill.go index be6500b58a8..c933970d7ee 100644 --- a/internal/protocoltest/ec2query/api_op_QueryIdempotencyTokenAutoFill.go +++ b/internal/protocoltest/ec2query/api_op_QueryIdempotencyTokenAutoFill.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -22,8 +21,8 @@ func (c *Client) QueryIdempotencyTokenAutoFill(ctx context.Context, params *Quer addawsEc2query_serdeOpQueryIdempotencyTokenAutoFillMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/ec2query/api_op_QueryLists.go b/internal/protocoltest/ec2query/api_op_QueryLists.go index 7a0cbadf3a9..cc128c4ca0a 100644 --- a/internal/protocoltest/ec2query/api_op_QueryLists.go +++ b/internal/protocoltest/ec2query/api_op_QueryLists.go @@ -5,7 +5,6 @@ package ec2query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/ec2query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) QueryLists(ctx context.Context, params *QueryListsInput, optFns addawsEc2query_serdeOpQueryListsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/ec2query/api_op_QueryTimestamps.go b/internal/protocoltest/ec2query/api_op_QueryTimestamps.go index f93b7992c33..b0515f81dc1 100644 --- a/internal/protocoltest/ec2query/api_op_QueryTimestamps.go +++ b/internal/protocoltest/ec2query/api_op_QueryTimestamps.go @@ -5,7 +5,6 @@ package ec2query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -31,8 +30,8 @@ func (c *Client) QueryTimestamps(ctx context.Context, params *QueryTimestampsInp addawsEc2query_serdeOpQueryTimestampsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/ec2query/api_op_RecursiveXmlShapes.go b/internal/protocoltest/ec2query/api_op_RecursiveXmlShapes.go index b2e99251458..15cba5f2e0c 100644 --- a/internal/protocoltest/ec2query/api_op_RecursiveXmlShapes.go +++ b/internal/protocoltest/ec2query/api_op_RecursiveXmlShapes.go @@ -5,7 +5,6 @@ package ec2query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/ec2query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) RecursiveXmlShapes(ctx context.Context, params *RecursiveXmlSha addawsEc2query_serdeOpRecursiveXmlShapesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/ec2query/api_op_SimpleInputParams.go b/internal/protocoltest/ec2query/api_op_SimpleInputParams.go index 942f5480af0..a8a4633b4a6 100644 --- a/internal/protocoltest/ec2query/api_op_SimpleInputParams.go +++ b/internal/protocoltest/ec2query/api_op_SimpleInputParams.go @@ -5,7 +5,6 @@ package ec2query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/ec2query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) SimpleInputParams(ctx context.Context, params *SimpleInputParam addawsEc2query_serdeOpSimpleInputParamsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/ec2query/api_op_SimpleScalarXmlProperties.go b/internal/protocoltest/ec2query/api_op_SimpleScalarXmlProperties.go index 2f9a667b665..cc2b9fc3bc6 100644 --- a/internal/protocoltest/ec2query/api_op_SimpleScalarXmlProperties.go +++ b/internal/protocoltest/ec2query/api_op_SimpleScalarXmlProperties.go @@ -5,7 +5,6 @@ package ec2query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -20,8 +19,8 @@ func (c *Client) SimpleScalarXmlProperties(ctx context.Context, params *SimpleSc addawsEc2query_serdeOpSimpleScalarXmlPropertiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/ec2query/api_op_XmlBlobs.go b/internal/protocoltest/ec2query/api_op_XmlBlobs.go index 0f63fb4515d..9f0a9b759ba 100644 --- a/internal/protocoltest/ec2query/api_op_XmlBlobs.go +++ b/internal/protocoltest/ec2query/api_op_XmlBlobs.go @@ -5,7 +5,6 @@ package ec2query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) XmlBlobs(ctx context.Context, params *XmlBlobsInput, optFns ... addawsEc2query_serdeOpXmlBlobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/ec2query/api_op_XmlEmptyBlobs.go b/internal/protocoltest/ec2query/api_op_XmlEmptyBlobs.go index b515fd45b8d..3b0c42f8c59 100644 --- a/internal/protocoltest/ec2query/api_op_XmlEmptyBlobs.go +++ b/internal/protocoltest/ec2query/api_op_XmlEmptyBlobs.go @@ -5,7 +5,6 @@ package ec2query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -20,8 +19,8 @@ func (c *Client) XmlEmptyBlobs(ctx context.Context, params *XmlEmptyBlobsInput, addawsEc2query_serdeOpXmlEmptyBlobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/ec2query/api_op_XmlEmptyLists.go b/internal/protocoltest/ec2query/api_op_XmlEmptyLists.go index 9b1a238c103..1cb5a14e8c3 100644 --- a/internal/protocoltest/ec2query/api_op_XmlEmptyLists.go +++ b/internal/protocoltest/ec2query/api_op_XmlEmptyLists.go @@ -5,7 +5,6 @@ package ec2query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/ec2query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) XmlEmptyLists(ctx context.Context, params *XmlEmptyListsInput, addawsEc2query_serdeOpXmlEmptyListsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/ec2query/api_op_XmlEnums.go b/internal/protocoltest/ec2query/api_op_XmlEnums.go index c8e0bf0b7c2..295b82bc0cd 100644 --- a/internal/protocoltest/ec2query/api_op_XmlEnums.go +++ b/internal/protocoltest/ec2query/api_op_XmlEnums.go @@ -5,7 +5,6 @@ package ec2query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/ec2query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) XmlEnums(ctx context.Context, params *XmlEnumsInput, optFns ... addawsEc2query_serdeOpXmlEnumsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/ec2query/api_op_XmlLists.go b/internal/protocoltest/ec2query/api_op_XmlLists.go index a2c982b3945..c9d1a6daa5c 100644 --- a/internal/protocoltest/ec2query/api_op_XmlLists.go +++ b/internal/protocoltest/ec2query/api_op_XmlLists.go @@ -5,7 +5,6 @@ package ec2query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/ec2query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -40,8 +39,8 @@ func (c *Client) XmlLists(ctx context.Context, params *XmlListsInput, optFns ... addawsEc2query_serdeOpXmlListsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/ec2query/api_op_XmlNamespaces.go b/internal/protocoltest/ec2query/api_op_XmlNamespaces.go index 63db668b33d..7f0cd7173c5 100644 --- a/internal/protocoltest/ec2query/api_op_XmlNamespaces.go +++ b/internal/protocoltest/ec2query/api_op_XmlNamespaces.go @@ -5,7 +5,6 @@ package ec2query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/ec2query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -21,8 +20,8 @@ func (c *Client) XmlNamespaces(ctx context.Context, params *XmlNamespacesInput, addawsEc2query_serdeOpXmlNamespacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/ec2query/api_op_XmlTimestamps.go b/internal/protocoltest/ec2query/api_op_XmlTimestamps.go index fb052cfeeff..1af94e596a1 100644 --- a/internal/protocoltest/ec2query/api_op_XmlTimestamps.go +++ b/internal/protocoltest/ec2query/api_op_XmlTimestamps.go @@ -5,7 +5,6 @@ package ec2query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) XmlTimestamps(ctx context.Context, params *XmlTimestampsInput, addawsEc2query_serdeOpXmlTimestampsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/ec2query/endpoints.go b/internal/protocoltest/ec2query/endpoints.go index c2a08c1449e..4c9d54ffe35 100644 --- a/internal/protocoltest/ec2query/endpoints.go +++ b/internal/protocoltest/ec2query/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/internal/protocoltest/jsonrpc/api_client.go b/internal/protocoltest/jsonrpc/api_client.go index db50c7e7a02..d5ca124d13f 100644 --- a/internal/protocoltest/jsonrpc/api_client.go +++ b/internal/protocoltest/jsonrpc/api_client.go @@ -76,30 +76,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -165,6 +141,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/internal/protocoltest/jsonrpc/api_op_EmptyOperation.go b/internal/protocoltest/jsonrpc/api_op_EmptyOperation.go index ac27ad75b07..0cb6c31bfb5 100644 --- a/internal/protocoltest/jsonrpc/api_op_EmptyOperation.go +++ b/internal/protocoltest/jsonrpc/api_op_EmptyOperation.go @@ -5,7 +5,6 @@ package jsonrpc import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -21,9 +20,9 @@ func (c *Client) EmptyOperation(ctx context.Context, params *EmptyOperationInput addawsAwsjson11_serdeOpEmptyOperationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/internal/protocoltest/jsonrpc/api_op_GreetingWithErrors.go b/internal/protocoltest/jsonrpc/api_op_GreetingWithErrors.go index f59f058ba93..409fdf877c8 100644 --- a/internal/protocoltest/jsonrpc/api_op_GreetingWithErrors.go +++ b/internal/protocoltest/jsonrpc/api_op_GreetingWithErrors.go @@ -5,7 +5,6 @@ package jsonrpc import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) GreetingWithErrors(ctx context.Context, params *GreetingWithErr addawsAwsjson11_serdeOpGreetingWithErrorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/internal/protocoltest/jsonrpc/api_op_JsonEnums.go b/internal/protocoltest/jsonrpc/api_op_JsonEnums.go index 006fea037be..8560580df3f 100644 --- a/internal/protocoltest/jsonrpc/api_op_JsonEnums.go +++ b/internal/protocoltest/jsonrpc/api_op_JsonEnums.go @@ -5,7 +5,6 @@ package jsonrpc import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/jsonrpc/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) JsonEnums(ctx context.Context, params *JsonEnumsInput, optFns . addawsAwsjson11_serdeOpJsonEnumsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/internal/protocoltest/jsonrpc/api_op_JsonUnions.go b/internal/protocoltest/jsonrpc/api_op_JsonUnions.go index 799ffead0fa..8fd647d614b 100644 --- a/internal/protocoltest/jsonrpc/api_op_JsonUnions.go +++ b/internal/protocoltest/jsonrpc/api_op_JsonUnions.go @@ -5,7 +5,6 @@ package jsonrpc import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/jsonrpc/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) JsonUnions(ctx context.Context, params *JsonUnionsInput, optFns addawsAwsjson11_serdeOpJsonUnionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/internal/protocoltest/jsonrpc/api_op_KitchenSinkOperation.go b/internal/protocoltest/jsonrpc/api_op_KitchenSinkOperation.go index 2dbf7e0439a..c226ce67bfa 100644 --- a/internal/protocoltest/jsonrpc/api_op_KitchenSinkOperation.go +++ b/internal/protocoltest/jsonrpc/api_op_KitchenSinkOperation.go @@ -5,7 +5,6 @@ package jsonrpc import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/jsonrpc/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) KitchenSinkOperation(ctx context.Context, params *KitchenSinkOp addawsAwsjson11_serdeOpKitchenSinkOperationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/internal/protocoltest/jsonrpc/api_op_NullOperation.go b/internal/protocoltest/jsonrpc/api_op_NullOperation.go index 32953317768..e54a29016e8 100644 --- a/internal/protocoltest/jsonrpc/api_op_NullOperation.go +++ b/internal/protocoltest/jsonrpc/api_op_NullOperation.go @@ -5,7 +5,6 @@ package jsonrpc import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -21,9 +20,9 @@ func (c *Client) NullOperation(ctx context.Context, params *NullOperationInput, addawsAwsjson11_serdeOpNullOperationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/internal/protocoltest/jsonrpc/api_op_OperationWithOptionalInputOutput.go b/internal/protocoltest/jsonrpc/api_op_OperationWithOptionalInputOutput.go index 17438a5d65e..f88c3a1955f 100644 --- a/internal/protocoltest/jsonrpc/api_op_OperationWithOptionalInputOutput.go +++ b/internal/protocoltest/jsonrpc/api_op_OperationWithOptionalInputOutput.go @@ -5,7 +5,6 @@ package jsonrpc import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -21,9 +20,9 @@ func (c *Client) OperationWithOptionalInputOutput(ctx context.Context, params *O addawsAwsjson11_serdeOpOperationWithOptionalInputOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/internal/protocoltest/jsonrpc/api_op_PutAndGetInlineDocuments.go b/internal/protocoltest/jsonrpc/api_op_PutAndGetInlineDocuments.go index 2b725a0f03c..402bc203231 100644 --- a/internal/protocoltest/jsonrpc/api_op_PutAndGetInlineDocuments.go +++ b/internal/protocoltest/jsonrpc/api_op_PutAndGetInlineDocuments.go @@ -5,7 +5,6 @@ package jsonrpc import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) PutAndGetInlineDocuments(ctx context.Context, params *PutAndGet addawsAwsjson11_serdeOpPutAndGetInlineDocumentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/internal/protocoltest/jsonrpc/endpoints.go b/internal/protocoltest/jsonrpc/endpoints.go index 559669719bd..578d0ed7d86 100644 --- a/internal/protocoltest/jsonrpc/endpoints.go +++ b/internal/protocoltest/jsonrpc/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/internal/protocoltest/jsonrpc10/api_client.go b/internal/protocoltest/jsonrpc10/api_client.go index eb83ffe19f3..9df60c32ce4 100644 --- a/internal/protocoltest/jsonrpc10/api_client.go +++ b/internal/protocoltest/jsonrpc10/api_client.go @@ -65,22 +65,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -130,6 +114,13 @@ func addClientUserAgent(stack *middleware.Stack) { awsmiddleware.AddUserAgentKey("jsonrpc10")(stack) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/internal/protocoltest/jsonrpc10/api_op_EmptyInputAndEmptyOutput.go b/internal/protocoltest/jsonrpc10/api_op_EmptyInputAndEmptyOutput.go index 1dd7bfb4c0e..89daa8adaaa 100644 --- a/internal/protocoltest/jsonrpc10/api_op_EmptyInputAndEmptyOutput.go +++ b/internal/protocoltest/jsonrpc10/api_op_EmptyInputAndEmptyOutput.go @@ -5,7 +5,6 @@ package jsonrpc10 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -24,8 +23,8 @@ func (c *Client) EmptyInputAndEmptyOutput(ctx context.Context, params *EmptyInpu addawsAwsjson10_serdeOpEmptyInputAndEmptyOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/jsonrpc10/api_op_GreetingWithErrors.go b/internal/protocoltest/jsonrpc10/api_op_GreetingWithErrors.go index a3a1727e3c9..b6404a81dac 100644 --- a/internal/protocoltest/jsonrpc10/api_op_GreetingWithErrors.go +++ b/internal/protocoltest/jsonrpc10/api_op_GreetingWithErrors.go @@ -5,7 +5,6 @@ package jsonrpc10 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -32,8 +31,8 @@ func (c *Client) GreetingWithErrors(ctx context.Context, params *GreetingWithErr addawsAwsjson10_serdeOpGreetingWithErrorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/jsonrpc10/api_op_JsonUnions.go b/internal/protocoltest/jsonrpc10/api_op_JsonUnions.go index 39d2692eec9..38362ebc6f4 100644 --- a/internal/protocoltest/jsonrpc10/api_op_JsonUnions.go +++ b/internal/protocoltest/jsonrpc10/api_op_JsonUnions.go @@ -5,7 +5,6 @@ package jsonrpc10 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/jsonrpc10/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) JsonUnions(ctx context.Context, params *JsonUnionsInput, optFns addawsAwsjson10_serdeOpJsonUnionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/jsonrpc10/api_op_NoInputAndNoOutput.go b/internal/protocoltest/jsonrpc10/api_op_NoInputAndNoOutput.go index 547c0d3cdaa..9bb56e9115f 100644 --- a/internal/protocoltest/jsonrpc10/api_op_NoInputAndNoOutput.go +++ b/internal/protocoltest/jsonrpc10/api_op_NoInputAndNoOutput.go @@ -5,7 +5,6 @@ package jsonrpc10 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) NoInputAndNoOutput(ctx context.Context, params *NoInputAndNoOut addawsAwsjson10_serdeOpNoInputAndNoOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/jsonrpc10/api_op_NoInputAndOutput.go b/internal/protocoltest/jsonrpc10/api_op_NoInputAndOutput.go index 8bd06f5ba7f..f191dcd59fb 100644 --- a/internal/protocoltest/jsonrpc10/api_op_NoInputAndOutput.go +++ b/internal/protocoltest/jsonrpc10/api_op_NoInputAndOutput.go @@ -5,7 +5,6 @@ package jsonrpc10 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) NoInputAndOutput(ctx context.Context, params *NoInputAndOutputI addawsAwsjson10_serdeOpNoInputAndOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/jsonrpc10/endpoints.go b/internal/protocoltest/jsonrpc10/endpoints.go index d69ee53705c..d2c7c335ff9 100644 --- a/internal/protocoltest/jsonrpc10/endpoints.go +++ b/internal/protocoltest/jsonrpc10/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/internal/protocoltest/query/api_client.go b/internal/protocoltest/query/api_client.go index cd0b33b4436..236c8a6ee0a 100644 --- a/internal/protocoltest/query/api_client.go +++ b/internal/protocoltest/query/api_client.go @@ -74,26 +74,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -150,6 +130,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/internal/protocoltest/query/api_op_EmptyInputAndEmptyOutput.go b/internal/protocoltest/query/api_op_EmptyInputAndEmptyOutput.go index beb8cc284a2..65410a1987c 100644 --- a/internal/protocoltest/query/api_op_EmptyInputAndEmptyOutput.go +++ b/internal/protocoltest/query/api_op_EmptyInputAndEmptyOutput.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) EmptyInputAndEmptyOutput(ctx context.Context, params *EmptyInpu addawsAwsquery_serdeOpEmptyInputAndEmptyOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_FlattenedXmlMap.go b/internal/protocoltest/query/api_op_FlattenedXmlMap.go index 3e58cb05d21..cfce4919b36 100644 --- a/internal/protocoltest/query/api_op_FlattenedXmlMap.go +++ b/internal/protocoltest/query/api_op_FlattenedXmlMap.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) FlattenedXmlMap(ctx context.Context, params *FlattenedXmlMapInp addawsAwsquery_serdeOpFlattenedXmlMapMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_FlattenedXmlMapWithXmlName.go b/internal/protocoltest/query/api_op_FlattenedXmlMapWithXmlName.go index 44b85bff3a5..46a40eadbfb 100644 --- a/internal/protocoltest/query/api_op_FlattenedXmlMapWithXmlName.go +++ b/internal/protocoltest/query/api_op_FlattenedXmlMapWithXmlName.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) FlattenedXmlMapWithXmlName(ctx context.Context, params *Flatten addawsAwsquery_serdeOpFlattenedXmlMapWithXmlNameMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_GreetingWithErrors.go b/internal/protocoltest/query/api_op_GreetingWithErrors.go index 9aeda34f8bc..d002cc7a4ed 100644 --- a/internal/protocoltest/query/api_op_GreetingWithErrors.go +++ b/internal/protocoltest/query/api_op_GreetingWithErrors.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -29,8 +28,8 @@ func (c *Client) GreetingWithErrors(ctx context.Context, params *GreetingWithErr addawsAwsquery_serdeOpGreetingWithErrorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_IgnoresWrappingXmlName.go b/internal/protocoltest/query/api_op_IgnoresWrappingXmlName.go index 16bf2f39c9c..e6976216f06 100644 --- a/internal/protocoltest/query/api_op_IgnoresWrappingXmlName.go +++ b/internal/protocoltest/query/api_op_IgnoresWrappingXmlName.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) IgnoresWrappingXmlName(ctx context.Context, params *IgnoresWrap addawsAwsquery_serdeOpIgnoresWrappingXmlNameMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_NestedStructures.go b/internal/protocoltest/query/api_op_NestedStructures.go index 342ae8a3259..a8b87b90703 100644 --- a/internal/protocoltest/query/api_op_NestedStructures.go +++ b/internal/protocoltest/query/api_op_NestedStructures.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) NestedStructures(ctx context.Context, params *NestedStructuresI addawsAwsquery_serdeOpNestedStructuresMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_NoInputAndNoOutput.go b/internal/protocoltest/query/api_op_NoInputAndNoOutput.go index 0d237bd0842..ce96f2c2437 100644 --- a/internal/protocoltest/query/api_op_NoInputAndNoOutput.go +++ b/internal/protocoltest/query/api_op_NoInputAndNoOutput.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) NoInputAndNoOutput(ctx context.Context, params *NoInputAndNoOut addawsAwsquery_serdeOpNoInputAndNoOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_NoInputAndOutput.go b/internal/protocoltest/query/api_op_NoInputAndOutput.go index d62e5072afd..c58a63bd78b 100644 --- a/internal/protocoltest/query/api_op_NoInputAndOutput.go +++ b/internal/protocoltest/query/api_op_NoInputAndOutput.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) NoInputAndOutput(ctx context.Context, params *NoInputAndOutputI addawsAwsquery_serdeOpNoInputAndOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_QueryIdempotencyTokenAutoFill.go b/internal/protocoltest/query/api_op_QueryIdempotencyTokenAutoFill.go index b7ca5f75b1f..bbac2487231 100644 --- a/internal/protocoltest/query/api_op_QueryIdempotencyTokenAutoFill.go +++ b/internal/protocoltest/query/api_op_QueryIdempotencyTokenAutoFill.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -22,8 +21,8 @@ func (c *Client) QueryIdempotencyTokenAutoFill(ctx context.Context, params *Quer addawsAwsquery_serdeOpQueryIdempotencyTokenAutoFillMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_QueryLists.go b/internal/protocoltest/query/api_op_QueryLists.go index 9ada648b388..d441362d16c 100644 --- a/internal/protocoltest/query/api_op_QueryLists.go +++ b/internal/protocoltest/query/api_op_QueryLists.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) QueryLists(ctx context.Context, params *QueryListsInput, optFns addawsAwsquery_serdeOpQueryListsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_QueryMaps.go b/internal/protocoltest/query/api_op_QueryMaps.go index 1d571966215..5661cd8540e 100644 --- a/internal/protocoltest/query/api_op_QueryMaps.go +++ b/internal/protocoltest/query/api_op_QueryMaps.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) QueryMaps(ctx context.Context, params *QueryMapsInput, optFns . addawsAwsquery_serdeOpQueryMapsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_QueryTimestamps.go b/internal/protocoltest/query/api_op_QueryTimestamps.go index 4ffb9770427..c24bfbf3299 100644 --- a/internal/protocoltest/query/api_op_QueryTimestamps.go +++ b/internal/protocoltest/query/api_op_QueryTimestamps.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -31,8 +30,8 @@ func (c *Client) QueryTimestamps(ctx context.Context, params *QueryTimestampsInp addawsAwsquery_serdeOpQueryTimestampsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_RecursiveXmlShapes.go b/internal/protocoltest/query/api_op_RecursiveXmlShapes.go index d1f352791c7..7ea7db53d63 100644 --- a/internal/protocoltest/query/api_op_RecursiveXmlShapes.go +++ b/internal/protocoltest/query/api_op_RecursiveXmlShapes.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) RecursiveXmlShapes(ctx context.Context, params *RecursiveXmlSha addawsAwsquery_serdeOpRecursiveXmlShapesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_SimpleInputParams.go b/internal/protocoltest/query/api_op_SimpleInputParams.go index fd565c1efa7..da39c768bf0 100644 --- a/internal/protocoltest/query/api_op_SimpleInputParams.go +++ b/internal/protocoltest/query/api_op_SimpleInputParams.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) SimpleInputParams(ctx context.Context, params *SimpleInputParam addawsAwsquery_serdeOpSimpleInputParamsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_SimpleScalarXmlProperties.go b/internal/protocoltest/query/api_op_SimpleScalarXmlProperties.go index 59bcbe84d85..e55b4467b00 100644 --- a/internal/protocoltest/query/api_op_SimpleScalarXmlProperties.go +++ b/internal/protocoltest/query/api_op_SimpleScalarXmlProperties.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -20,8 +19,8 @@ func (c *Client) SimpleScalarXmlProperties(ctx context.Context, params *SimpleSc addawsAwsquery_serdeOpSimpleScalarXmlPropertiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_XmlBlobs.go b/internal/protocoltest/query/api_op_XmlBlobs.go index 26dbb858e60..e37460a7932 100644 --- a/internal/protocoltest/query/api_op_XmlBlobs.go +++ b/internal/protocoltest/query/api_op_XmlBlobs.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) XmlBlobs(ctx context.Context, params *XmlBlobsInput, optFns ... addawsAwsquery_serdeOpXmlBlobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_XmlEmptyBlobs.go b/internal/protocoltest/query/api_op_XmlEmptyBlobs.go index e291885a1b6..98af046d6a1 100644 --- a/internal/protocoltest/query/api_op_XmlEmptyBlobs.go +++ b/internal/protocoltest/query/api_op_XmlEmptyBlobs.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -20,8 +19,8 @@ func (c *Client) XmlEmptyBlobs(ctx context.Context, params *XmlEmptyBlobsInput, addawsAwsquery_serdeOpXmlEmptyBlobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_XmlEmptyLists.go b/internal/protocoltest/query/api_op_XmlEmptyLists.go index 41ae2a92457..e55af9740dd 100644 --- a/internal/protocoltest/query/api_op_XmlEmptyLists.go +++ b/internal/protocoltest/query/api_op_XmlEmptyLists.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) XmlEmptyLists(ctx context.Context, params *XmlEmptyListsInput, addawsAwsquery_serdeOpXmlEmptyListsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_XmlEmptyMaps.go b/internal/protocoltest/query/api_op_XmlEmptyMaps.go index 49d3cd16d33..44025bde3a9 100644 --- a/internal/protocoltest/query/api_op_XmlEmptyMaps.go +++ b/internal/protocoltest/query/api_op_XmlEmptyMaps.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -21,8 +20,8 @@ func (c *Client) XmlEmptyMaps(ctx context.Context, params *XmlEmptyMapsInput, op addawsAwsquery_serdeOpXmlEmptyMapsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_XmlEnums.go b/internal/protocoltest/query/api_op_XmlEnums.go index 2571560e20b..8e822167275 100644 --- a/internal/protocoltest/query/api_op_XmlEnums.go +++ b/internal/protocoltest/query/api_op_XmlEnums.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) XmlEnums(ctx context.Context, params *XmlEnumsInput, optFns ... addawsAwsquery_serdeOpXmlEnumsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_XmlLists.go b/internal/protocoltest/query/api_op_XmlLists.go index 17ec2222370..a129cf45a4e 100644 --- a/internal/protocoltest/query/api_op_XmlLists.go +++ b/internal/protocoltest/query/api_op_XmlLists.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -40,8 +39,8 @@ func (c *Client) XmlLists(ctx context.Context, params *XmlListsInput, optFns ... addawsAwsquery_serdeOpXmlListsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_XmlMaps.go b/internal/protocoltest/query/api_op_XmlMaps.go index 8fc102a9515..6d42c2554a2 100644 --- a/internal/protocoltest/query/api_op_XmlMaps.go +++ b/internal/protocoltest/query/api_op_XmlMaps.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) XmlMaps(ctx context.Context, params *XmlMapsInput, optFns ...fu addawsAwsquery_serdeOpXmlMapsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_XmlMapsXmlName.go b/internal/protocoltest/query/api_op_XmlMapsXmlName.go index 0f0d6b227c9..f34f54357c7 100644 --- a/internal/protocoltest/query/api_op_XmlMapsXmlName.go +++ b/internal/protocoltest/query/api_op_XmlMapsXmlName.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -21,8 +20,8 @@ func (c *Client) XmlMapsXmlName(ctx context.Context, params *XmlMapsXmlNameInput addawsAwsquery_serdeOpXmlMapsXmlNameMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_XmlNamespaces.go b/internal/protocoltest/query/api_op_XmlNamespaces.go index 442c827de31..1beb329c578 100644 --- a/internal/protocoltest/query/api_op_XmlNamespaces.go +++ b/internal/protocoltest/query/api_op_XmlNamespaces.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/query/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -21,8 +20,8 @@ func (c *Client) XmlNamespaces(ctx context.Context, params *XmlNamespacesInput, addawsAwsquery_serdeOpXmlNamespacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/api_op_XmlTimestamps.go b/internal/protocoltest/query/api_op_XmlTimestamps.go index 33935350573..ca352c4dd5a 100644 --- a/internal/protocoltest/query/api_op_XmlTimestamps.go +++ b/internal/protocoltest/query/api_op_XmlTimestamps.go @@ -5,7 +5,6 @@ package query import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) XmlTimestamps(ctx context.Context, params *XmlTimestampsInput, addawsAwsquery_serdeOpXmlTimestampsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/query/endpoints.go b/internal/protocoltest/query/endpoints.go index 8e398780d88..395fcd91995 100644 --- a/internal/protocoltest/query/endpoints.go +++ b/internal/protocoltest/query/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/internal/protocoltest/restxml/api_client.go b/internal/protocoltest/restxml/api_client.go index 0cbf67d3157..48e5c9ab393 100644 --- a/internal/protocoltest/restxml/api_client.go +++ b/internal/protocoltest/restxml/api_client.go @@ -74,26 +74,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -150,6 +130,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/internal/protocoltest/restxml/api_op_AllQueryStringTypes.go b/internal/protocoltest/restxml/api_op_AllQueryStringTypes.go index c59cedd2059..51b82ad1c71 100644 --- a/internal/protocoltest/restxml/api_op_AllQueryStringTypes.go +++ b/internal/protocoltest/restxml/api_op_AllQueryStringTypes.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxml/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,8 +22,8 @@ func (c *Client) AllQueryStringTypes(ctx context.Context, params *AllQueryString addawsRestxml_serdeOpAllQueryStringTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_ConstantAndVariableQueryString.go b/internal/protocoltest/restxml/api_op_ConstantAndVariableQueryString.go index 1c69ce569ee..36aa88d000f 100644 --- a/internal/protocoltest/restxml/api_op_ConstantAndVariableQueryString.go +++ b/internal/protocoltest/restxml/api_op_ConstantAndVariableQueryString.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) ConstantAndVariableQueryString(ctx context.Context, params *Con addawsRestxml_serdeOpConstantAndVariableQueryStringMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_ConstantQueryString.go b/internal/protocoltest/restxml/api_op_ConstantQueryString.go index 1372d6897e9..62183753286 100644 --- a/internal/protocoltest/restxml/api_op_ConstantQueryString.go +++ b/internal/protocoltest/restxml/api_op_ConstantQueryString.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -24,8 +23,8 @@ func (c *Client) ConstantQueryString(ctx context.Context, params *ConstantQueryS addawsRestxml_serdeOpConstantQueryStringMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_EmptyInputAndEmptyOutput.go b/internal/protocoltest/restxml/api_op_EmptyInputAndEmptyOutput.go index 3162910c297..a585c3c4123 100644 --- a/internal/protocoltest/restxml/api_op_EmptyInputAndEmptyOutput.go +++ b/internal/protocoltest/restxml/api_op_EmptyInputAndEmptyOutput.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -24,8 +23,8 @@ func (c *Client) EmptyInputAndEmptyOutput(ctx context.Context, params *EmptyInpu addawsRestxml_serdeOpEmptyInputAndEmptyOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_FlattenedXmlMap.go b/internal/protocoltest/restxml/api_op_FlattenedXmlMap.go index 5c8546c5c5d..0c731c80109 100644 --- a/internal/protocoltest/restxml/api_op_FlattenedXmlMap.go +++ b/internal/protocoltest/restxml/api_op_FlattenedXmlMap.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxml/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) FlattenedXmlMap(ctx context.Context, params *FlattenedXmlMapInp addawsRestxml_serdeOpFlattenedXmlMapMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_FlattenedXmlMapWithXmlName.go b/internal/protocoltest/restxml/api_op_FlattenedXmlMapWithXmlName.go index 98c89addc16..a8a1263c5a7 100644 --- a/internal/protocoltest/restxml/api_op_FlattenedXmlMapWithXmlName.go +++ b/internal/protocoltest/restxml/api_op_FlattenedXmlMapWithXmlName.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) FlattenedXmlMapWithXmlName(ctx context.Context, params *Flatten addawsRestxml_serdeOpFlattenedXmlMapWithXmlNameMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_GreetingWithErrors.go b/internal/protocoltest/restxml/api_op_GreetingWithErrors.go index 88ea7b5da75..4cc86a91d09 100644 --- a/internal/protocoltest/restxml/api_op_GreetingWithErrors.go +++ b/internal/protocoltest/restxml/api_op_GreetingWithErrors.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -33,8 +32,8 @@ func (c *Client) GreetingWithErrors(ctx context.Context, params *GreetingWithErr addawsRestxml_serdeOpGreetingWithErrorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_HttpPayloadTraits.go b/internal/protocoltest/restxml/api_op_HttpPayloadTraits.go index 3635fe31f1a..e31b2b65f0e 100644 --- a/internal/protocoltest/restxml/api_op_HttpPayloadTraits.go +++ b/internal/protocoltest/restxml/api_op_HttpPayloadTraits.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -22,8 +21,8 @@ func (c *Client) HttpPayloadTraits(ctx context.Context, params *HttpPayloadTrait addawsRestxml_serdeOpHttpPayloadTraitsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_HttpPayloadTraitsWithMediaType.go b/internal/protocoltest/restxml/api_op_HttpPayloadTraitsWithMediaType.go index bb58ddbc7b3..01b9cf44893 100644 --- a/internal/protocoltest/restxml/api_op_HttpPayloadTraitsWithMediaType.go +++ b/internal/protocoltest/restxml/api_op_HttpPayloadTraitsWithMediaType.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -22,8 +21,8 @@ func (c *Client) HttpPayloadTraitsWithMediaType(ctx context.Context, params *Htt addawsRestxml_serdeOpHttpPayloadTraitsWithMediaTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_HttpPayloadWithStructure.go b/internal/protocoltest/restxml/api_op_HttpPayloadWithStructure.go index 69cebcb53d0..e9d2a61019b 100644 --- a/internal/protocoltest/restxml/api_op_HttpPayloadWithStructure.go +++ b/internal/protocoltest/restxml/api_op_HttpPayloadWithStructure.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxml/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,8 +22,8 @@ func (c *Client) HttpPayloadWithStructure(ctx context.Context, params *HttpPaylo addawsRestxml_serdeOpHttpPayloadWithStructureMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlName.go b/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlName.go index ebdc88cad05..9d11c717a0d 100644 --- a/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlName.go +++ b/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlName.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxml/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,8 +22,8 @@ func (c *Client) HttpPayloadWithXmlName(ctx context.Context, params *HttpPayload addawsRestxml_serdeOpHttpPayloadWithXmlNameMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlNamespace.go b/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlNamespace.go index b7e71c5a7eb..69f4502f397 100644 --- a/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlNamespace.go +++ b/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlNamespace.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxml/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) HttpPayloadWithXmlNamespace(ctx context.Context, params *HttpPa addawsRestxml_serdeOpHttpPayloadWithXmlNamespaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlNamespaceAndPrefix.go b/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlNamespaceAndPrefix.go index 76019120a9b..75aebb07c01 100644 --- a/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlNamespaceAndPrefix.go +++ b/internal/protocoltest/restxml/api_op_HttpPayloadWithXmlNamespaceAndPrefix.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxml/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) HttpPayloadWithXmlNamespaceAndPrefix(ctx context.Context, param addawsRestxml_serdeOpHttpPayloadWithXmlNamespaceAndPrefixMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_HttpPrefixHeaders.go b/internal/protocoltest/restxml/api_op_HttpPrefixHeaders.go index a4aa00817dd..f604f1ace72 100644 --- a/internal/protocoltest/restxml/api_op_HttpPrefixHeaders.go +++ b/internal/protocoltest/restxml/api_op_HttpPrefixHeaders.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) HttpPrefixHeaders(ctx context.Context, params *HttpPrefixHeader addawsRestxml_serdeOpHttpPrefixHeadersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_HttpRequestWithGreedyLabelInPath.go b/internal/protocoltest/restxml/api_op_HttpRequestWithGreedyLabelInPath.go index 781ea13ebe0..e13ca4cfc34 100644 --- a/internal/protocoltest/restxml/api_op_HttpRequestWithGreedyLabelInPath.go +++ b/internal/protocoltest/restxml/api_op_HttpRequestWithGreedyLabelInPath.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -20,8 +19,8 @@ func (c *Client) HttpRequestWithGreedyLabelInPath(ctx context.Context, params *H addawsRestxml_serdeOpHttpRequestWithGreedyLabelInPathMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_HttpRequestWithLabels.go b/internal/protocoltest/restxml/api_op_HttpRequestWithLabels.go index 022f1a33176..f9a7e0c9bfd 100644 --- a/internal/protocoltest/restxml/api_op_HttpRequestWithLabels.go +++ b/internal/protocoltest/restxml/api_op_HttpRequestWithLabels.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) HttpRequestWithLabels(ctx context.Context, params *HttpRequestW addawsRestxml_serdeOpHttpRequestWithLabelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_HttpRequestWithLabelsAndTimestampFormat.go b/internal/protocoltest/restxml/api_op_HttpRequestWithLabelsAndTimestampFormat.go index 33a2e6a6f4c..ddae0b2babb 100644 --- a/internal/protocoltest/restxml/api_op_HttpRequestWithLabelsAndTimestampFormat.go +++ b/internal/protocoltest/restxml/api_op_HttpRequestWithLabelsAndTimestampFormat.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) HttpRequestWithLabelsAndTimestampFormat(ctx context.Context, pa addawsRestxml_serdeOpHttpRequestWithLabelsAndTimestampFormatMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_HttpResponseCode.go b/internal/protocoltest/restxml/api_op_HttpResponseCode.go index f8bfd82665a..e55f428ec7c 100644 --- a/internal/protocoltest/restxml/api_op_HttpResponseCode.go +++ b/internal/protocoltest/restxml/api_op_HttpResponseCode.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -20,8 +19,8 @@ func (c *Client) HttpResponseCode(ctx context.Context, params *HttpResponseCodeI addawsRestxml_serdeOpHttpResponseCodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_IgnoreQueryParamsInResponse.go b/internal/protocoltest/restxml/api_op_IgnoreQueryParamsInResponse.go index 87c3b2a84ba..d7c95a8516d 100644 --- a/internal/protocoltest/restxml/api_op_IgnoreQueryParamsInResponse.go +++ b/internal/protocoltest/restxml/api_op_IgnoreQueryParamsInResponse.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) IgnoreQueryParamsInResponse(ctx context.Context, params *Ignore addawsRestxml_serdeOpIgnoreQueryParamsInResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_InputAndOutputWithHeaders.go b/internal/protocoltest/restxml/api_op_InputAndOutputWithHeaders.go index f21f4126b4a..6f24fddd6a1 100644 --- a/internal/protocoltest/restxml/api_op_InputAndOutputWithHeaders.go +++ b/internal/protocoltest/restxml/api_op_InputAndOutputWithHeaders.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxml/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,8 +23,8 @@ func (c *Client) InputAndOutputWithHeaders(ctx context.Context, params *InputAnd addawsRestxml_serdeOpInputAndOutputWithHeadersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_NoInputAndNoOutput.go b/internal/protocoltest/restxml/api_op_NoInputAndNoOutput.go index 23c12430422..cf8167c7c00 100644 --- a/internal/protocoltest/restxml/api_op_NoInputAndNoOutput.go +++ b/internal/protocoltest/restxml/api_op_NoInputAndNoOutput.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) NoInputAndNoOutput(ctx context.Context, params *NoInputAndNoOut addawsRestxml_serdeOpNoInputAndNoOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_NoInputAndOutput.go b/internal/protocoltest/restxml/api_op_NoInputAndOutput.go index 8b152a81b7e..03951e7b706 100644 --- a/internal/protocoltest/restxml/api_op_NoInputAndOutput.go +++ b/internal/protocoltest/restxml/api_op_NoInputAndOutput.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) NoInputAndOutput(ctx context.Context, params *NoInputAndOutputI addawsRestxml_serdeOpNoInputAndOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_NullAndEmptyHeadersClient.go b/internal/protocoltest/restxml/api_op_NullAndEmptyHeadersClient.go index f03c3c39378..123691c4045 100644 --- a/internal/protocoltest/restxml/api_op_NullAndEmptyHeadersClient.go +++ b/internal/protocoltest/restxml/api_op_NullAndEmptyHeadersClient.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) NullAndEmptyHeadersClient(ctx context.Context, params *NullAndE addawsRestxml_serdeOpNullAndEmptyHeadersClientMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_NullAndEmptyHeadersServer.go b/internal/protocoltest/restxml/api_op_NullAndEmptyHeadersServer.go index 23f5ce93eae..bb33826da15 100644 --- a/internal/protocoltest/restxml/api_op_NullAndEmptyHeadersServer.go +++ b/internal/protocoltest/restxml/api_op_NullAndEmptyHeadersServer.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) NullAndEmptyHeadersServer(ctx context.Context, params *NullAndE addawsRestxml_serdeOpNullAndEmptyHeadersServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_OmitsNullSerializesEmptyString.go b/internal/protocoltest/restxml/api_op_OmitsNullSerializesEmptyString.go index df78d99ce49..15fbeffd584 100644 --- a/internal/protocoltest/restxml/api_op_OmitsNullSerializesEmptyString.go +++ b/internal/protocoltest/restxml/api_op_OmitsNullSerializesEmptyString.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) OmitsNullSerializesEmptyString(ctx context.Context, params *Omi addawsRestxml_serdeOpOmitsNullSerializesEmptyStringMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_QueryIdempotencyTokenAutoFill.go b/internal/protocoltest/restxml/api_op_QueryIdempotencyTokenAutoFill.go index c58167104a5..16bdd95ba9c 100644 --- a/internal/protocoltest/restxml/api_op_QueryIdempotencyTokenAutoFill.go +++ b/internal/protocoltest/restxml/api_op_QueryIdempotencyTokenAutoFill.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -22,8 +21,8 @@ func (c *Client) QueryIdempotencyTokenAutoFill(ctx context.Context, params *Quer addawsRestxml_serdeOpQueryIdempotencyTokenAutoFillMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_RecursiveShapes.go b/internal/protocoltest/restxml/api_op_RecursiveShapes.go index e5f31e3f68c..c3afe000059 100644 --- a/internal/protocoltest/restxml/api_op_RecursiveShapes.go +++ b/internal/protocoltest/restxml/api_op_RecursiveShapes.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxml/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) RecursiveShapes(ctx context.Context, params *RecursiveShapesInp addawsRestxml_serdeOpRecursiveShapesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_SimpleScalarProperties.go b/internal/protocoltest/restxml/api_op_SimpleScalarProperties.go index 8f5d0225920..3bde0e6b1b7 100644 --- a/internal/protocoltest/restxml/api_op_SimpleScalarProperties.go +++ b/internal/protocoltest/restxml/api_op_SimpleScalarProperties.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -20,8 +19,8 @@ func (c *Client) SimpleScalarProperties(ctx context.Context, params *SimpleScala addawsRestxml_serdeOpSimpleScalarPropertiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_TimestampFormatHeaders.go b/internal/protocoltest/restxml/api_op_TimestampFormatHeaders.go index 2fe14e5a746..5132e947146 100644 --- a/internal/protocoltest/restxml/api_op_TimestampFormatHeaders.go +++ b/internal/protocoltest/restxml/api_op_TimestampFormatHeaders.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -22,8 +21,8 @@ func (c *Client) TimestampFormatHeaders(ctx context.Context, params *TimestampFo addawsRestxml_serdeOpTimestampFormatHeadersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_XmlAttributes.go b/internal/protocoltest/restxml/api_op_XmlAttributes.go index 8a9498b52de..c0d211cac00 100644 --- a/internal/protocoltest/restxml/api_op_XmlAttributes.go +++ b/internal/protocoltest/restxml/api_op_XmlAttributes.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) XmlAttributes(ctx context.Context, params *XmlAttributesInput, addawsRestxml_serdeOpXmlAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_XmlAttributesOnPayload.go b/internal/protocoltest/restxml/api_op_XmlAttributesOnPayload.go index 0bd027302eb..6abf3dd848b 100644 --- a/internal/protocoltest/restxml/api_op_XmlAttributesOnPayload.go +++ b/internal/protocoltest/restxml/api_op_XmlAttributesOnPayload.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxml/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) XmlAttributesOnPayload(ctx context.Context, params *XmlAttribut addawsRestxml_serdeOpXmlAttributesOnPayloadMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_XmlBlobs.go b/internal/protocoltest/restxml/api_op_XmlBlobs.go index 110fe16c114..2a7ec3f60bc 100644 --- a/internal/protocoltest/restxml/api_op_XmlBlobs.go +++ b/internal/protocoltest/restxml/api_op_XmlBlobs.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) XmlBlobs(ctx context.Context, params *XmlBlobsInput, optFns ... addawsRestxml_serdeOpXmlBlobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_XmlEmptyBlobs.go b/internal/protocoltest/restxml/api_op_XmlEmptyBlobs.go index ad5c6691b78..75974754fab 100644 --- a/internal/protocoltest/restxml/api_op_XmlEmptyBlobs.go +++ b/internal/protocoltest/restxml/api_op_XmlEmptyBlobs.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) XmlEmptyBlobs(ctx context.Context, params *XmlEmptyBlobsInput, addawsRestxml_serdeOpXmlEmptyBlobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_XmlEmptyLists.go b/internal/protocoltest/restxml/api_op_XmlEmptyLists.go index c07516fde70..00738314a1f 100644 --- a/internal/protocoltest/restxml/api_op_XmlEmptyLists.go +++ b/internal/protocoltest/restxml/api_op_XmlEmptyLists.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxml/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) XmlEmptyLists(ctx context.Context, params *XmlEmptyListsInput, addawsRestxml_serdeOpXmlEmptyListsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_XmlEmptyMaps.go b/internal/protocoltest/restxml/api_op_XmlEmptyMaps.go index 6a979bb6026..4f1cad6f128 100644 --- a/internal/protocoltest/restxml/api_op_XmlEmptyMaps.go +++ b/internal/protocoltest/restxml/api_op_XmlEmptyMaps.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxml/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -21,8 +20,8 @@ func (c *Client) XmlEmptyMaps(ctx context.Context, params *XmlEmptyMapsInput, op addawsRestxml_serdeOpXmlEmptyMapsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_XmlEmptyStrings.go b/internal/protocoltest/restxml/api_op_XmlEmptyStrings.go index 9b0fda0f329..129e778c0de 100644 --- a/internal/protocoltest/restxml/api_op_XmlEmptyStrings.go +++ b/internal/protocoltest/restxml/api_op_XmlEmptyStrings.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -20,8 +19,8 @@ func (c *Client) XmlEmptyStrings(ctx context.Context, params *XmlEmptyStringsInp addawsRestxml_serdeOpXmlEmptyStringsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_XmlEnums.go b/internal/protocoltest/restxml/api_op_XmlEnums.go index 00b5cef123d..12ef7fcb26e 100644 --- a/internal/protocoltest/restxml/api_op_XmlEnums.go +++ b/internal/protocoltest/restxml/api_op_XmlEnums.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxml/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) XmlEnums(ctx context.Context, params *XmlEnumsInput, optFns ... addawsRestxml_serdeOpXmlEnumsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_XmlLists.go b/internal/protocoltest/restxml/api_op_XmlLists.go index bfbf3985941..fef6a858bba 100644 --- a/internal/protocoltest/restxml/api_op_XmlLists.go +++ b/internal/protocoltest/restxml/api_op_XmlLists.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxml/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -40,8 +39,8 @@ func (c *Client) XmlLists(ctx context.Context, params *XmlListsInput, optFns ... addawsRestxml_serdeOpXmlListsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_XmlMaps.go b/internal/protocoltest/restxml/api_op_XmlMaps.go index cd6b160d94d..648139d3ba2 100644 --- a/internal/protocoltest/restxml/api_op_XmlMaps.go +++ b/internal/protocoltest/restxml/api_op_XmlMaps.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxml/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) XmlMaps(ctx context.Context, params *XmlMapsInput, optFns ...fu addawsRestxml_serdeOpXmlMapsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_XmlMapsXmlName.go b/internal/protocoltest/restxml/api_op_XmlMapsXmlName.go index dfe0d3b3e5e..c9a33cffe7a 100644 --- a/internal/protocoltest/restxml/api_op_XmlMapsXmlName.go +++ b/internal/protocoltest/restxml/api_op_XmlMapsXmlName.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxml/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -21,8 +20,8 @@ func (c *Client) XmlMapsXmlName(ctx context.Context, params *XmlMapsXmlNameInput addawsRestxml_serdeOpXmlMapsXmlNameMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_XmlNamespaces.go b/internal/protocoltest/restxml/api_op_XmlNamespaces.go index 637864eaef2..9bfaa81a799 100644 --- a/internal/protocoltest/restxml/api_op_XmlNamespaces.go +++ b/internal/protocoltest/restxml/api_op_XmlNamespaces.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxml/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -21,8 +20,8 @@ func (c *Client) XmlNamespaces(ctx context.Context, params *XmlNamespacesInput, addawsRestxml_serdeOpXmlNamespacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/api_op_XmlTimestamps.go b/internal/protocoltest/restxml/api_op_XmlTimestamps.go index 3e922941281..237cb9bf7e3 100644 --- a/internal/protocoltest/restxml/api_op_XmlTimestamps.go +++ b/internal/protocoltest/restxml/api_op_XmlTimestamps.go @@ -5,7 +5,6 @@ package restxml import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) XmlTimestamps(ctx context.Context, params *XmlTimestampsInput, addawsRestxml_serdeOpXmlTimestampsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/internal/protocoltest/restxml/endpoints.go b/internal/protocoltest/restxml/endpoints.go index d883b3a7c72..6b7b1ecfe11 100644 --- a/internal/protocoltest/restxml/endpoints.go +++ b/internal/protocoltest/restxml/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/accessanalyzer/api_client.go b/service/accessanalyzer/api_client.go index e6e23c2f781..7317f983c9e 100644 --- a/service/accessanalyzer/api_client.go +++ b/service/accessanalyzer/api_client.go @@ -94,34 +94,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -194,6 +166,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/accessanalyzer/api_op_CreateAnalyzer.go b/service/accessanalyzer/api_op_CreateAnalyzer.go index 96bf3f1c473..6c600841722 100644 --- a/service/accessanalyzer/api_op_CreateAnalyzer.go +++ b/service/accessanalyzer/api_op_CreateAnalyzer.go @@ -5,7 +5,6 @@ package accessanalyzer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateAnalyzer(ctx context.Context, params *CreateAnalyzerInput addawsRestjson1_serdeOpCreateAnalyzerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/accessanalyzer/api_op_CreateArchiveRule.go b/service/accessanalyzer/api_op_CreateArchiveRule.go index c073327b62f..3a7c975eb81 100644 --- a/service/accessanalyzer/api_op_CreateArchiveRule.go +++ b/service/accessanalyzer/api_op_CreateArchiveRule.go @@ -5,7 +5,6 @@ package accessanalyzer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateArchiveRule(ctx context.Context, params *CreateArchiveRul addawsRestjson1_serdeOpCreateArchiveRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/accessanalyzer/api_op_DeleteAnalyzer.go b/service/accessanalyzer/api_op_DeleteAnalyzer.go index 424fbb9beab..131c03b76ed 100644 --- a/service/accessanalyzer/api_op_DeleteAnalyzer.go +++ b/service/accessanalyzer/api_op_DeleteAnalyzer.go @@ -5,7 +5,6 @@ package accessanalyzer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteAnalyzer(ctx context.Context, params *DeleteAnalyzerInput addawsRestjson1_serdeOpDeleteAnalyzerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/accessanalyzer/api_op_DeleteArchiveRule.go b/service/accessanalyzer/api_op_DeleteArchiveRule.go index dd42d9fd50c..a725242de15 100644 --- a/service/accessanalyzer/api_op_DeleteArchiveRule.go +++ b/service/accessanalyzer/api_op_DeleteArchiveRule.go @@ -5,7 +5,6 @@ package accessanalyzer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteArchiveRule(ctx context.Context, params *DeleteArchiveRul addawsRestjson1_serdeOpDeleteArchiveRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/accessanalyzer/api_op_GetAnalyzedResource.go b/service/accessanalyzer/api_op_GetAnalyzedResource.go index cb1ccefeca3..d8f699ffac1 100644 --- a/service/accessanalyzer/api_op_GetAnalyzedResource.go +++ b/service/accessanalyzer/api_op_GetAnalyzedResource.go @@ -5,7 +5,6 @@ package accessanalyzer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetAnalyzedResource(ctx context.Context, params *GetAnalyzedRes addawsRestjson1_serdeOpGetAnalyzedResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/accessanalyzer/api_op_GetAnalyzer.go b/service/accessanalyzer/api_op_GetAnalyzer.go index 8b1f24d226a..33d918abe54 100644 --- a/service/accessanalyzer/api_op_GetAnalyzer.go +++ b/service/accessanalyzer/api_op_GetAnalyzer.go @@ -5,7 +5,6 @@ package accessanalyzer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetAnalyzer(ctx context.Context, params *GetAnalyzerInput, optF addawsRestjson1_serdeOpGetAnalyzerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/accessanalyzer/api_op_GetArchiveRule.go b/service/accessanalyzer/api_op_GetArchiveRule.go index 00b8f1db951..3dfdae7fce1 100644 --- a/service/accessanalyzer/api_op_GetArchiveRule.go +++ b/service/accessanalyzer/api_op_GetArchiveRule.go @@ -5,7 +5,6 @@ package accessanalyzer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetArchiveRule(ctx context.Context, params *GetArchiveRuleInput addawsRestjson1_serdeOpGetArchiveRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/accessanalyzer/api_op_GetFinding.go b/service/accessanalyzer/api_op_GetFinding.go index ce85d815221..2a610b52af9 100644 --- a/service/accessanalyzer/api_op_GetFinding.go +++ b/service/accessanalyzer/api_op_GetFinding.go @@ -5,7 +5,6 @@ package accessanalyzer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetFinding(ctx context.Context, params *GetFindingInput, optFns addawsRestjson1_serdeOpGetFindingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/accessanalyzer/api_op_ListAnalyzedResources.go b/service/accessanalyzer/api_op_ListAnalyzedResources.go index a50fe573ca2..025a194d54f 100644 --- a/service/accessanalyzer/api_op_ListAnalyzedResources.go +++ b/service/accessanalyzer/api_op_ListAnalyzedResources.go @@ -5,7 +5,6 @@ package accessanalyzer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListAnalyzedResources(ctx context.Context, params *ListAnalyzed addawsRestjson1_serdeOpListAnalyzedResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/accessanalyzer/api_op_ListAnalyzers.go b/service/accessanalyzer/api_op_ListAnalyzers.go index 39f692991ef..b07f39a8b3e 100644 --- a/service/accessanalyzer/api_op_ListAnalyzers.go +++ b/service/accessanalyzer/api_op_ListAnalyzers.go @@ -5,7 +5,6 @@ package accessanalyzer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListAnalyzers(ctx context.Context, params *ListAnalyzersInput, addawsRestjson1_serdeOpListAnalyzersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/accessanalyzer/api_op_ListArchiveRules.go b/service/accessanalyzer/api_op_ListArchiveRules.go index ff71f7304e9..5f7a8cb06d8 100644 --- a/service/accessanalyzer/api_op_ListArchiveRules.go +++ b/service/accessanalyzer/api_op_ListArchiveRules.go @@ -5,7 +5,6 @@ package accessanalyzer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListArchiveRules(ctx context.Context, params *ListArchiveRulesI addawsRestjson1_serdeOpListArchiveRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/accessanalyzer/api_op_ListFindings.go b/service/accessanalyzer/api_op_ListFindings.go index 76ab40772a4..5c023e8fa04 100644 --- a/service/accessanalyzer/api_op_ListFindings.go +++ b/service/accessanalyzer/api_op_ListFindings.go @@ -5,7 +5,6 @@ package accessanalyzer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListFindings(ctx context.Context, params *ListFindingsInput, op addawsRestjson1_serdeOpListFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/accessanalyzer/api_op_ListTagsForResource.go b/service/accessanalyzer/api_op_ListTagsForResource.go index 081bd27a194..1e7379c2511 100644 --- a/service/accessanalyzer/api_op_ListTagsForResource.go +++ b/service/accessanalyzer/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package accessanalyzer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/accessanalyzer/api_op_StartResourceScan.go b/service/accessanalyzer/api_op_StartResourceScan.go index b8b4cc4b105..f867d24a850 100644 --- a/service/accessanalyzer/api_op_StartResourceScan.go +++ b/service/accessanalyzer/api_op_StartResourceScan.go @@ -5,7 +5,6 @@ package accessanalyzer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StartResourceScan(ctx context.Context, params *StartResourceSca addawsRestjson1_serdeOpStartResourceScanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/accessanalyzer/api_op_TagResource.go b/service/accessanalyzer/api_op_TagResource.go index 47f06b38192..7007f2bbe34 100644 --- a/service/accessanalyzer/api_op_TagResource.go +++ b/service/accessanalyzer/api_op_TagResource.go @@ -5,7 +5,6 @@ package accessanalyzer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/accessanalyzer/api_op_UntagResource.go b/service/accessanalyzer/api_op_UntagResource.go index 714d1e8e9f9..de2e7065da6 100644 --- a/service/accessanalyzer/api_op_UntagResource.go +++ b/service/accessanalyzer/api_op_UntagResource.go @@ -5,7 +5,6 @@ package accessanalyzer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/accessanalyzer/api_op_UpdateArchiveRule.go b/service/accessanalyzer/api_op_UpdateArchiveRule.go index 11699b06731..44ce003e914 100644 --- a/service/accessanalyzer/api_op_UpdateArchiveRule.go +++ b/service/accessanalyzer/api_op_UpdateArchiveRule.go @@ -5,7 +5,6 @@ package accessanalyzer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateArchiveRule(ctx context.Context, params *UpdateArchiveRul addawsRestjson1_serdeOpUpdateArchiveRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/accessanalyzer/api_op_UpdateFindings.go b/service/accessanalyzer/api_op_UpdateFindings.go index e3cf48b45d1..7c9d5b9c190 100644 --- a/service/accessanalyzer/api_op_UpdateFindings.go +++ b/service/accessanalyzer/api_op_UpdateFindings.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateFindings(ctx context.Context, params *UpdateFindingsInput addawsRestjson1_serdeOpUpdateFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/accessanalyzer/endpoints.go b/service/accessanalyzer/endpoints.go index 37ed9f9fbfa..bcb3c1f4ae1 100644 --- a/service/accessanalyzer/endpoints.go +++ b/service/accessanalyzer/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/acm/api_client.go b/service/acm/api_client.go index 9d8ce8b54ed..4e9d0943362 100644 --- a/service/acm/api_client.go +++ b/service/acm/api_client.go @@ -81,30 +81,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -170,6 +146,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/acm/api_op_AddTagsToCertificate.go b/service/acm/api_op_AddTagsToCertificate.go index 1a46f1fca92..18c2c0b4cf2 100644 --- a/service/acm/api_op_AddTagsToCertificate.go +++ b/service/acm/api_op_AddTagsToCertificate.go @@ -5,7 +5,6 @@ package acm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acm/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) AddTagsToCertificate(ctx context.Context, params *AddTagsToCert addawsAwsjson11_serdeOpAddTagsToCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acm/api_op_DeleteCertificate.go b/service/acm/api_op_DeleteCertificate.go index 3ed63d31682..cc760ba238c 100644 --- a/service/acm/api_op_DeleteCertificate.go +++ b/service/acm/api_op_DeleteCertificate.go @@ -5,7 +5,6 @@ package acm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeleteCertificate(ctx context.Context, params *DeleteCertificat addawsAwsjson11_serdeOpDeleteCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acm/api_op_DescribeCertificate.go b/service/acm/api_op_DescribeCertificate.go index d12ff85e631..0403e9557d0 100644 --- a/service/acm/api_op_DescribeCertificate.go +++ b/service/acm/api_op_DescribeCertificate.go @@ -5,7 +5,6 @@ package acm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeCertificate(ctx context.Context, params *DescribeCertif addawsAwsjson11_serdeOpDescribeCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acm/api_op_ExportCertificate.go b/service/acm/api_op_ExportCertificate.go index 083f16111ad..6c76dffc25a 100644 --- a/service/acm/api_op_ExportCertificate.go +++ b/service/acm/api_op_ExportCertificate.go @@ -5,7 +5,6 @@ package acm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) ExportCertificate(ctx context.Context, params *ExportCertificat addawsAwsjson11_serdeOpExportCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acm/api_op_GetCertificate.go b/service/acm/api_op_GetCertificate.go index 00ad142c07a..33abcbeabda 100644 --- a/service/acm/api_op_GetCertificate.go +++ b/service/acm/api_op_GetCertificate.go @@ -5,7 +5,6 @@ package acm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) GetCertificate(ctx context.Context, params *GetCertificateInput addawsAwsjson11_serdeOpGetCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acm/api_op_ImportCertificate.go b/service/acm/api_op_ImportCertificate.go index 25f2d8000ad..28dda24f47f 100644 --- a/service/acm/api_op_ImportCertificate.go +++ b/service/acm/api_op_ImportCertificate.go @@ -5,7 +5,6 @@ package acm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acm/types" smithy "github.com/awslabs/smithy-go" @@ -63,9 +62,9 @@ func (c *Client) ImportCertificate(ctx context.Context, params *ImportCertificat addawsAwsjson11_serdeOpImportCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acm/api_op_ListCertificates.go b/service/acm/api_op_ListCertificates.go index 95064c4af85..06289eca94b 100644 --- a/service/acm/api_op_ListCertificates.go +++ b/service/acm/api_op_ListCertificates.go @@ -5,7 +5,6 @@ package acm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acm/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListCertificates(ctx context.Context, params *ListCertificatesI addawsAwsjson11_serdeOpListCertificatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acm/api_op_ListTagsForCertificate.go b/service/acm/api_op_ListTagsForCertificate.go index 71e7fabd54e..455c6ca1dc6 100644 --- a/service/acm/api_op_ListTagsForCertificate.go +++ b/service/acm/api_op_ListTagsForCertificate.go @@ -5,7 +5,6 @@ package acm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acm/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListTagsForCertificate(ctx context.Context, params *ListTagsFor addawsAwsjson11_serdeOpListTagsForCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acm/api_op_RemoveTagsFromCertificate.go b/service/acm/api_op_RemoveTagsFromCertificate.go index 2c7c8712444..774304068ca 100644 --- a/service/acm/api_op_RemoveTagsFromCertificate.go +++ b/service/acm/api_op_RemoveTagsFromCertificate.go @@ -5,7 +5,6 @@ package acm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acm/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) RemoveTagsFromCertificate(ctx context.Context, params *RemoveTa addawsAwsjson11_serdeOpRemoveTagsFromCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acm/api_op_RenewCertificate.go b/service/acm/api_op_RenewCertificate.go index a2826e213a1..c57b6e49884 100644 --- a/service/acm/api_op_RenewCertificate.go +++ b/service/acm/api_op_RenewCertificate.go @@ -5,7 +5,6 @@ package acm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) RenewCertificate(ctx context.Context, params *RenewCertificateI addawsAwsjson11_serdeOpRenewCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acm/api_op_RequestCertificate.go b/service/acm/api_op_RequestCertificate.go index 9627d047642..19cdb706a5e 100644 --- a/service/acm/api_op_RequestCertificate.go +++ b/service/acm/api_op_RequestCertificate.go @@ -5,7 +5,6 @@ package acm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acm/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) RequestCertificate(ctx context.Context, params *RequestCertific addawsAwsjson11_serdeOpRequestCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acm/api_op_ResendValidationEmail.go b/service/acm/api_op_ResendValidationEmail.go index 74a71c9e70f..aaa9aa6ef53 100644 --- a/service/acm/api_op_ResendValidationEmail.go +++ b/service/acm/api_op_ResendValidationEmail.go @@ -5,7 +5,6 @@ package acm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) ResendValidationEmail(ctx context.Context, params *ResendValida addawsAwsjson11_serdeOpResendValidationEmailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acm/api_op_UpdateCertificateOptions.go b/service/acm/api_op_UpdateCertificateOptions.go index daa50f5ea03..1ee9284c3cf 100644 --- a/service/acm/api_op_UpdateCertificateOptions.go +++ b/service/acm/api_op_UpdateCertificateOptions.go @@ -5,7 +5,6 @@ package acm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acm/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateCertificateOptions(ctx context.Context, params *UpdateCer addawsAwsjson11_serdeOpUpdateCertificateOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acm/endpoints.go b/service/acm/endpoints.go index 7e66353ba12..97fb8270528 100644 --- a/service/acm/endpoints.go +++ b/service/acm/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/acmpca/api_client.go b/service/acmpca/api_client.go index 87ee0e5eabd..73da51b3d1d 100644 --- a/service/acmpca/api_client.go +++ b/service/acmpca/api_client.go @@ -88,30 +88,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -177,6 +153,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/acmpca/api_op_CreateCertificateAuthority.go b/service/acmpca/api_op_CreateCertificateAuthority.go index 8d4eab9c3a0..1a0649c8329 100644 --- a/service/acmpca/api_op_CreateCertificateAuthority.go +++ b/service/acmpca/api_op_CreateCertificateAuthority.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acmpca/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) CreateCertificateAuthority(ctx context.Context, params *CreateC addawsAwsjson11_serdeOpCreateCertificateAuthorityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_CreateCertificateAuthorityAuditReport.go b/service/acmpca/api_op_CreateCertificateAuthorityAuditReport.go index 88d571a274b..2e2fe24523e 100644 --- a/service/acmpca/api_op_CreateCertificateAuthorityAuditReport.go +++ b/service/acmpca/api_op_CreateCertificateAuthorityAuditReport.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acmpca/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateCertificateAuthorityAuditReport(ctx context.Context, para addawsAwsjson11_serdeOpCreateCertificateAuthorityAuditReportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_CreatePermission.go b/service/acmpca/api_op_CreatePermission.go index 42c91963e88..8296975840c 100644 --- a/service/acmpca/api_op_CreatePermission.go +++ b/service/acmpca/api_op_CreatePermission.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acmpca/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreatePermission(ctx context.Context, params *CreatePermissionI addawsAwsjson11_serdeOpCreatePermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_DeleteCertificateAuthority.go b/service/acmpca/api_op_DeleteCertificateAuthority.go index 774be00d24a..b7bfbd507f1 100644 --- a/service/acmpca/api_op_DeleteCertificateAuthority.go +++ b/service/acmpca/api_op_DeleteCertificateAuthority.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -39,9 +38,9 @@ func (c *Client) DeleteCertificateAuthority(ctx context.Context, params *DeleteC addawsAwsjson11_serdeOpDeleteCertificateAuthorityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_DeletePermission.go b/service/acmpca/api_op_DeletePermission.go index 9c741350241..209dafc41ca 100644 --- a/service/acmpca/api_op_DeletePermission.go +++ b/service/acmpca/api_op_DeletePermission.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeletePermission(ctx context.Context, params *DeletePermissionI addawsAwsjson11_serdeOpDeletePermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_DescribeCertificateAuthority.go b/service/acmpca/api_op_DescribeCertificateAuthority.go index ca2e13b8235..09178bbdf7a 100644 --- a/service/acmpca/api_op_DescribeCertificateAuthority.go +++ b/service/acmpca/api_op_DescribeCertificateAuthority.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acmpca/types" smithy "github.com/awslabs/smithy-go" @@ -50,9 +49,9 @@ func (c *Client) DescribeCertificateAuthority(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribeCertificateAuthorityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_DescribeCertificateAuthorityAuditReport.go b/service/acmpca/api_op_DescribeCertificateAuthorityAuditReport.go index 4e44198f789..5c891a2ae2b 100644 --- a/service/acmpca/api_op_DescribeCertificateAuthorityAuditReport.go +++ b/service/acmpca/api_op_DescribeCertificateAuthorityAuditReport.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acmpca/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeCertificateAuthorityAuditReport(ctx context.Context, pa addawsAwsjson11_serdeOpDescribeCertificateAuthorityAuditReportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_GetCertificate.go b/service/acmpca/api_op_GetCertificate.go index ab542aa73f2..938aa9f538c 100644 --- a/service/acmpca/api_op_GetCertificate.go +++ b/service/acmpca/api_op_GetCertificate.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) GetCertificate(ctx context.Context, params *GetCertificateInput addawsAwsjson11_serdeOpGetCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_GetCertificateAuthorityCertificate.go b/service/acmpca/api_op_GetCertificateAuthorityCertificate.go index 2d6dc0303ac..e1040944f32 100644 --- a/service/acmpca/api_op_GetCertificateAuthorityCertificate.go +++ b/service/acmpca/api_op_GetCertificateAuthorityCertificate.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) GetCertificateAuthorityCertificate(ctx context.Context, params addawsAwsjson11_serdeOpGetCertificateAuthorityCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_GetCertificateAuthorityCsr.go b/service/acmpca/api_op_GetCertificateAuthorityCsr.go index 421fe1635cf..239504ec7c3 100644 --- a/service/acmpca/api_op_GetCertificateAuthorityCsr.go +++ b/service/acmpca/api_op_GetCertificateAuthorityCsr.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) GetCertificateAuthorityCsr(ctx context.Context, params *GetCert addawsAwsjson11_serdeOpGetCertificateAuthorityCsrMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_ImportCertificateAuthorityCertificate.go b/service/acmpca/api_op_ImportCertificateAuthorityCertificate.go index 7cdcbc64f85..080ca0eda32 100644 --- a/service/acmpca/api_op_ImportCertificateAuthorityCertificate.go +++ b/service/acmpca/api_op_ImportCertificateAuthorityCertificate.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) ImportCertificateAuthorityCertificate(ctx context.Context, para addawsAwsjson11_serdeOpImportCertificateAuthorityCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_IssueCertificate.go b/service/acmpca/api_op_IssueCertificate.go index e14ba17c4cb..79189e8d6c1 100644 --- a/service/acmpca/api_op_IssueCertificate.go +++ b/service/acmpca/api_op_IssueCertificate.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acmpca/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) IssueCertificate(ctx context.Context, params *IssueCertificateI addawsAwsjson11_serdeOpIssueCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_ListCertificateAuthorities.go b/service/acmpca/api_op_ListCertificateAuthorities.go index e8d1f92ad99..b8a47e850a2 100644 --- a/service/acmpca/api_op_ListCertificateAuthorities.go +++ b/service/acmpca/api_op_ListCertificateAuthorities.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acmpca/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListCertificateAuthorities(ctx context.Context, params *ListCer addawsAwsjson11_serdeOpListCertificateAuthoritiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_ListPermissions.go b/service/acmpca/api_op_ListPermissions.go index 551282ad362..76ad7836c08 100644 --- a/service/acmpca/api_op_ListPermissions.go +++ b/service/acmpca/api_op_ListPermissions.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acmpca/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListPermissions(ctx context.Context, params *ListPermissionsInp addawsAwsjson11_serdeOpListPermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_ListTags.go b/service/acmpca/api_op_ListTags.go index 19002b7ede5..0e103e4129b 100644 --- a/service/acmpca/api_op_ListTags.go +++ b/service/acmpca/api_op_ListTags.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acmpca/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListTags(ctx context.Context, params *ListTagsInput, optFns ... addawsAwsjson11_serdeOpListTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_RestoreCertificateAuthority.go b/service/acmpca/api_op_RestoreCertificateAuthority.go index 618881789b1..0b0d450707c 100644 --- a/service/acmpca/api_op_RestoreCertificateAuthority.go +++ b/service/acmpca/api_op_RestoreCertificateAuthority.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) RestoreCertificateAuthority(ctx context.Context, params *Restor addawsAwsjson11_serdeOpRestoreCertificateAuthorityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_RevokeCertificate.go b/service/acmpca/api_op_RevokeCertificate.go index 42de0da63e6..7bb6ca7487b 100644 --- a/service/acmpca/api_op_RevokeCertificate.go +++ b/service/acmpca/api_op_RevokeCertificate.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acmpca/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) RevokeCertificate(ctx context.Context, params *RevokeCertificat addawsAwsjson11_serdeOpRevokeCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_TagCertificateAuthority.go b/service/acmpca/api_op_TagCertificateAuthority.go index 6252f2def97..159373435ef 100644 --- a/service/acmpca/api_op_TagCertificateAuthority.go +++ b/service/acmpca/api_op_TagCertificateAuthority.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acmpca/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) TagCertificateAuthority(ctx context.Context, params *TagCertifi addawsAwsjson11_serdeOpTagCertificateAuthorityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_UntagCertificateAuthority.go b/service/acmpca/api_op_UntagCertificateAuthority.go index 32a96b3f6c5..5d0a3a5e86a 100644 --- a/service/acmpca/api_op_UntagCertificateAuthority.go +++ b/service/acmpca/api_op_UntagCertificateAuthority.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acmpca/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) UntagCertificateAuthority(ctx context.Context, params *UntagCer addawsAwsjson11_serdeOpUntagCertificateAuthorityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/api_op_UpdateCertificateAuthority.go b/service/acmpca/api_op_UpdateCertificateAuthority.go index 6b45c5ab59b..e9891328d7f 100644 --- a/service/acmpca/api_op_UpdateCertificateAuthority.go +++ b/service/acmpca/api_op_UpdateCertificateAuthority.go @@ -5,7 +5,6 @@ package acmpca import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/acmpca/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateCertificateAuthority(ctx context.Context, params *UpdateC addawsAwsjson11_serdeOpUpdateCertificateAuthorityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/acmpca/endpoints.go b/service/acmpca/endpoints.go index 64f6150ed1b..141916eb4ec 100644 --- a/service/acmpca/endpoints.go +++ b/service/acmpca/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/alexaforbusiness/api_client.go b/service/alexaforbusiness/api_client.go index 7d2c4fa7759..7b26fc66c77 100644 --- a/service/alexaforbusiness/api_client.go +++ b/service/alexaforbusiness/api_client.go @@ -94,34 +94,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -194,6 +166,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/alexaforbusiness/api_op_ApproveSkill.go b/service/alexaforbusiness/api_op_ApproveSkill.go index ec2fe84beaa..73eb669fe2d 100644 --- a/service/alexaforbusiness/api_op_ApproveSkill.go +++ b/service/alexaforbusiness/api_op_ApproveSkill.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ApproveSkill(ctx context.Context, params *ApproveSkillInput, op addawsAwsjson11_serdeOpApproveSkillMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_AssociateContactWithAddressBook.go b/service/alexaforbusiness/api_op_AssociateContactWithAddressBook.go index 2f062369c3e..2a484c8ae03 100644 --- a/service/alexaforbusiness/api_op_AssociateContactWithAddressBook.go +++ b/service/alexaforbusiness/api_op_AssociateContactWithAddressBook.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AssociateContactWithAddressBook(ctx context.Context, params *As addawsAwsjson11_serdeOpAssociateContactWithAddressBookMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_AssociateDeviceWithNetworkProfile.go b/service/alexaforbusiness/api_op_AssociateDeviceWithNetworkProfile.go index 56e0a61cef6..142c2a3025d 100644 --- a/service/alexaforbusiness/api_op_AssociateDeviceWithNetworkProfile.go +++ b/service/alexaforbusiness/api_op_AssociateDeviceWithNetworkProfile.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AssociateDeviceWithNetworkProfile(ctx context.Context, params * addawsAwsjson11_serdeOpAssociateDeviceWithNetworkProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_AssociateDeviceWithRoom.go b/service/alexaforbusiness/api_op_AssociateDeviceWithRoom.go index 24e54509463..d0cb9c584b3 100644 --- a/service/alexaforbusiness/api_op_AssociateDeviceWithRoom.go +++ b/service/alexaforbusiness/api_op_AssociateDeviceWithRoom.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) AssociateDeviceWithRoom(ctx context.Context, params *AssociateD addawsAwsjson11_serdeOpAssociateDeviceWithRoomMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_AssociateSkillGroupWithRoom.go b/service/alexaforbusiness/api_op_AssociateSkillGroupWithRoom.go index e63b9258b3c..9c3690163fe 100644 --- a/service/alexaforbusiness/api_op_AssociateSkillGroupWithRoom.go +++ b/service/alexaforbusiness/api_op_AssociateSkillGroupWithRoom.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AssociateSkillGroupWithRoom(ctx context.Context, params *Associ addawsAwsjson11_serdeOpAssociateSkillGroupWithRoomMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_AssociateSkillWithSkillGroup.go b/service/alexaforbusiness/api_op_AssociateSkillWithSkillGroup.go index 43536dc4abf..04dacf8f19b 100644 --- a/service/alexaforbusiness/api_op_AssociateSkillWithSkillGroup.go +++ b/service/alexaforbusiness/api_op_AssociateSkillWithSkillGroup.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AssociateSkillWithSkillGroup(ctx context.Context, params *Assoc addawsAwsjson11_serdeOpAssociateSkillWithSkillGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_AssociateSkillWithUsers.go b/service/alexaforbusiness/api_op_AssociateSkillWithUsers.go index 38e9f65f457..e1e12849df8 100644 --- a/service/alexaforbusiness/api_op_AssociateSkillWithUsers.go +++ b/service/alexaforbusiness/api_op_AssociateSkillWithUsers.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AssociateSkillWithUsers(ctx context.Context, params *AssociateS addawsAwsjson11_serdeOpAssociateSkillWithUsersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_CreateAddressBook.go b/service/alexaforbusiness/api_op_CreateAddressBook.go index 68309576d07..d2fc5e6ad01 100644 --- a/service/alexaforbusiness/api_op_CreateAddressBook.go +++ b/service/alexaforbusiness/api_op_CreateAddressBook.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateAddressBook(ctx context.Context, params *CreateAddressBoo addawsAwsjson11_serdeOpCreateAddressBookMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_CreateBusinessReportSchedule.go b/service/alexaforbusiness/api_op_CreateBusinessReportSchedule.go index dd75d487b07..b1101a8a6b8 100644 --- a/service/alexaforbusiness/api_op_CreateBusinessReportSchedule.go +++ b/service/alexaforbusiness/api_op_CreateBusinessReportSchedule.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateBusinessReportSchedule(ctx context.Context, params *Creat addawsAwsjson11_serdeOpCreateBusinessReportScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_CreateConferenceProvider.go b/service/alexaforbusiness/api_op_CreateConferenceProvider.go index e2476648c92..e55a069afb0 100644 --- a/service/alexaforbusiness/api_op_CreateConferenceProvider.go +++ b/service/alexaforbusiness/api_op_CreateConferenceProvider.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateConferenceProvider(ctx context.Context, params *CreateCon addawsAwsjson11_serdeOpCreateConferenceProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_CreateContact.go b/service/alexaforbusiness/api_op_CreateContact.go index a6f07b82320..15fbd615b80 100644 --- a/service/alexaforbusiness/api_op_CreateContact.go +++ b/service/alexaforbusiness/api_op_CreateContact.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateContact(ctx context.Context, params *CreateContactInput, addawsAwsjson11_serdeOpCreateContactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_CreateGatewayGroup.go b/service/alexaforbusiness/api_op_CreateGatewayGroup.go index e668b69a500..b61ae8c3a99 100644 --- a/service/alexaforbusiness/api_op_CreateGatewayGroup.go +++ b/service/alexaforbusiness/api_op_CreateGatewayGroup.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateGatewayGroup(ctx context.Context, params *CreateGatewayGr addawsAwsjson11_serdeOpCreateGatewayGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_CreateNetworkProfile.go b/service/alexaforbusiness/api_op_CreateNetworkProfile.go index 58e1e3bbe39..113397493f9 100644 --- a/service/alexaforbusiness/api_op_CreateNetworkProfile.go +++ b/service/alexaforbusiness/api_op_CreateNetworkProfile.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateNetworkProfile(ctx context.Context, params *CreateNetwork addawsAwsjson11_serdeOpCreateNetworkProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_CreateProfile.go b/service/alexaforbusiness/api_op_CreateProfile.go index cda78c9a46e..ded2e48c2a1 100644 --- a/service/alexaforbusiness/api_op_CreateProfile.go +++ b/service/alexaforbusiness/api_op_CreateProfile.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateProfile(ctx context.Context, params *CreateProfileInput, addawsAwsjson11_serdeOpCreateProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_CreateRoom.go b/service/alexaforbusiness/api_op_CreateRoom.go index a675c895d80..a3eafb7255b 100644 --- a/service/alexaforbusiness/api_op_CreateRoom.go +++ b/service/alexaforbusiness/api_op_CreateRoom.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateRoom(ctx context.Context, params *CreateRoomInput, optFns addawsAwsjson11_serdeOpCreateRoomMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_CreateSkillGroup.go b/service/alexaforbusiness/api_op_CreateSkillGroup.go index 0939d36a23f..496ed774c8f 100644 --- a/service/alexaforbusiness/api_op_CreateSkillGroup.go +++ b/service/alexaforbusiness/api_op_CreateSkillGroup.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateSkillGroup(ctx context.Context, params *CreateSkillGroupI addawsAwsjson11_serdeOpCreateSkillGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_CreateUser.go b/service/alexaforbusiness/api_op_CreateUser.go index 44c28a20c4f..4b1460c14f1 100644 --- a/service/alexaforbusiness/api_op_CreateUser.go +++ b/service/alexaforbusiness/api_op_CreateUser.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateUser(ctx context.Context, params *CreateUserInput, optFns addawsAwsjson11_serdeOpCreateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DeleteAddressBook.go b/service/alexaforbusiness/api_op_DeleteAddressBook.go index 9ada9a9fe2e..378a2678c5a 100644 --- a/service/alexaforbusiness/api_op_DeleteAddressBook.go +++ b/service/alexaforbusiness/api_op_DeleteAddressBook.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteAddressBook(ctx context.Context, params *DeleteAddressBoo addawsAwsjson11_serdeOpDeleteAddressBookMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DeleteBusinessReportSchedule.go b/service/alexaforbusiness/api_op_DeleteBusinessReportSchedule.go index fcb1e4e04be..d67202d2a04 100644 --- a/service/alexaforbusiness/api_op_DeleteBusinessReportSchedule.go +++ b/service/alexaforbusiness/api_op_DeleteBusinessReportSchedule.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteBusinessReportSchedule(ctx context.Context, params *Delet addawsAwsjson11_serdeOpDeleteBusinessReportScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DeleteConferenceProvider.go b/service/alexaforbusiness/api_op_DeleteConferenceProvider.go index afc6e9df8ea..60925078c22 100644 --- a/service/alexaforbusiness/api_op_DeleteConferenceProvider.go +++ b/service/alexaforbusiness/api_op_DeleteConferenceProvider.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteConferenceProvider(ctx context.Context, params *DeleteCon addawsAwsjson11_serdeOpDeleteConferenceProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DeleteContact.go b/service/alexaforbusiness/api_op_DeleteContact.go index 362e175a12c..fd28eb66db2 100644 --- a/service/alexaforbusiness/api_op_DeleteContact.go +++ b/service/alexaforbusiness/api_op_DeleteContact.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteContact(ctx context.Context, params *DeleteContactInput, addawsAwsjson11_serdeOpDeleteContactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DeleteDevice.go b/service/alexaforbusiness/api_op_DeleteDevice.go index d7368197885..332b7fff5a5 100644 --- a/service/alexaforbusiness/api_op_DeleteDevice.go +++ b/service/alexaforbusiness/api_op_DeleteDevice.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDevice(ctx context.Context, params *DeleteDeviceInput, op addawsAwsjson11_serdeOpDeleteDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DeleteDeviceUsageData.go b/service/alexaforbusiness/api_op_DeleteDeviceUsageData.go index 32eb58e4301..8db881f765b 100644 --- a/service/alexaforbusiness/api_op_DeleteDeviceUsageData.go +++ b/service/alexaforbusiness/api_op_DeleteDeviceUsageData.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteDeviceUsageData(ctx context.Context, params *DeleteDevice addawsAwsjson11_serdeOpDeleteDeviceUsageDataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DeleteGatewayGroup.go b/service/alexaforbusiness/api_op_DeleteGatewayGroup.go index 38d544db0d0..d9742d60fa4 100644 --- a/service/alexaforbusiness/api_op_DeleteGatewayGroup.go +++ b/service/alexaforbusiness/api_op_DeleteGatewayGroup.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteGatewayGroup(ctx context.Context, params *DeleteGatewayGr addawsAwsjson11_serdeOpDeleteGatewayGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DeleteNetworkProfile.go b/service/alexaforbusiness/api_op_DeleteNetworkProfile.go index 77bce77768d..b6cecc3a19e 100644 --- a/service/alexaforbusiness/api_op_DeleteNetworkProfile.go +++ b/service/alexaforbusiness/api_op_DeleteNetworkProfile.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteNetworkProfile(ctx context.Context, params *DeleteNetwork addawsAwsjson11_serdeOpDeleteNetworkProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DeleteProfile.go b/service/alexaforbusiness/api_op_DeleteProfile.go index 265e8835eb5..5e00eec5b70 100644 --- a/service/alexaforbusiness/api_op_DeleteProfile.go +++ b/service/alexaforbusiness/api_op_DeleteProfile.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteProfile(ctx context.Context, params *DeleteProfileInput, addawsAwsjson11_serdeOpDeleteProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DeleteRoom.go b/service/alexaforbusiness/api_op_DeleteRoom.go index 06dd0ed714b..4c58ab321eb 100644 --- a/service/alexaforbusiness/api_op_DeleteRoom.go +++ b/service/alexaforbusiness/api_op_DeleteRoom.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRoom(ctx context.Context, params *DeleteRoomInput, optFns addawsAwsjson11_serdeOpDeleteRoomMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DeleteRoomSkillParameter.go b/service/alexaforbusiness/api_op_DeleteRoomSkillParameter.go index 0fda2f22af0..dabef318071 100644 --- a/service/alexaforbusiness/api_op_DeleteRoomSkillParameter.go +++ b/service/alexaforbusiness/api_op_DeleteRoomSkillParameter.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRoomSkillParameter(ctx context.Context, params *DeleteRoo addawsAwsjson11_serdeOpDeleteRoomSkillParameterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DeleteSkillAuthorization.go b/service/alexaforbusiness/api_op_DeleteSkillAuthorization.go index 3ca67efdf5f..304fa37087f 100644 --- a/service/alexaforbusiness/api_op_DeleteSkillAuthorization.go +++ b/service/alexaforbusiness/api_op_DeleteSkillAuthorization.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSkillAuthorization(ctx context.Context, params *DeleteSki addawsAwsjson11_serdeOpDeleteSkillAuthorizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DeleteSkillGroup.go b/service/alexaforbusiness/api_op_DeleteSkillGroup.go index cd516047d62..19471f06c68 100644 --- a/service/alexaforbusiness/api_op_DeleteSkillGroup.go +++ b/service/alexaforbusiness/api_op_DeleteSkillGroup.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSkillGroup(ctx context.Context, params *DeleteSkillGroupI addawsAwsjson11_serdeOpDeleteSkillGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DeleteUser.go b/service/alexaforbusiness/api_op_DeleteUser.go index 9a93d799366..288208e47dd 100644 --- a/service/alexaforbusiness/api_op_DeleteUser.go +++ b/service/alexaforbusiness/api_op_DeleteUser.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteUser(ctx context.Context, params *DeleteUserInput, optFns addawsAwsjson11_serdeOpDeleteUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DisassociateContactFromAddressBook.go b/service/alexaforbusiness/api_op_DisassociateContactFromAddressBook.go index a03e08e6079..8df1532e432 100644 --- a/service/alexaforbusiness/api_op_DisassociateContactFromAddressBook.go +++ b/service/alexaforbusiness/api_op_DisassociateContactFromAddressBook.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisassociateContactFromAddressBook(ctx context.Context, params addawsAwsjson11_serdeOpDisassociateContactFromAddressBookMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DisassociateDeviceFromRoom.go b/service/alexaforbusiness/api_op_DisassociateDeviceFromRoom.go index 44e293c1946..45e8e06eea0 100644 --- a/service/alexaforbusiness/api_op_DisassociateDeviceFromRoom.go +++ b/service/alexaforbusiness/api_op_DisassociateDeviceFromRoom.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DisassociateDeviceFromRoom(ctx context.Context, params *Disasso addawsAwsjson11_serdeOpDisassociateDeviceFromRoomMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DisassociateSkillFromSkillGroup.go b/service/alexaforbusiness/api_op_DisassociateSkillFromSkillGroup.go index ff65fcc0c0d..5f586873801 100644 --- a/service/alexaforbusiness/api_op_DisassociateSkillFromSkillGroup.go +++ b/service/alexaforbusiness/api_op_DisassociateSkillFromSkillGroup.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisassociateSkillFromSkillGroup(ctx context.Context, params *Di addawsAwsjson11_serdeOpDisassociateSkillFromSkillGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DisassociateSkillFromUsers.go b/service/alexaforbusiness/api_op_DisassociateSkillFromUsers.go index 1862c563820..24dd596fb42 100644 --- a/service/alexaforbusiness/api_op_DisassociateSkillFromUsers.go +++ b/service/alexaforbusiness/api_op_DisassociateSkillFromUsers.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisassociateSkillFromUsers(ctx context.Context, params *Disasso addawsAwsjson11_serdeOpDisassociateSkillFromUsersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_DisassociateSkillGroupFromRoom.go b/service/alexaforbusiness/api_op_DisassociateSkillGroupFromRoom.go index 0a28098255a..b9dbcb69d25 100644 --- a/service/alexaforbusiness/api_op_DisassociateSkillGroupFromRoom.go +++ b/service/alexaforbusiness/api_op_DisassociateSkillGroupFromRoom.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisassociateSkillGroupFromRoom(ctx context.Context, params *Dis addawsAwsjson11_serdeOpDisassociateSkillGroupFromRoomMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_ForgetSmartHomeAppliances.go b/service/alexaforbusiness/api_op_ForgetSmartHomeAppliances.go index 39549c16d59..d5030793147 100644 --- a/service/alexaforbusiness/api_op_ForgetSmartHomeAppliances.go +++ b/service/alexaforbusiness/api_op_ForgetSmartHomeAppliances.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ForgetSmartHomeAppliances(ctx context.Context, params *ForgetSm addawsAwsjson11_serdeOpForgetSmartHomeAppliancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_GetAddressBook.go b/service/alexaforbusiness/api_op_GetAddressBook.go index dfff24775b0..162d73ad5d7 100644 --- a/service/alexaforbusiness/api_op_GetAddressBook.go +++ b/service/alexaforbusiness/api_op_GetAddressBook.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetAddressBook(ctx context.Context, params *GetAddressBookInput addawsAwsjson11_serdeOpGetAddressBookMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_GetConferencePreference.go b/service/alexaforbusiness/api_op_GetConferencePreference.go index fa075487298..8e7aec541bb 100644 --- a/service/alexaforbusiness/api_op_GetConferencePreference.go +++ b/service/alexaforbusiness/api_op_GetConferencePreference.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetConferencePreference(ctx context.Context, params *GetConfere addawsAwsjson11_serdeOpGetConferencePreferenceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_GetConferenceProvider.go b/service/alexaforbusiness/api_op_GetConferenceProvider.go index 26957c4d26f..4371b92f406 100644 --- a/service/alexaforbusiness/api_op_GetConferenceProvider.go +++ b/service/alexaforbusiness/api_op_GetConferenceProvider.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetConferenceProvider(ctx context.Context, params *GetConferenc addawsAwsjson11_serdeOpGetConferenceProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_GetContact.go b/service/alexaforbusiness/api_op_GetContact.go index b24261a01d3..a1c6f9e331a 100644 --- a/service/alexaforbusiness/api_op_GetContact.go +++ b/service/alexaforbusiness/api_op_GetContact.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetContact(ctx context.Context, params *GetContactInput, optFns addawsAwsjson11_serdeOpGetContactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_GetDevice.go b/service/alexaforbusiness/api_op_GetDevice.go index 98fb2977add..2198f6bf2d4 100644 --- a/service/alexaforbusiness/api_op_GetDevice.go +++ b/service/alexaforbusiness/api_op_GetDevice.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDevice(ctx context.Context, params *GetDeviceInput, optFns . addawsAwsjson11_serdeOpGetDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_GetGateway.go b/service/alexaforbusiness/api_op_GetGateway.go index 108faec17b4..0c2af606a3f 100644 --- a/service/alexaforbusiness/api_op_GetGateway.go +++ b/service/alexaforbusiness/api_op_GetGateway.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetGateway(ctx context.Context, params *GetGatewayInput, optFns addawsAwsjson11_serdeOpGetGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_GetGatewayGroup.go b/service/alexaforbusiness/api_op_GetGatewayGroup.go index 6f36af64534..88865b5c767 100644 --- a/service/alexaforbusiness/api_op_GetGatewayGroup.go +++ b/service/alexaforbusiness/api_op_GetGatewayGroup.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetGatewayGroup(ctx context.Context, params *GetGatewayGroupInp addawsAwsjson11_serdeOpGetGatewayGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_GetInvitationConfiguration.go b/service/alexaforbusiness/api_op_GetInvitationConfiguration.go index 6041e510862..d0cd13d0b8f 100644 --- a/service/alexaforbusiness/api_op_GetInvitationConfiguration.go +++ b/service/alexaforbusiness/api_op_GetInvitationConfiguration.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetInvitationConfiguration(ctx context.Context, params *GetInvi addawsAwsjson11_serdeOpGetInvitationConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_GetNetworkProfile.go b/service/alexaforbusiness/api_op_GetNetworkProfile.go index 6effe377e92..7b41f52214a 100644 --- a/service/alexaforbusiness/api_op_GetNetworkProfile.go +++ b/service/alexaforbusiness/api_op_GetNetworkProfile.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetNetworkProfile(ctx context.Context, params *GetNetworkProfil addawsAwsjson11_serdeOpGetNetworkProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_GetProfile.go b/service/alexaforbusiness/api_op_GetProfile.go index 5b4e18e1a95..1807a363b56 100644 --- a/service/alexaforbusiness/api_op_GetProfile.go +++ b/service/alexaforbusiness/api_op_GetProfile.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetProfile(ctx context.Context, params *GetProfileInput, optFns addawsAwsjson11_serdeOpGetProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_GetRoom.go b/service/alexaforbusiness/api_op_GetRoom.go index d9a41b15dfa..56b3f812596 100644 --- a/service/alexaforbusiness/api_op_GetRoom.go +++ b/service/alexaforbusiness/api_op_GetRoom.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetRoom(ctx context.Context, params *GetRoomInput, optFns ...fu addawsAwsjson11_serdeOpGetRoomMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_GetRoomSkillParameter.go b/service/alexaforbusiness/api_op_GetRoomSkillParameter.go index f54e7bb053b..4da8c5d6b57 100644 --- a/service/alexaforbusiness/api_op_GetRoomSkillParameter.go +++ b/service/alexaforbusiness/api_op_GetRoomSkillParameter.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetRoomSkillParameter(ctx context.Context, params *GetRoomSkill addawsAwsjson11_serdeOpGetRoomSkillParameterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_GetSkillGroup.go b/service/alexaforbusiness/api_op_GetSkillGroup.go index 939bf9ad5ff..fa8cda6ba2b 100644 --- a/service/alexaforbusiness/api_op_GetSkillGroup.go +++ b/service/alexaforbusiness/api_op_GetSkillGroup.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetSkillGroup(ctx context.Context, params *GetSkillGroupInput, addawsAwsjson11_serdeOpGetSkillGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_ListBusinessReportSchedules.go b/service/alexaforbusiness/api_op_ListBusinessReportSchedules.go index 3ed8263a8be..066c9a558f9 100644 --- a/service/alexaforbusiness/api_op_ListBusinessReportSchedules.go +++ b/service/alexaforbusiness/api_op_ListBusinessReportSchedules.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListBusinessReportSchedules(ctx context.Context, params *ListBu addawsAwsjson11_serdeOpListBusinessReportSchedulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_ListConferenceProviders.go b/service/alexaforbusiness/api_op_ListConferenceProviders.go index adfd7a4a8c8..32b674161cb 100644 --- a/service/alexaforbusiness/api_op_ListConferenceProviders.go +++ b/service/alexaforbusiness/api_op_ListConferenceProviders.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListConferenceProviders(ctx context.Context, params *ListConfer addawsAwsjson11_serdeOpListConferenceProvidersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_ListDeviceEvents.go b/service/alexaforbusiness/api_op_ListDeviceEvents.go index 81461905bd3..4a2fa8672ab 100644 --- a/service/alexaforbusiness/api_op_ListDeviceEvents.go +++ b/service/alexaforbusiness/api_op_ListDeviceEvents.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListDeviceEvents(ctx context.Context, params *ListDeviceEventsI addawsAwsjson11_serdeOpListDeviceEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_ListGatewayGroups.go b/service/alexaforbusiness/api_op_ListGatewayGroups.go index b97972054f7..78056dbd8a2 100644 --- a/service/alexaforbusiness/api_op_ListGatewayGroups.go +++ b/service/alexaforbusiness/api_op_ListGatewayGroups.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListGatewayGroups(ctx context.Context, params *ListGatewayGroup addawsAwsjson11_serdeOpListGatewayGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_ListGateways.go b/service/alexaforbusiness/api_op_ListGateways.go index 6f44dcc7543..b443f5cdce3 100644 --- a/service/alexaforbusiness/api_op_ListGateways.go +++ b/service/alexaforbusiness/api_op_ListGateways.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListGateways(ctx context.Context, params *ListGatewaysInput, op addawsAwsjson11_serdeOpListGatewaysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_ListSkills.go b/service/alexaforbusiness/api_op_ListSkills.go index 16113ef386b..3dea72c16d8 100644 --- a/service/alexaforbusiness/api_op_ListSkills.go +++ b/service/alexaforbusiness/api_op_ListSkills.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListSkills(ctx context.Context, params *ListSkillsInput, optFns addawsAwsjson11_serdeOpListSkillsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_ListSkillsStoreCategories.go b/service/alexaforbusiness/api_op_ListSkillsStoreCategories.go index 124145c36b7..57e8ffbcb0b 100644 --- a/service/alexaforbusiness/api_op_ListSkillsStoreCategories.go +++ b/service/alexaforbusiness/api_op_ListSkillsStoreCategories.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListSkillsStoreCategories(ctx context.Context, params *ListSkil addawsAwsjson11_serdeOpListSkillsStoreCategoriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_ListSkillsStoreSkillsByCategory.go b/service/alexaforbusiness/api_op_ListSkillsStoreSkillsByCategory.go index b8341681817..20c66571574 100644 --- a/service/alexaforbusiness/api_op_ListSkillsStoreSkillsByCategory.go +++ b/service/alexaforbusiness/api_op_ListSkillsStoreSkillsByCategory.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListSkillsStoreSkillsByCategory(ctx context.Context, params *Li addawsAwsjson11_serdeOpListSkillsStoreSkillsByCategoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_ListSmartHomeAppliances.go b/service/alexaforbusiness/api_op_ListSmartHomeAppliances.go index 667dfbe1e14..ff2f536f363 100644 --- a/service/alexaforbusiness/api_op_ListSmartHomeAppliances.go +++ b/service/alexaforbusiness/api_op_ListSmartHomeAppliances.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListSmartHomeAppliances(ctx context.Context, params *ListSmartH addawsAwsjson11_serdeOpListSmartHomeAppliancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_ListTags.go b/service/alexaforbusiness/api_op_ListTags.go index 9dc91b7b49f..60100462037 100644 --- a/service/alexaforbusiness/api_op_ListTags.go +++ b/service/alexaforbusiness/api_op_ListTags.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTags(ctx context.Context, params *ListTagsInput, optFns ... addawsAwsjson11_serdeOpListTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_PutConferencePreference.go b/service/alexaforbusiness/api_op_PutConferencePreference.go index 40e7152ae81..d5d425055c7 100644 --- a/service/alexaforbusiness/api_op_PutConferencePreference.go +++ b/service/alexaforbusiness/api_op_PutConferencePreference.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutConferencePreference(ctx context.Context, params *PutConfere addawsAwsjson11_serdeOpPutConferencePreferenceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_PutInvitationConfiguration.go b/service/alexaforbusiness/api_op_PutInvitationConfiguration.go index ad5c770f9f5..0112349bbae 100644 --- a/service/alexaforbusiness/api_op_PutInvitationConfiguration.go +++ b/service/alexaforbusiness/api_op_PutInvitationConfiguration.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) PutInvitationConfiguration(ctx context.Context, params *PutInvi addawsAwsjson11_serdeOpPutInvitationConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_PutRoomSkillParameter.go b/service/alexaforbusiness/api_op_PutRoomSkillParameter.go index 65dc03a1e9c..0ae6379f5bb 100644 --- a/service/alexaforbusiness/api_op_PutRoomSkillParameter.go +++ b/service/alexaforbusiness/api_op_PutRoomSkillParameter.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutRoomSkillParameter(ctx context.Context, params *PutRoomSkill addawsAwsjson11_serdeOpPutRoomSkillParameterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_PutSkillAuthorization.go b/service/alexaforbusiness/api_op_PutSkillAuthorization.go index 44fb6099e16..3d8789f20b5 100644 --- a/service/alexaforbusiness/api_op_PutSkillAuthorization.go +++ b/service/alexaforbusiness/api_op_PutSkillAuthorization.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) PutSkillAuthorization(ctx context.Context, params *PutSkillAuth addawsAwsjson11_serdeOpPutSkillAuthorizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_RegisterAVSDevice.go b/service/alexaforbusiness/api_op_RegisterAVSDevice.go index fd530876e56..227e8531631 100644 --- a/service/alexaforbusiness/api_op_RegisterAVSDevice.go +++ b/service/alexaforbusiness/api_op_RegisterAVSDevice.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) RegisterAVSDevice(ctx context.Context, params *RegisterAVSDevic addawsAwsjson11_serdeOpRegisterAVSDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_RejectSkill.go b/service/alexaforbusiness/api_op_RejectSkill.go index 1ed200d2e8c..35faaf4b19c 100644 --- a/service/alexaforbusiness/api_op_RejectSkill.go +++ b/service/alexaforbusiness/api_op_RejectSkill.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) RejectSkill(ctx context.Context, params *RejectSkillInput, optF addawsAwsjson11_serdeOpRejectSkillMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_ResolveRoom.go b/service/alexaforbusiness/api_op_ResolveRoom.go index 40830eb8870..fd95a46c840 100644 --- a/service/alexaforbusiness/api_op_ResolveRoom.go +++ b/service/alexaforbusiness/api_op_ResolveRoom.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ResolveRoom(ctx context.Context, params *ResolveRoomInput, optF addawsAwsjson11_serdeOpResolveRoomMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_RevokeInvitation.go b/service/alexaforbusiness/api_op_RevokeInvitation.go index d207172beaf..ba5c4d8385c 100644 --- a/service/alexaforbusiness/api_op_RevokeInvitation.go +++ b/service/alexaforbusiness/api_op_RevokeInvitation.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RevokeInvitation(ctx context.Context, params *RevokeInvitationI addawsAwsjson11_serdeOpRevokeInvitationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_SearchAddressBooks.go b/service/alexaforbusiness/api_op_SearchAddressBooks.go index bc0c54790a8..d8c4b29a927 100644 --- a/service/alexaforbusiness/api_op_SearchAddressBooks.go +++ b/service/alexaforbusiness/api_op_SearchAddressBooks.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) SearchAddressBooks(ctx context.Context, params *SearchAddressBo addawsAwsjson11_serdeOpSearchAddressBooksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_SearchContacts.go b/service/alexaforbusiness/api_op_SearchContacts.go index dcb2970808d..3d17a4ae910 100644 --- a/service/alexaforbusiness/api_op_SearchContacts.go +++ b/service/alexaforbusiness/api_op_SearchContacts.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) SearchContacts(ctx context.Context, params *SearchContactsInput addawsAwsjson11_serdeOpSearchContactsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_SearchDevices.go b/service/alexaforbusiness/api_op_SearchDevices.go index 755412459ea..26d5cf24bae 100644 --- a/service/alexaforbusiness/api_op_SearchDevices.go +++ b/service/alexaforbusiness/api_op_SearchDevices.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SearchDevices(ctx context.Context, params *SearchDevicesInput, addawsAwsjson11_serdeOpSearchDevicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_SearchNetworkProfiles.go b/service/alexaforbusiness/api_op_SearchNetworkProfiles.go index 6f9bcd5881a..bff2a2697aa 100644 --- a/service/alexaforbusiness/api_op_SearchNetworkProfiles.go +++ b/service/alexaforbusiness/api_op_SearchNetworkProfiles.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) SearchNetworkProfiles(ctx context.Context, params *SearchNetwor addawsAwsjson11_serdeOpSearchNetworkProfilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_SearchProfiles.go b/service/alexaforbusiness/api_op_SearchProfiles.go index cdb5fed5738..478556c5524 100644 --- a/service/alexaforbusiness/api_op_SearchProfiles.go +++ b/service/alexaforbusiness/api_op_SearchProfiles.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SearchProfiles(ctx context.Context, params *SearchProfilesInput addawsAwsjson11_serdeOpSearchProfilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_SearchRooms.go b/service/alexaforbusiness/api_op_SearchRooms.go index 01cea132528..8549f73783b 100644 --- a/service/alexaforbusiness/api_op_SearchRooms.go +++ b/service/alexaforbusiness/api_op_SearchRooms.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SearchRooms(ctx context.Context, params *SearchRoomsInput, optF addawsAwsjson11_serdeOpSearchRoomsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_SearchSkillGroups.go b/service/alexaforbusiness/api_op_SearchSkillGroups.go index 7df8f22919b..434884e1e01 100644 --- a/service/alexaforbusiness/api_op_SearchSkillGroups.go +++ b/service/alexaforbusiness/api_op_SearchSkillGroups.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) SearchSkillGroups(ctx context.Context, params *SearchSkillGroup addawsAwsjson11_serdeOpSearchSkillGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_SearchUsers.go b/service/alexaforbusiness/api_op_SearchUsers.go index 05b39f8870f..46b2a108fd2 100644 --- a/service/alexaforbusiness/api_op_SearchUsers.go +++ b/service/alexaforbusiness/api_op_SearchUsers.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SearchUsers(ctx context.Context, params *SearchUsersInput, optF addawsAwsjson11_serdeOpSearchUsersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_SendAnnouncement.go b/service/alexaforbusiness/api_op_SendAnnouncement.go index 3b810817ce2..089e72571d1 100644 --- a/service/alexaforbusiness/api_op_SendAnnouncement.go +++ b/service/alexaforbusiness/api_op_SendAnnouncement.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) SendAnnouncement(ctx context.Context, params *SendAnnouncementI addawsAwsjson11_serdeOpSendAnnouncementMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_SendInvitation.go b/service/alexaforbusiness/api_op_SendInvitation.go index da46f43abdf..c1a3a4857ff 100644 --- a/service/alexaforbusiness/api_op_SendInvitation.go +++ b/service/alexaforbusiness/api_op_SendInvitation.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) SendInvitation(ctx context.Context, params *SendInvitationInput addawsAwsjson11_serdeOpSendInvitationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_StartDeviceSync.go b/service/alexaforbusiness/api_op_StartDeviceSync.go index 976460758ce..a3c4a43beb3 100644 --- a/service/alexaforbusiness/api_op_StartDeviceSync.go +++ b/service/alexaforbusiness/api_op_StartDeviceSync.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) StartDeviceSync(ctx context.Context, params *StartDeviceSyncInp addawsAwsjson11_serdeOpStartDeviceSyncMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_StartSmartHomeApplianceDiscovery.go b/service/alexaforbusiness/api_op_StartSmartHomeApplianceDiscovery.go index decaac0787d..3b99ff4da9b 100644 --- a/service/alexaforbusiness/api_op_StartSmartHomeApplianceDiscovery.go +++ b/service/alexaforbusiness/api_op_StartSmartHomeApplianceDiscovery.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StartSmartHomeApplianceDiscovery(ctx context.Context, params *S addawsAwsjson11_serdeOpStartSmartHomeApplianceDiscoveryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_TagResource.go b/service/alexaforbusiness/api_op_TagResource.go index c2881285813..2d5d77f40c7 100644 --- a/service/alexaforbusiness/api_op_TagResource.go +++ b/service/alexaforbusiness/api_op_TagResource.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_UntagResource.go b/service/alexaforbusiness/api_op_UntagResource.go index 05ebca27474..667d10d7217 100644 --- a/service/alexaforbusiness/api_op_UntagResource.go +++ b/service/alexaforbusiness/api_op_UntagResource.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_UpdateAddressBook.go b/service/alexaforbusiness/api_op_UpdateAddressBook.go index 134e1fd8a62..6f2b9e2a872 100644 --- a/service/alexaforbusiness/api_op_UpdateAddressBook.go +++ b/service/alexaforbusiness/api_op_UpdateAddressBook.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateAddressBook(ctx context.Context, params *UpdateAddressBoo addawsAwsjson11_serdeOpUpdateAddressBookMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_UpdateBusinessReportSchedule.go b/service/alexaforbusiness/api_op_UpdateBusinessReportSchedule.go index 65217353948..898778ecbbe 100644 --- a/service/alexaforbusiness/api_op_UpdateBusinessReportSchedule.go +++ b/service/alexaforbusiness/api_op_UpdateBusinessReportSchedule.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateBusinessReportSchedule(ctx context.Context, params *Updat addawsAwsjson11_serdeOpUpdateBusinessReportScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_UpdateConferenceProvider.go b/service/alexaforbusiness/api_op_UpdateConferenceProvider.go index 4a2fec61fa2..f26b0e6b1e1 100644 --- a/service/alexaforbusiness/api_op_UpdateConferenceProvider.go +++ b/service/alexaforbusiness/api_op_UpdateConferenceProvider.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateConferenceProvider(ctx context.Context, params *UpdateCon addawsAwsjson11_serdeOpUpdateConferenceProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_UpdateContact.go b/service/alexaforbusiness/api_op_UpdateContact.go index f10fa715284..15629ae30cd 100644 --- a/service/alexaforbusiness/api_op_UpdateContact.go +++ b/service/alexaforbusiness/api_op_UpdateContact.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateContact(ctx context.Context, params *UpdateContactInput, addawsAwsjson11_serdeOpUpdateContactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_UpdateDevice.go b/service/alexaforbusiness/api_op_UpdateDevice.go index 65fc55f25e4..a13bcb7b1ef 100644 --- a/service/alexaforbusiness/api_op_UpdateDevice.go +++ b/service/alexaforbusiness/api_op_UpdateDevice.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateDevice(ctx context.Context, params *UpdateDeviceInput, op addawsAwsjson11_serdeOpUpdateDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_UpdateGateway.go b/service/alexaforbusiness/api_op_UpdateGateway.go index 005e8ed988f..3af13214e21 100644 --- a/service/alexaforbusiness/api_op_UpdateGateway.go +++ b/service/alexaforbusiness/api_op_UpdateGateway.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpdateGateway(ctx context.Context, params *UpdateGatewayInput, addawsAwsjson11_serdeOpUpdateGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_UpdateGatewayGroup.go b/service/alexaforbusiness/api_op_UpdateGatewayGroup.go index c025037471c..f78e749880b 100644 --- a/service/alexaforbusiness/api_op_UpdateGatewayGroup.go +++ b/service/alexaforbusiness/api_op_UpdateGatewayGroup.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpdateGatewayGroup(ctx context.Context, params *UpdateGatewayGr addawsAwsjson11_serdeOpUpdateGatewayGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_UpdateNetworkProfile.go b/service/alexaforbusiness/api_op_UpdateNetworkProfile.go index 23e6e3dfc34..c106630ee56 100644 --- a/service/alexaforbusiness/api_op_UpdateNetworkProfile.go +++ b/service/alexaforbusiness/api_op_UpdateNetworkProfile.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateNetworkProfile(ctx context.Context, params *UpdateNetwork addawsAwsjson11_serdeOpUpdateNetworkProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_UpdateProfile.go b/service/alexaforbusiness/api_op_UpdateProfile.go index 24262670090..ffe82116038 100644 --- a/service/alexaforbusiness/api_op_UpdateProfile.go +++ b/service/alexaforbusiness/api_op_UpdateProfile.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/alexaforbusiness/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateProfile(ctx context.Context, params *UpdateProfileInput, addawsAwsjson11_serdeOpUpdateProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_UpdateRoom.go b/service/alexaforbusiness/api_op_UpdateRoom.go index 94cd6e49c54..3201aa23f50 100644 --- a/service/alexaforbusiness/api_op_UpdateRoom.go +++ b/service/alexaforbusiness/api_op_UpdateRoom.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateRoom(ctx context.Context, params *UpdateRoomInput, optFns addawsAwsjson11_serdeOpUpdateRoomMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/api_op_UpdateSkillGroup.go b/service/alexaforbusiness/api_op_UpdateSkillGroup.go index 55beee60662..53b0cc51c78 100644 --- a/service/alexaforbusiness/api_op_UpdateSkillGroup.go +++ b/service/alexaforbusiness/api_op_UpdateSkillGroup.go @@ -5,7 +5,6 @@ package alexaforbusiness import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateSkillGroup(ctx context.Context, params *UpdateSkillGroupI addawsAwsjson11_serdeOpUpdateSkillGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/alexaforbusiness/endpoints.go b/service/alexaforbusiness/endpoints.go index 34851d4861b..b6ebb20379e 100644 --- a/service/alexaforbusiness/endpoints.go +++ b/service/alexaforbusiness/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/amplify/api_client.go b/service/amplify/api_client.go index bdc1c9596af..85b63230ecb 100644 --- a/service/amplify/api_client.go +++ b/service/amplify/api_client.go @@ -83,30 +83,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -172,6 +148,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/amplify/api_op_CreateApp.go b/service/amplify/api_op_CreateApp.go index 17ca7394abe..f01aeafd8ef 100644 --- a/service/amplify/api_op_CreateApp.go +++ b/service/amplify/api_op_CreateApp.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateApp(ctx context.Context, params *CreateAppInput, optFns . addawsRestjson1_serdeOpCreateAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_CreateBackendEnvironment.go b/service/amplify/api_op_CreateBackendEnvironment.go index 64e8b914e0b..77ddce2b428 100644 --- a/service/amplify/api_op_CreateBackendEnvironment.go +++ b/service/amplify/api_op_CreateBackendEnvironment.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateBackendEnvironment(ctx context.Context, params *CreateBac addawsRestjson1_serdeOpCreateBackendEnvironmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_CreateBranch.go b/service/amplify/api_op_CreateBranch.go index 31d1b244d42..9fd230cae8b 100644 --- a/service/amplify/api_op_CreateBranch.go +++ b/service/amplify/api_op_CreateBranch.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateBranch(ctx context.Context, params *CreateBranchInput, op addawsRestjson1_serdeOpCreateBranchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_CreateDeployment.go b/service/amplify/api_op_CreateDeployment.go index 227f7b8055c..bf37fdb5e12 100644 --- a/service/amplify/api_op_CreateDeployment.go +++ b/service/amplify/api_op_CreateDeployment.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateDeployment(ctx context.Context, params *CreateDeploymentI addawsRestjson1_serdeOpCreateDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_CreateDomainAssociation.go b/service/amplify/api_op_CreateDomainAssociation.go index d5f34809424..c1d721e2b67 100644 --- a/service/amplify/api_op_CreateDomainAssociation.go +++ b/service/amplify/api_op_CreateDomainAssociation.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateDomainAssociation(ctx context.Context, params *CreateDoma addawsRestjson1_serdeOpCreateDomainAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_CreateWebhook.go b/service/amplify/api_op_CreateWebhook.go index fc27563c208..94c5932eb77 100644 --- a/service/amplify/api_op_CreateWebhook.go +++ b/service/amplify/api_op_CreateWebhook.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateWebhook(ctx context.Context, params *CreateWebhookInput, addawsRestjson1_serdeOpCreateWebhookMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_DeleteApp.go b/service/amplify/api_op_DeleteApp.go index 76e4d49df05..d823196da3a 100644 --- a/service/amplify/api_op_DeleteApp.go +++ b/service/amplify/api_op_DeleteApp.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteApp(ctx context.Context, params *DeleteAppInput, optFns . addawsRestjson1_serdeOpDeleteAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_DeleteBackendEnvironment.go b/service/amplify/api_op_DeleteBackendEnvironment.go index f6a1dff8598..48119516096 100644 --- a/service/amplify/api_op_DeleteBackendEnvironment.go +++ b/service/amplify/api_op_DeleteBackendEnvironment.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteBackendEnvironment(ctx context.Context, params *DeleteBac addawsRestjson1_serdeOpDeleteBackendEnvironmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_DeleteBranch.go b/service/amplify/api_op_DeleteBranch.go index a93a6743771..691e0215eda 100644 --- a/service/amplify/api_op_DeleteBranch.go +++ b/service/amplify/api_op_DeleteBranch.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteBranch(ctx context.Context, params *DeleteBranchInput, op addawsRestjson1_serdeOpDeleteBranchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_DeleteDomainAssociation.go b/service/amplify/api_op_DeleteDomainAssociation.go index c9eee73fa45..f974f41eae1 100644 --- a/service/amplify/api_op_DeleteDomainAssociation.go +++ b/service/amplify/api_op_DeleteDomainAssociation.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteDomainAssociation(ctx context.Context, params *DeleteDoma addawsRestjson1_serdeOpDeleteDomainAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_DeleteJob.go b/service/amplify/api_op_DeleteJob.go index 0354e374f96..43305f095a7 100644 --- a/service/amplify/api_op_DeleteJob.go +++ b/service/amplify/api_op_DeleteJob.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteJob(ctx context.Context, params *DeleteJobInput, optFns . addawsRestjson1_serdeOpDeleteJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_DeleteWebhook.go b/service/amplify/api_op_DeleteWebhook.go index 08922f85604..4800226298f 100644 --- a/service/amplify/api_op_DeleteWebhook.go +++ b/service/amplify/api_op_DeleteWebhook.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteWebhook(ctx context.Context, params *DeleteWebhookInput, addawsRestjson1_serdeOpDeleteWebhookMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_GenerateAccessLogs.go b/service/amplify/api_op_GenerateAccessLogs.go index 2b43de60443..0c1b92bb233 100644 --- a/service/amplify/api_op_GenerateAccessLogs.go +++ b/service/amplify/api_op_GenerateAccessLogs.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GenerateAccessLogs(ctx context.Context, params *GenerateAccessL addawsRestjson1_serdeOpGenerateAccessLogsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_GetApp.go b/service/amplify/api_op_GetApp.go index 8aa06a47438..747d710c5f0 100644 --- a/service/amplify/api_op_GetApp.go +++ b/service/amplify/api_op_GetApp.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetApp(ctx context.Context, params *GetAppInput, optFns ...func addawsRestjson1_serdeOpGetAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_GetArtifactUrl.go b/service/amplify/api_op_GetArtifactUrl.go index 4586b55adb0..e14b6f65ae7 100644 --- a/service/amplify/api_op_GetArtifactUrl.go +++ b/service/amplify/api_op_GetArtifactUrl.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetArtifactUrl(ctx context.Context, params *GetArtifactUrlInput addawsRestjson1_serdeOpGetArtifactUrlMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_GetBackendEnvironment.go b/service/amplify/api_op_GetBackendEnvironment.go index caa56656f13..c215bcb2e49 100644 --- a/service/amplify/api_op_GetBackendEnvironment.go +++ b/service/amplify/api_op_GetBackendEnvironment.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetBackendEnvironment(ctx context.Context, params *GetBackendEn addawsRestjson1_serdeOpGetBackendEnvironmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_GetBranch.go b/service/amplify/api_op_GetBranch.go index 6e94e719da0..74eb633ad89 100644 --- a/service/amplify/api_op_GetBranch.go +++ b/service/amplify/api_op_GetBranch.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetBranch(ctx context.Context, params *GetBranchInput, optFns . addawsRestjson1_serdeOpGetBranchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_GetDomainAssociation.go b/service/amplify/api_op_GetDomainAssociation.go index deb258b13c2..e48aa8a0236 100644 --- a/service/amplify/api_op_GetDomainAssociation.go +++ b/service/amplify/api_op_GetDomainAssociation.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDomainAssociation(ctx context.Context, params *GetDomainAsso addawsRestjson1_serdeOpGetDomainAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_GetJob.go b/service/amplify/api_op_GetJob.go index 805a96e46d6..9d684ad5f1a 100644 --- a/service/amplify/api_op_GetJob.go +++ b/service/amplify/api_op_GetJob.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetJob(ctx context.Context, params *GetJobInput, optFns ...func addawsRestjson1_serdeOpGetJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_GetWebhook.go b/service/amplify/api_op_GetWebhook.go index cf63eb58605..d965788bcce 100644 --- a/service/amplify/api_op_GetWebhook.go +++ b/service/amplify/api_op_GetWebhook.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetWebhook(ctx context.Context, params *GetWebhookInput, optFns addawsRestjson1_serdeOpGetWebhookMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_ListApps.go b/service/amplify/api_op_ListApps.go index 7e6126ad850..e771156f9ec 100644 --- a/service/amplify/api_op_ListApps.go +++ b/service/amplify/api_op_ListApps.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListApps(ctx context.Context, params *ListAppsInput, optFns ... addawsRestjson1_serdeOpListAppsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_ListArtifacts.go b/service/amplify/api_op_ListArtifacts.go index 1c527efe7eb..4e34f5ba892 100644 --- a/service/amplify/api_op_ListArtifacts.go +++ b/service/amplify/api_op_ListArtifacts.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListArtifacts(ctx context.Context, params *ListArtifactsInput, addawsRestjson1_serdeOpListArtifactsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_ListBackendEnvironments.go b/service/amplify/api_op_ListBackendEnvironments.go index 3858956c8cc..f45cf536b0f 100644 --- a/service/amplify/api_op_ListBackendEnvironments.go +++ b/service/amplify/api_op_ListBackendEnvironments.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListBackendEnvironments(ctx context.Context, params *ListBacken addawsRestjson1_serdeOpListBackendEnvironmentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_ListBranches.go b/service/amplify/api_op_ListBranches.go index 9e552757aa8..6e2a2d2daff 100644 --- a/service/amplify/api_op_ListBranches.go +++ b/service/amplify/api_op_ListBranches.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListBranches(ctx context.Context, params *ListBranchesInput, op addawsRestjson1_serdeOpListBranchesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_ListDomainAssociations.go b/service/amplify/api_op_ListDomainAssociations.go index 8870663ea53..6b85ab09240 100644 --- a/service/amplify/api_op_ListDomainAssociations.go +++ b/service/amplify/api_op_ListDomainAssociations.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDomainAssociations(ctx context.Context, params *ListDomainA addawsRestjson1_serdeOpListDomainAssociationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_ListJobs.go b/service/amplify/api_op_ListJobs.go index a29a8f00042..47f7e250265 100644 --- a/service/amplify/api_op_ListJobs.go +++ b/service/amplify/api_op_ListJobs.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListJobs(ctx context.Context, params *ListJobsInput, optFns ... addawsRestjson1_serdeOpListJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_ListTagsForResource.go b/service/amplify/api_op_ListTagsForResource.go index 108c85e174e..18be4a7c5b3 100644 --- a/service/amplify/api_op_ListTagsForResource.go +++ b/service/amplify/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_ListWebhooks.go b/service/amplify/api_op_ListWebhooks.go index ca026bf4e0e..1d99ca25d13 100644 --- a/service/amplify/api_op_ListWebhooks.go +++ b/service/amplify/api_op_ListWebhooks.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListWebhooks(ctx context.Context, params *ListWebhooksInput, op addawsRestjson1_serdeOpListWebhooksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_StartDeployment.go b/service/amplify/api_op_StartDeployment.go index b1c9729e3cd..f21f6d97d39 100644 --- a/service/amplify/api_op_StartDeployment.go +++ b/service/amplify/api_op_StartDeployment.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) StartDeployment(ctx context.Context, params *StartDeploymentInp addawsRestjson1_serdeOpStartDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_StartJob.go b/service/amplify/api_op_StartJob.go index 2ec986b70f2..03933b7221d 100644 --- a/service/amplify/api_op_StartJob.go +++ b/service/amplify/api_op_StartJob.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) StartJob(ctx context.Context, params *StartJobInput, optFns ... addawsRestjson1_serdeOpStartJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_StopJob.go b/service/amplify/api_op_StopJob.go index 3e7f866fa95..8c175aa5741 100644 --- a/service/amplify/api_op_StopJob.go +++ b/service/amplify/api_op_StopJob.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StopJob(ctx context.Context, params *StopJobInput, optFns ...fu addawsRestjson1_serdeOpStopJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_TagResource.go b/service/amplify/api_op_TagResource.go index 59cd24973d4..4b5f3519feb 100644 --- a/service/amplify/api_op_TagResource.go +++ b/service/amplify/api_op_TagResource.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_UntagResource.go b/service/amplify/api_op_UntagResource.go index d58c4f475c2..af4fb3156be 100644 --- a/service/amplify/api_op_UntagResource.go +++ b/service/amplify/api_op_UntagResource.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_UpdateApp.go b/service/amplify/api_op_UpdateApp.go index 6259f81c72a..b7e4b9975f3 100644 --- a/service/amplify/api_op_UpdateApp.go +++ b/service/amplify/api_op_UpdateApp.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateApp(ctx context.Context, params *UpdateAppInput, optFns . addawsRestjson1_serdeOpUpdateAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_UpdateBranch.go b/service/amplify/api_op_UpdateBranch.go index 5a8dd1e8455..4b3bb94bd51 100644 --- a/service/amplify/api_op_UpdateBranch.go +++ b/service/amplify/api_op_UpdateBranch.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateBranch(ctx context.Context, params *UpdateBranchInput, op addawsRestjson1_serdeOpUpdateBranchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_UpdateDomainAssociation.go b/service/amplify/api_op_UpdateDomainAssociation.go index f3232e7b5b4..a80b565ebd9 100644 --- a/service/amplify/api_op_UpdateDomainAssociation.go +++ b/service/amplify/api_op_UpdateDomainAssociation.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDomainAssociation(ctx context.Context, params *UpdateDoma addawsRestjson1_serdeOpUpdateDomainAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/api_op_UpdateWebhook.go b/service/amplify/api_op_UpdateWebhook.go index 6ae37b8620f..6778f4a26bd 100644 --- a/service/amplify/api_op_UpdateWebhook.go +++ b/service/amplify/api_op_UpdateWebhook.go @@ -5,7 +5,6 @@ package amplify import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amplify/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateWebhook(ctx context.Context, params *UpdateWebhookInput, addawsRestjson1_serdeOpUpdateWebhookMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/amplify/endpoints.go b/service/amplify/endpoints.go index e66a8de57c0..a2794f1d14d 100644 --- a/service/amplify/endpoints.go +++ b/service/amplify/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/apigateway/api_client.go b/service/apigateway/api_client.go index 2aa5d4e3857..1842c2ce7cb 100644 --- a/service/apigateway/api_client.go +++ b/service/apigateway/api_client.go @@ -82,30 +82,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -171,6 +147,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/apigateway/api_op_CreateApiKey.go b/service/apigateway/api_op_CreateApiKey.go index c05ed0113cf..9ea70698f93 100644 --- a/service/apigateway/api_op_CreateApiKey.go +++ b/service/apigateway/api_op_CreateApiKey.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateApiKey(ctx context.Context, params *CreateApiKeyInput, op addawsRestjson1_serdeOpCreateApiKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_CreateAuthorizer.go b/service/apigateway/api_op_CreateAuthorizer.go index 00d1bf59b9d..cf67d786572 100644 --- a/service/apigateway/api_op_CreateAuthorizer.go +++ b/service/apigateway/api_op_CreateAuthorizer.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateAuthorizer(ctx context.Context, params *CreateAuthorizerI addawsRestjson1_serdeOpCreateAuthorizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_CreateBasePathMapping.go b/service/apigateway/api_op_CreateBasePathMapping.go index ad803319ec1..bd7748a356c 100644 --- a/service/apigateway/api_op_CreateBasePathMapping.go +++ b/service/apigateway/api_op_CreateBasePathMapping.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateBasePathMapping(ctx context.Context, params *CreateBasePa addawsRestjson1_serdeOpCreateBasePathMappingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_CreateDeployment.go b/service/apigateway/api_op_CreateDeployment.go index 955d60a5a05..520f5974b79 100644 --- a/service/apigateway/api_op_CreateDeployment.go +++ b/service/apigateway/api_op_CreateDeployment.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateDeployment(ctx context.Context, params *CreateDeploymentI addawsRestjson1_serdeOpCreateDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_CreateDocumentationPart.go b/service/apigateway/api_op_CreateDocumentationPart.go index 9f4ff25bd71..7a4c8ad4321 100644 --- a/service/apigateway/api_op_CreateDocumentationPart.go +++ b/service/apigateway/api_op_CreateDocumentationPart.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -22,9 +21,9 @@ func (c *Client) CreateDocumentationPart(ctx context.Context, params *CreateDocu addawsRestjson1_serdeOpCreateDocumentationPartMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_CreateDocumentationVersion.go b/service/apigateway/api_op_CreateDocumentationVersion.go index 60b0f5895fd..0cc0ddec312 100644 --- a/service/apigateway/api_op_CreateDocumentationVersion.go +++ b/service/apigateway/api_op_CreateDocumentationVersion.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateDocumentationVersion(ctx context.Context, params *CreateD addawsRestjson1_serdeOpCreateDocumentationVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_CreateDomainName.go b/service/apigateway/api_op_CreateDomainName.go index 38dd288c462..7e029a0d29d 100644 --- a/service/apigateway/api_op_CreateDomainName.go +++ b/service/apigateway/api_op_CreateDomainName.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateDomainName(ctx context.Context, params *CreateDomainNameI addawsRestjson1_serdeOpCreateDomainNameMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_CreateModel.go b/service/apigateway/api_op_CreateModel.go index cc14c373215..7d8a19037e6 100644 --- a/service/apigateway/api_op_CreateModel.go +++ b/service/apigateway/api_op_CreateModel.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateModel(ctx context.Context, params *CreateModelInput, optF addawsRestjson1_serdeOpCreateModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_CreateRequestValidator.go b/service/apigateway/api_op_CreateRequestValidator.go index 2bf194011da..c236d791f68 100644 --- a/service/apigateway/api_op_CreateRequestValidator.go +++ b/service/apigateway/api_op_CreateRequestValidator.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateRequestValidator(ctx context.Context, params *CreateReque addawsRestjson1_serdeOpCreateRequestValidatorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_CreateResource.go b/service/apigateway/api_op_CreateResource.go index afb1766019c..931ef77ddeb 100644 --- a/service/apigateway/api_op_CreateResource.go +++ b/service/apigateway/api_op_CreateResource.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateResource(ctx context.Context, params *CreateResourceInput addawsRestjson1_serdeOpCreateResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_CreateRestApi.go b/service/apigateway/api_op_CreateRestApi.go index 30c87f817f3..a0e6151cae7 100644 --- a/service/apigateway/api_op_CreateRestApi.go +++ b/service/apigateway/api_op_CreateRestApi.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateRestApi(ctx context.Context, params *CreateRestApiInput, addawsRestjson1_serdeOpCreateRestApiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_CreateStage.go b/service/apigateway/api_op_CreateStage.go index 0fdbca7d3da..41596fb7266 100644 --- a/service/apigateway/api_op_CreateStage.go +++ b/service/apigateway/api_op_CreateStage.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateStage(ctx context.Context, params *CreateStageInput, optF addawsRestjson1_serdeOpCreateStageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_CreateUsagePlan.go b/service/apigateway/api_op_CreateUsagePlan.go index e8c71ae4704..234102427b3 100644 --- a/service/apigateway/api_op_CreateUsagePlan.go +++ b/service/apigateway/api_op_CreateUsagePlan.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateUsagePlan(ctx context.Context, params *CreateUsagePlanInp addawsRestjson1_serdeOpCreateUsagePlanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_CreateUsagePlanKey.go b/service/apigateway/api_op_CreateUsagePlanKey.go index 8cd9128ac6a..d22627a6ce1 100644 --- a/service/apigateway/api_op_CreateUsagePlanKey.go +++ b/service/apigateway/api_op_CreateUsagePlanKey.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateUsagePlanKey(ctx context.Context, params *CreateUsagePlan addawsRestjson1_serdeOpCreateUsagePlanKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_CreateVpcLink.go b/service/apigateway/api_op_CreateVpcLink.go index 6987ad1b43f..182e004a2ec 100644 --- a/service/apigateway/api_op_CreateVpcLink.go +++ b/service/apigateway/api_op_CreateVpcLink.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateVpcLink(ctx context.Context, params *CreateVpcLinkInput, addawsRestjson1_serdeOpCreateVpcLinkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteApiKey.go b/service/apigateway/api_op_DeleteApiKey.go index 8bf07bebb26..448b9d9daa9 100644 --- a/service/apigateway/api_op_DeleteApiKey.go +++ b/service/apigateway/api_op_DeleteApiKey.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteApiKey(ctx context.Context, params *DeleteApiKeyInput, op addawsRestjson1_serdeOpDeleteApiKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteAuthorizer.go b/service/apigateway/api_op_DeleteAuthorizer.go index 6f5f1af4164..df1d4044218 100644 --- a/service/apigateway/api_op_DeleteAuthorizer.go +++ b/service/apigateway/api_op_DeleteAuthorizer.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteAuthorizer(ctx context.Context, params *DeleteAuthorizerI addawsRestjson1_serdeOpDeleteAuthorizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteBasePathMapping.go b/service/apigateway/api_op_DeleteBasePathMapping.go index 51e58db36c9..ca157040a63 100644 --- a/service/apigateway/api_op_DeleteBasePathMapping.go +++ b/service/apigateway/api_op_DeleteBasePathMapping.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteBasePathMapping(ctx context.Context, params *DeleteBasePa addawsRestjson1_serdeOpDeleteBasePathMappingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteClientCertificate.go b/service/apigateway/api_op_DeleteClientCertificate.go index f8077c95a4c..0ed64208913 100644 --- a/service/apigateway/api_op_DeleteClientCertificate.go +++ b/service/apigateway/api_op_DeleteClientCertificate.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteClientCertificate(ctx context.Context, params *DeleteClie addawsRestjson1_serdeOpDeleteClientCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteDeployment.go b/service/apigateway/api_op_DeleteDeployment.go index dcae9a62dc3..363ecc5f258 100644 --- a/service/apigateway/api_op_DeleteDeployment.go +++ b/service/apigateway/api_op_DeleteDeployment.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDeployment(ctx context.Context, params *DeleteDeploymentI addawsRestjson1_serdeOpDeleteDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteDocumentationPart.go b/service/apigateway/api_op_DeleteDocumentationPart.go index 0e18a3c8dd9..9c2d2488d0e 100644 --- a/service/apigateway/api_op_DeleteDocumentationPart.go +++ b/service/apigateway/api_op_DeleteDocumentationPart.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -21,9 +20,9 @@ func (c *Client) DeleteDocumentationPart(ctx context.Context, params *DeleteDocu addawsRestjson1_serdeOpDeleteDocumentationPartMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteDocumentationVersion.go b/service/apigateway/api_op_DeleteDocumentationVersion.go index b034d9ed7f9..d3c88e746d1 100644 --- a/service/apigateway/api_op_DeleteDocumentationVersion.go +++ b/service/apigateway/api_op_DeleteDocumentationVersion.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -21,9 +20,9 @@ func (c *Client) DeleteDocumentationVersion(ctx context.Context, params *DeleteD addawsRestjson1_serdeOpDeleteDocumentationVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteDomainName.go b/service/apigateway/api_op_DeleteDomainName.go index 8c57458d7c3..141dc635b80 100644 --- a/service/apigateway/api_op_DeleteDomainName.go +++ b/service/apigateway/api_op_DeleteDomainName.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDomainName(ctx context.Context, params *DeleteDomainNameI addawsRestjson1_serdeOpDeleteDomainNameMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteGatewayResponse.go b/service/apigateway/api_op_DeleteGatewayResponse.go index 8220c74983e..0f2737df632 100644 --- a/service/apigateway/api_op_DeleteGatewayResponse.go +++ b/service/apigateway/api_op_DeleteGatewayResponse.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteGatewayResponse(ctx context.Context, params *DeleteGatewa addawsRestjson1_serdeOpDeleteGatewayResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteIntegration.go b/service/apigateway/api_op_DeleteIntegration.go index d3983b5858a..95f71d65be8 100644 --- a/service/apigateway/api_op_DeleteIntegration.go +++ b/service/apigateway/api_op_DeleteIntegration.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteIntegration(ctx context.Context, params *DeleteIntegratio addawsRestjson1_serdeOpDeleteIntegrationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteIntegrationResponse.go b/service/apigateway/api_op_DeleteIntegrationResponse.go index e844f95dd39..43ce623f13c 100644 --- a/service/apigateway/api_op_DeleteIntegrationResponse.go +++ b/service/apigateway/api_op_DeleteIntegrationResponse.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteIntegrationResponse(ctx context.Context, params *DeleteIn addawsRestjson1_serdeOpDeleteIntegrationResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteMethod.go b/service/apigateway/api_op_DeleteMethod.go index ddfec3ca756..72513f77bb1 100644 --- a/service/apigateway/api_op_DeleteMethod.go +++ b/service/apigateway/api_op_DeleteMethod.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteMethod(ctx context.Context, params *DeleteMethodInput, op addawsRestjson1_serdeOpDeleteMethodMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteMethodResponse.go b/service/apigateway/api_op_DeleteMethodResponse.go index fd3d726e866..6eb2d1107f0 100644 --- a/service/apigateway/api_op_DeleteMethodResponse.go +++ b/service/apigateway/api_op_DeleteMethodResponse.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteMethodResponse(ctx context.Context, params *DeleteMethodR addawsRestjson1_serdeOpDeleteMethodResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteModel.go b/service/apigateway/api_op_DeleteModel.go index f5498ff9d43..5fb65a1b651 100644 --- a/service/apigateway/api_op_DeleteModel.go +++ b/service/apigateway/api_op_DeleteModel.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteModel(ctx context.Context, params *DeleteModelInput, optF addawsRestjson1_serdeOpDeleteModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteRequestValidator.go b/service/apigateway/api_op_DeleteRequestValidator.go index 8bfe21db663..db8bb5eef13 100644 --- a/service/apigateway/api_op_DeleteRequestValidator.go +++ b/service/apigateway/api_op_DeleteRequestValidator.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRequestValidator(ctx context.Context, params *DeleteReque addawsRestjson1_serdeOpDeleteRequestValidatorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteResource.go b/service/apigateway/api_op_DeleteResource.go index 507266a9d37..8bfa0d88aec 100644 --- a/service/apigateway/api_op_DeleteResource.go +++ b/service/apigateway/api_op_DeleteResource.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteResource(ctx context.Context, params *DeleteResourceInput addawsRestjson1_serdeOpDeleteResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteRestApi.go b/service/apigateway/api_op_DeleteRestApi.go index 0a11dad21ba..2b5eac22755 100644 --- a/service/apigateway/api_op_DeleteRestApi.go +++ b/service/apigateway/api_op_DeleteRestApi.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRestApi(ctx context.Context, params *DeleteRestApiInput, addawsRestjson1_serdeOpDeleteRestApiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteStage.go b/service/apigateway/api_op_DeleteStage.go index 7d6c5c028d7..97b36fcbccd 100644 --- a/service/apigateway/api_op_DeleteStage.go +++ b/service/apigateway/api_op_DeleteStage.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteStage(ctx context.Context, params *DeleteStageInput, optF addawsRestjson1_serdeOpDeleteStageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteUsagePlan.go b/service/apigateway/api_op_DeleteUsagePlan.go index b15ad6b4b49..bf8b84ba2d8 100644 --- a/service/apigateway/api_op_DeleteUsagePlan.go +++ b/service/apigateway/api_op_DeleteUsagePlan.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteUsagePlan(ctx context.Context, params *DeleteUsagePlanInp addawsRestjson1_serdeOpDeleteUsagePlanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteUsagePlanKey.go b/service/apigateway/api_op_DeleteUsagePlanKey.go index a473055d9d3..9d3a552ec26 100644 --- a/service/apigateway/api_op_DeleteUsagePlanKey.go +++ b/service/apigateway/api_op_DeleteUsagePlanKey.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteUsagePlanKey(ctx context.Context, params *DeleteUsagePlan addawsRestjson1_serdeOpDeleteUsagePlanKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_DeleteVpcLink.go b/service/apigateway/api_op_DeleteVpcLink.go index b1937c57844..4be1d4c516e 100644 --- a/service/apigateway/api_op_DeleteVpcLink.go +++ b/service/apigateway/api_op_DeleteVpcLink.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteVpcLink(ctx context.Context, params *DeleteVpcLinkInput, addawsRestjson1_serdeOpDeleteVpcLinkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_FlushStageAuthorizersCache.go b/service/apigateway/api_op_FlushStageAuthorizersCache.go index aaa46a3c0e3..ad7c739dfb6 100644 --- a/service/apigateway/api_op_FlushStageAuthorizersCache.go +++ b/service/apigateway/api_op_FlushStageAuthorizersCache.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) FlushStageAuthorizersCache(ctx context.Context, params *FlushSt addawsRestjson1_serdeOpFlushStageAuthorizersCacheMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_FlushStageCache.go b/service/apigateway/api_op_FlushStageCache.go index 80446f45a4f..0374c4b34be 100644 --- a/service/apigateway/api_op_FlushStageCache.go +++ b/service/apigateway/api_op_FlushStageCache.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) FlushStageCache(ctx context.Context, params *FlushStageCacheInp addawsRestjson1_serdeOpFlushStageCacheMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GenerateClientCertificate.go b/service/apigateway/api_op_GenerateClientCertificate.go index b4c8b5a88e9..6c5a68a5f69 100644 --- a/service/apigateway/api_op_GenerateClientCertificate.go +++ b/service/apigateway/api_op_GenerateClientCertificate.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GenerateClientCertificate(ctx context.Context, params *Generate addawsRestjson1_serdeOpGenerateClientCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetAccount.go b/service/apigateway/api_op_GetAccount.go index babd02c36f7..49914a1c4a5 100644 --- a/service/apigateway/api_op_GetAccount.go +++ b/service/apigateway/api_op_GetAccount.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetAccount(ctx context.Context, params *GetAccountInput, optFns addawsRestjson1_serdeOpGetAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetApiKey.go b/service/apigateway/api_op_GetApiKey.go index d1f5b2fb7d3..1be0fa1cb7e 100644 --- a/service/apigateway/api_op_GetApiKey.go +++ b/service/apigateway/api_op_GetApiKey.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetApiKey(ctx context.Context, params *GetApiKeyInput, optFns . addawsRestjson1_serdeOpGetApiKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetApiKeys.go b/service/apigateway/api_op_GetApiKeys.go index 49e1f4dc078..c2af42260c4 100644 --- a/service/apigateway/api_op_GetApiKeys.go +++ b/service/apigateway/api_op_GetApiKeys.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetApiKeys(ctx context.Context, params *GetApiKeysInput, optFns addawsRestjson1_serdeOpGetApiKeysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetAuthorizer.go b/service/apigateway/api_op_GetAuthorizer.go index eb2677df1c2..172442a7189 100644 --- a/service/apigateway/api_op_GetAuthorizer.go +++ b/service/apigateway/api_op_GetAuthorizer.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetAuthorizer(ctx context.Context, params *GetAuthorizerInput, addawsRestjson1_serdeOpGetAuthorizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetAuthorizers.go b/service/apigateway/api_op_GetAuthorizers.go index e1962366585..2c1a2f8db1a 100644 --- a/service/apigateway/api_op_GetAuthorizers.go +++ b/service/apigateway/api_op_GetAuthorizers.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetAuthorizers(ctx context.Context, params *GetAuthorizersInput addawsRestjson1_serdeOpGetAuthorizersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetBasePathMapping.go b/service/apigateway/api_op_GetBasePathMapping.go index c207883b448..3531a81cf6a 100644 --- a/service/apigateway/api_op_GetBasePathMapping.go +++ b/service/apigateway/api_op_GetBasePathMapping.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetBasePathMapping(ctx context.Context, params *GetBasePathMapp addawsRestjson1_serdeOpGetBasePathMappingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetBasePathMappings.go b/service/apigateway/api_op_GetBasePathMappings.go index f072cdaffe8..335ffaa9418 100644 --- a/service/apigateway/api_op_GetBasePathMappings.go +++ b/service/apigateway/api_op_GetBasePathMappings.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetBasePathMappings(ctx context.Context, params *GetBasePathMap addawsRestjson1_serdeOpGetBasePathMappingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetClientCertificate.go b/service/apigateway/api_op_GetClientCertificate.go index 6c02e824a3f..86efde36b96 100644 --- a/service/apigateway/api_op_GetClientCertificate.go +++ b/service/apigateway/api_op_GetClientCertificate.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetClientCertificate(ctx context.Context, params *GetClientCert addawsRestjson1_serdeOpGetClientCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetClientCertificates.go b/service/apigateway/api_op_GetClientCertificates.go index f16e6aaa875..5319bfcf31a 100644 --- a/service/apigateway/api_op_GetClientCertificates.go +++ b/service/apigateway/api_op_GetClientCertificates.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetClientCertificates(ctx context.Context, params *GetClientCer addawsRestjson1_serdeOpGetClientCertificatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetDeployment.go b/service/apigateway/api_op_GetDeployment.go index e6f616cd744..e0a67afce8c 100644 --- a/service/apigateway/api_op_GetDeployment.go +++ b/service/apigateway/api_op_GetDeployment.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetDeployment(ctx context.Context, params *GetDeploymentInput, addawsRestjson1_serdeOpGetDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetDeployments.go b/service/apigateway/api_op_GetDeployments.go index ca818cb88cb..06030c2f8f6 100644 --- a/service/apigateway/api_op_GetDeployments.go +++ b/service/apigateway/api_op_GetDeployments.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDeployments(ctx context.Context, params *GetDeploymentsInput addawsRestjson1_serdeOpGetDeploymentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetDocumentationPart.go b/service/apigateway/api_op_GetDocumentationPart.go index cafa65c6d73..1addbfb223a 100644 --- a/service/apigateway/api_op_GetDocumentationPart.go +++ b/service/apigateway/api_op_GetDocumentationPart.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -22,9 +21,9 @@ func (c *Client) GetDocumentationPart(ctx context.Context, params *GetDocumentat addawsRestjson1_serdeOpGetDocumentationPartMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetDocumentationParts.go b/service/apigateway/api_op_GetDocumentationParts.go index 9de2e3a1160..d1009537f0a 100644 --- a/service/apigateway/api_op_GetDocumentationParts.go +++ b/service/apigateway/api_op_GetDocumentationParts.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -22,9 +21,9 @@ func (c *Client) GetDocumentationParts(ctx context.Context, params *GetDocumenta addawsRestjson1_serdeOpGetDocumentationPartsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetDocumentationVersion.go b/service/apigateway/api_op_GetDocumentationVersion.go index 1c2df8805cf..fa00b6fecad 100644 --- a/service/apigateway/api_op_GetDocumentationVersion.go +++ b/service/apigateway/api_op_GetDocumentationVersion.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetDocumentationVersion(ctx context.Context, params *GetDocumen addawsRestjson1_serdeOpGetDocumentationVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetDocumentationVersions.go b/service/apigateway/api_op_GetDocumentationVersions.go index f3496dc45e1..93e6d48aadc 100644 --- a/service/apigateway/api_op_GetDocumentationVersions.go +++ b/service/apigateway/api_op_GetDocumentationVersions.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -22,9 +21,9 @@ func (c *Client) GetDocumentationVersions(ctx context.Context, params *GetDocume addawsRestjson1_serdeOpGetDocumentationVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetDomainName.go b/service/apigateway/api_op_GetDomainName.go index 497d797cb41..d2cbce22480 100644 --- a/service/apigateway/api_op_GetDomainName.go +++ b/service/apigateway/api_op_GetDomainName.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetDomainName(ctx context.Context, params *GetDomainNameInput, addawsRestjson1_serdeOpGetDomainNameMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetDomainNames.go b/service/apigateway/api_op_GetDomainNames.go index 181d01afa6a..bab91f2e59e 100644 --- a/service/apigateway/api_op_GetDomainNames.go +++ b/service/apigateway/api_op_GetDomainNames.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDomainNames(ctx context.Context, params *GetDomainNamesInput addawsRestjson1_serdeOpGetDomainNamesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetExport.go b/service/apigateway/api_op_GetExport.go index e95be01767d..fcef2d8428d 100644 --- a/service/apigateway/api_op_GetExport.go +++ b/service/apigateway/api_op_GetExport.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetExport(ctx context.Context, params *GetExportInput, optFns . addawsRestjson1_serdeOpGetExportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetGatewayResponse.go b/service/apigateway/api_op_GetGatewayResponse.go index 6ca1b9b5d62..418da133d54 100644 --- a/service/apigateway/api_op_GetGatewayResponse.go +++ b/service/apigateway/api_op_GetGatewayResponse.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetGatewayResponse(ctx context.Context, params *GetGatewayRespo addawsRestjson1_serdeOpGetGatewayResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetGatewayResponses.go b/service/apigateway/api_op_GetGatewayResponses.go index 940c248136a..c6565fd53fa 100644 --- a/service/apigateway/api_op_GetGatewayResponses.go +++ b/service/apigateway/api_op_GetGatewayResponses.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetGatewayResponses(ctx context.Context, params *GetGatewayResp addawsRestjson1_serdeOpGetGatewayResponsesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetIntegration.go b/service/apigateway/api_op_GetIntegration.go index a7ec4674982..583fc069f02 100644 --- a/service/apigateway/api_op_GetIntegration.go +++ b/service/apigateway/api_op_GetIntegration.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetIntegration(ctx context.Context, params *GetIntegrationInput addawsRestjson1_serdeOpGetIntegrationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetIntegrationResponse.go b/service/apigateway/api_op_GetIntegrationResponse.go index d52ae3cbf37..5f1220931c1 100644 --- a/service/apigateway/api_op_GetIntegrationResponse.go +++ b/service/apigateway/api_op_GetIntegrationResponse.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetIntegrationResponse(ctx context.Context, params *GetIntegrat addawsRestjson1_serdeOpGetIntegrationResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetMethod.go b/service/apigateway/api_op_GetMethod.go index 9a2cc9716ea..6ada50d29e5 100644 --- a/service/apigateway/api_op_GetMethod.go +++ b/service/apigateway/api_op_GetMethod.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetMethod(ctx context.Context, params *GetMethodInput, optFns . addawsRestjson1_serdeOpGetMethodMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetMethodResponse.go b/service/apigateway/api_op_GetMethodResponse.go index d879a419ccb..4087ad114d4 100644 --- a/service/apigateway/api_op_GetMethodResponse.go +++ b/service/apigateway/api_op_GetMethodResponse.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetMethodResponse(ctx context.Context, params *GetMethodRespons addawsRestjson1_serdeOpGetMethodResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetModel.go b/service/apigateway/api_op_GetModel.go index b799df80cbb..95c2289d59e 100644 --- a/service/apigateway/api_op_GetModel.go +++ b/service/apigateway/api_op_GetModel.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetModel(ctx context.Context, params *GetModelInput, optFns ... addawsRestjson1_serdeOpGetModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetModelTemplate.go b/service/apigateway/api_op_GetModelTemplate.go index 26d303958f7..f51037134ba 100644 --- a/service/apigateway/api_op_GetModelTemplate.go +++ b/service/apigateway/api_op_GetModelTemplate.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetModelTemplate(ctx context.Context, params *GetModelTemplateI addawsRestjson1_serdeOpGetModelTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetModels.go b/service/apigateway/api_op_GetModels.go index 88960b0f4bd..84719bf86f0 100644 --- a/service/apigateway/api_op_GetModels.go +++ b/service/apigateway/api_op_GetModels.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetModels(ctx context.Context, params *GetModelsInput, optFns . addawsRestjson1_serdeOpGetModelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetRequestValidator.go b/service/apigateway/api_op_GetRequestValidator.go index 161811c43b7..5a39f156e93 100644 --- a/service/apigateway/api_op_GetRequestValidator.go +++ b/service/apigateway/api_op_GetRequestValidator.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetRequestValidator(ctx context.Context, params *GetRequestVali addawsRestjson1_serdeOpGetRequestValidatorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetRequestValidators.go b/service/apigateway/api_op_GetRequestValidators.go index 2966269db8d..e87fac109d3 100644 --- a/service/apigateway/api_op_GetRequestValidators.go +++ b/service/apigateway/api_op_GetRequestValidators.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetRequestValidators(ctx context.Context, params *GetRequestVal addawsRestjson1_serdeOpGetRequestValidatorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetResource.go b/service/apigateway/api_op_GetResource.go index a42478423b4..42fe0b5cd8d 100644 --- a/service/apigateway/api_op_GetResource.go +++ b/service/apigateway/api_op_GetResource.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetResource(ctx context.Context, params *GetResourceInput, optF addawsRestjson1_serdeOpGetResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetResources.go b/service/apigateway/api_op_GetResources.go index 393c534831e..97aa2cb7b7c 100644 --- a/service/apigateway/api_op_GetResources.go +++ b/service/apigateway/api_op_GetResources.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetResources(ctx context.Context, params *GetResourcesInput, op addawsRestjson1_serdeOpGetResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetRestApi.go b/service/apigateway/api_op_GetRestApi.go index 2718a33a847..db86946211c 100644 --- a/service/apigateway/api_op_GetRestApi.go +++ b/service/apigateway/api_op_GetRestApi.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetRestApi(ctx context.Context, params *GetRestApiInput, optFns addawsRestjson1_serdeOpGetRestApiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetRestApis.go b/service/apigateway/api_op_GetRestApis.go index 3199cc72aa4..43cc1db06e3 100644 --- a/service/apigateway/api_op_GetRestApis.go +++ b/service/apigateway/api_op_GetRestApis.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetRestApis(ctx context.Context, params *GetRestApisInput, optF addawsRestjson1_serdeOpGetRestApisMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetSdk.go b/service/apigateway/api_op_GetSdk.go index 16ef16c29e4..75d9568db1f 100644 --- a/service/apigateway/api_op_GetSdk.go +++ b/service/apigateway/api_op_GetSdk.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetSdk(ctx context.Context, params *GetSdkInput, optFns ...func addawsRestjson1_serdeOpGetSdkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetSdkType.go b/service/apigateway/api_op_GetSdkType.go index 4e998a3720c..04c2425811c 100644 --- a/service/apigateway/api_op_GetSdkType.go +++ b/service/apigateway/api_op_GetSdkType.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -22,9 +21,9 @@ func (c *Client) GetSdkType(ctx context.Context, params *GetSdkTypeInput, optFns addawsRestjson1_serdeOpGetSdkTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetSdkTypes.go b/service/apigateway/api_op_GetSdkTypes.go index 6c5dfca2fa1..92008fb71d2 100644 --- a/service/apigateway/api_op_GetSdkTypes.go +++ b/service/apigateway/api_op_GetSdkTypes.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -22,9 +21,9 @@ func (c *Client) GetSdkTypes(ctx context.Context, params *GetSdkTypesInput, optF addawsRestjson1_serdeOpGetSdkTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetStage.go b/service/apigateway/api_op_GetStage.go index c13cafb015b..3673a41f19b 100644 --- a/service/apigateway/api_op_GetStage.go +++ b/service/apigateway/api_op_GetStage.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetStage(ctx context.Context, params *GetStageInput, optFns ... addawsRestjson1_serdeOpGetStageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetStages.go b/service/apigateway/api_op_GetStages.go index 54ec46c129e..1c3b107a3f9 100644 --- a/service/apigateway/api_op_GetStages.go +++ b/service/apigateway/api_op_GetStages.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetStages(ctx context.Context, params *GetStagesInput, optFns . addawsRestjson1_serdeOpGetStagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetTags.go b/service/apigateway/api_op_GetTags.go index b4e3da06f1b..af26ac02d37 100644 --- a/service/apigateway/api_op_GetTags.go +++ b/service/apigateway/api_op_GetTags.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetTags(ctx context.Context, params *GetTagsInput, optFns ...fu addawsRestjson1_serdeOpGetTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetUsage.go b/service/apigateway/api_op_GetUsage.go index 9a18cc57581..e15b6c3b335 100644 --- a/service/apigateway/api_op_GetUsage.go +++ b/service/apigateway/api_op_GetUsage.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetUsage(ctx context.Context, params *GetUsageInput, optFns ... addawsRestjson1_serdeOpGetUsageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetUsagePlan.go b/service/apigateway/api_op_GetUsagePlan.go index 33951d72f4a..b8dbc3fd9c0 100644 --- a/service/apigateway/api_op_GetUsagePlan.go +++ b/service/apigateway/api_op_GetUsagePlan.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetUsagePlan(ctx context.Context, params *GetUsagePlanInput, op addawsRestjson1_serdeOpGetUsagePlanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetUsagePlanKey.go b/service/apigateway/api_op_GetUsagePlanKey.go index a434f758cb2..0bad82f4276 100644 --- a/service/apigateway/api_op_GetUsagePlanKey.go +++ b/service/apigateway/api_op_GetUsagePlanKey.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetUsagePlanKey(ctx context.Context, params *GetUsagePlanKeyInp addawsRestjson1_serdeOpGetUsagePlanKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetUsagePlanKeys.go b/service/apigateway/api_op_GetUsagePlanKeys.go index ba50a87ce22..3129b240aaf 100644 --- a/service/apigateway/api_op_GetUsagePlanKeys.go +++ b/service/apigateway/api_op_GetUsagePlanKeys.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetUsagePlanKeys(ctx context.Context, params *GetUsagePlanKeysI addawsRestjson1_serdeOpGetUsagePlanKeysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetUsagePlans.go b/service/apigateway/api_op_GetUsagePlans.go index db6f3bec49d..d0179fe48f9 100644 --- a/service/apigateway/api_op_GetUsagePlans.go +++ b/service/apigateway/api_op_GetUsagePlans.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetUsagePlans(ctx context.Context, params *GetUsagePlansInput, addawsRestjson1_serdeOpGetUsagePlansMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetVpcLink.go b/service/apigateway/api_op_GetVpcLink.go index 93cf015cb24..e218be6690b 100644 --- a/service/apigateway/api_op_GetVpcLink.go +++ b/service/apigateway/api_op_GetVpcLink.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetVpcLink(ctx context.Context, params *GetVpcLinkInput, optFns addawsRestjson1_serdeOpGetVpcLinkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_GetVpcLinks.go b/service/apigateway/api_op_GetVpcLinks.go index 9e1dc54ef52..1b1ee4ad59e 100644 --- a/service/apigateway/api_op_GetVpcLinks.go +++ b/service/apigateway/api_op_GetVpcLinks.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetVpcLinks(ctx context.Context, params *GetVpcLinksInput, optF addawsRestjson1_serdeOpGetVpcLinksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_ImportApiKeys.go b/service/apigateway/api_op_ImportApiKeys.go index f6229dc4b53..01fb9bb4e6d 100644 --- a/service/apigateway/api_op_ImportApiKeys.go +++ b/service/apigateway/api_op_ImportApiKeys.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ImportApiKeys(ctx context.Context, params *ImportApiKeysInput, addawsRestjson1_serdeOpImportApiKeysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_ImportDocumentationParts.go b/service/apigateway/api_op_ImportDocumentationParts.go index 41e40565747..8922b200054 100644 --- a/service/apigateway/api_op_ImportDocumentationParts.go +++ b/service/apigateway/api_op_ImportDocumentationParts.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -22,9 +21,9 @@ func (c *Client) ImportDocumentationParts(ctx context.Context, params *ImportDoc addawsRestjson1_serdeOpImportDocumentationPartsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_ImportRestApi.go b/service/apigateway/api_op_ImportRestApi.go index 1b8a8c3e22c..76d4ad4249f 100644 --- a/service/apigateway/api_op_ImportRestApi.go +++ b/service/apigateway/api_op_ImportRestApi.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ImportRestApi(ctx context.Context, params *ImportRestApiInput, addawsRestjson1_serdeOpImportRestApiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_PutGatewayResponse.go b/service/apigateway/api_op_PutGatewayResponse.go index ced5162b038..f7bae60b595 100644 --- a/service/apigateway/api_op_PutGatewayResponse.go +++ b/service/apigateway/api_op_PutGatewayResponse.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutGatewayResponse(ctx context.Context, params *PutGatewayRespo addawsRestjson1_serdeOpPutGatewayResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_PutIntegration.go b/service/apigateway/api_op_PutIntegration.go index b1c1b4e0cb8..5d7b73c16e1 100644 --- a/service/apigateway/api_op_PutIntegration.go +++ b/service/apigateway/api_op_PutIntegration.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutIntegration(ctx context.Context, params *PutIntegrationInput addawsRestjson1_serdeOpPutIntegrationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_PutIntegrationResponse.go b/service/apigateway/api_op_PutIntegrationResponse.go index f73082f21e6..e374c1dd728 100644 --- a/service/apigateway/api_op_PutIntegrationResponse.go +++ b/service/apigateway/api_op_PutIntegrationResponse.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutIntegrationResponse(ctx context.Context, params *PutIntegrat addawsRestjson1_serdeOpPutIntegrationResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_PutMethod.go b/service/apigateway/api_op_PutMethod.go index f6a97a7a023..8e10a854884 100644 --- a/service/apigateway/api_op_PutMethod.go +++ b/service/apigateway/api_op_PutMethod.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutMethod(ctx context.Context, params *PutMethodInput, optFns . addawsRestjson1_serdeOpPutMethodMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_PutMethodResponse.go b/service/apigateway/api_op_PutMethodResponse.go index 15fe7ba1664..920739840ff 100644 --- a/service/apigateway/api_op_PutMethodResponse.go +++ b/service/apigateway/api_op_PutMethodResponse.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) PutMethodResponse(ctx context.Context, params *PutMethodRespons addawsRestjson1_serdeOpPutMethodResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_PutRestApi.go b/service/apigateway/api_op_PutRestApi.go index a925741b5e6..24a6986208c 100644 --- a/service/apigateway/api_op_PutRestApi.go +++ b/service/apigateway/api_op_PutRestApi.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) PutRestApi(ctx context.Context, params *PutRestApiInput, optFns addawsRestjson1_serdeOpPutRestApiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_TagResource.go b/service/apigateway/api_op_TagResource.go index 928eaeb0a74..2424d352981 100644 --- a/service/apigateway/api_op_TagResource.go +++ b/service/apigateway/api_op_TagResource.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_TestInvokeAuthorizer.go b/service/apigateway/api_op_TestInvokeAuthorizer.go index afe8ad595b8..44807bd253e 100644 --- a/service/apigateway/api_op_TestInvokeAuthorizer.go +++ b/service/apigateway/api_op_TestInvokeAuthorizer.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) TestInvokeAuthorizer(ctx context.Context, params *TestInvokeAut addawsRestjson1_serdeOpTestInvokeAuthorizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_TestInvokeMethod.go b/service/apigateway/api_op_TestInvokeMethod.go index c80c20021c5..0c436afb7bb 100644 --- a/service/apigateway/api_op_TestInvokeMethod.go +++ b/service/apigateway/api_op_TestInvokeMethod.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) TestInvokeMethod(ctx context.Context, params *TestInvokeMethodI addawsRestjson1_serdeOpTestInvokeMethodMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UntagResource.go b/service/apigateway/api_op_UntagResource.go index 98d2dfe0015..ecaa3ca2da4 100644 --- a/service/apigateway/api_op_UntagResource.go +++ b/service/apigateway/api_op_UntagResource.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateAccount.go b/service/apigateway/api_op_UpdateAccount.go index 8c965f90bf8..2d3268e72f0 100644 --- a/service/apigateway/api_op_UpdateAccount.go +++ b/service/apigateway/api_op_UpdateAccount.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateAccount(ctx context.Context, params *UpdateAccountInput, addawsRestjson1_serdeOpUpdateAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateApiKey.go b/service/apigateway/api_op_UpdateApiKey.go index c5948177917..583e2d0c9ba 100644 --- a/service/apigateway/api_op_UpdateApiKey.go +++ b/service/apigateway/api_op_UpdateApiKey.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateApiKey(ctx context.Context, params *UpdateApiKeyInput, op addawsRestjson1_serdeOpUpdateApiKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateAuthorizer.go b/service/apigateway/api_op_UpdateAuthorizer.go index ca3aff5f918..47dad3bdfef 100644 --- a/service/apigateway/api_op_UpdateAuthorizer.go +++ b/service/apigateway/api_op_UpdateAuthorizer.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateAuthorizer(ctx context.Context, params *UpdateAuthorizerI addawsRestjson1_serdeOpUpdateAuthorizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateBasePathMapping.go b/service/apigateway/api_op_UpdateBasePathMapping.go index 5e2a4a64f6f..918bc796c4a 100644 --- a/service/apigateway/api_op_UpdateBasePathMapping.go +++ b/service/apigateway/api_op_UpdateBasePathMapping.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateBasePathMapping(ctx context.Context, params *UpdateBasePa addawsRestjson1_serdeOpUpdateBasePathMappingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateClientCertificate.go b/service/apigateway/api_op_UpdateClientCertificate.go index eeeb14a62f6..e240579f4ac 100644 --- a/service/apigateway/api_op_UpdateClientCertificate.go +++ b/service/apigateway/api_op_UpdateClientCertificate.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateClientCertificate(ctx context.Context, params *UpdateClie addawsRestjson1_serdeOpUpdateClientCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateDeployment.go b/service/apigateway/api_op_UpdateDeployment.go index 94b78dfc6e8..0b0f410051f 100644 --- a/service/apigateway/api_op_UpdateDeployment.go +++ b/service/apigateway/api_op_UpdateDeployment.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateDeployment(ctx context.Context, params *UpdateDeploymentI addawsRestjson1_serdeOpUpdateDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateDocumentationPart.go b/service/apigateway/api_op_UpdateDocumentationPart.go index c6d2e946535..6dfa2b3992d 100644 --- a/service/apigateway/api_op_UpdateDocumentationPart.go +++ b/service/apigateway/api_op_UpdateDocumentationPart.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -22,9 +21,9 @@ func (c *Client) UpdateDocumentationPart(ctx context.Context, params *UpdateDocu addawsRestjson1_serdeOpUpdateDocumentationPartMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateDocumentationVersion.go b/service/apigateway/api_op_UpdateDocumentationVersion.go index 2a2a611a6e0..f748f28fd2a 100644 --- a/service/apigateway/api_op_UpdateDocumentationVersion.go +++ b/service/apigateway/api_op_UpdateDocumentationVersion.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDocumentationVersion(ctx context.Context, params *UpdateD addawsRestjson1_serdeOpUpdateDocumentationVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateDomainName.go b/service/apigateway/api_op_UpdateDomainName.go index 48d3711df38..3a23b3e384b 100644 --- a/service/apigateway/api_op_UpdateDomainName.go +++ b/service/apigateway/api_op_UpdateDomainName.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateDomainName(ctx context.Context, params *UpdateDomainNameI addawsRestjson1_serdeOpUpdateDomainNameMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateGatewayResponse.go b/service/apigateway/api_op_UpdateGatewayResponse.go index a927bb520c0..7b0d5468043 100644 --- a/service/apigateway/api_op_UpdateGatewayResponse.go +++ b/service/apigateway/api_op_UpdateGatewayResponse.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateGatewayResponse(ctx context.Context, params *UpdateGatewa addawsRestjson1_serdeOpUpdateGatewayResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateIntegration.go b/service/apigateway/api_op_UpdateIntegration.go index b06d2f425f0..22498d9d4c1 100644 --- a/service/apigateway/api_op_UpdateIntegration.go +++ b/service/apigateway/api_op_UpdateIntegration.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateIntegration(ctx context.Context, params *UpdateIntegratio addawsRestjson1_serdeOpUpdateIntegrationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateIntegrationResponse.go b/service/apigateway/api_op_UpdateIntegrationResponse.go index f03af9d45b4..7895e1f7d87 100644 --- a/service/apigateway/api_op_UpdateIntegrationResponse.go +++ b/service/apigateway/api_op_UpdateIntegrationResponse.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateIntegrationResponse(ctx context.Context, params *UpdateIn addawsRestjson1_serdeOpUpdateIntegrationResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateMethod.go b/service/apigateway/api_op_UpdateMethod.go index 6f7ef5d407b..9b2b818a09a 100644 --- a/service/apigateway/api_op_UpdateMethod.go +++ b/service/apigateway/api_op_UpdateMethod.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateMethod(ctx context.Context, params *UpdateMethodInput, op addawsRestjson1_serdeOpUpdateMethodMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateMethodResponse.go b/service/apigateway/api_op_UpdateMethodResponse.go index 941eb207d87..3a4bcf0e688 100644 --- a/service/apigateway/api_op_UpdateMethodResponse.go +++ b/service/apigateway/api_op_UpdateMethodResponse.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateMethodResponse(ctx context.Context, params *UpdateMethodR addawsRestjson1_serdeOpUpdateMethodResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateModel.go b/service/apigateway/api_op_UpdateModel.go index 520aac8868d..7e251323907 100644 --- a/service/apigateway/api_op_UpdateModel.go +++ b/service/apigateway/api_op_UpdateModel.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateModel(ctx context.Context, params *UpdateModelInput, optF addawsRestjson1_serdeOpUpdateModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateRequestValidator.go b/service/apigateway/api_op_UpdateRequestValidator.go index ef3da708865..a26681479b1 100644 --- a/service/apigateway/api_op_UpdateRequestValidator.go +++ b/service/apigateway/api_op_UpdateRequestValidator.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateRequestValidator(ctx context.Context, params *UpdateReque addawsRestjson1_serdeOpUpdateRequestValidatorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateResource.go b/service/apigateway/api_op_UpdateResource.go index e79e42db731..42b97806391 100644 --- a/service/apigateway/api_op_UpdateResource.go +++ b/service/apigateway/api_op_UpdateResource.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateResource(ctx context.Context, params *UpdateResourceInput addawsRestjson1_serdeOpUpdateResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateRestApi.go b/service/apigateway/api_op_UpdateRestApi.go index d166665e382..99d9bb2422e 100644 --- a/service/apigateway/api_op_UpdateRestApi.go +++ b/service/apigateway/api_op_UpdateRestApi.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateRestApi(ctx context.Context, params *UpdateRestApiInput, addawsRestjson1_serdeOpUpdateRestApiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateStage.go b/service/apigateway/api_op_UpdateStage.go index 4eae2d45f68..a81a2a11d15 100644 --- a/service/apigateway/api_op_UpdateStage.go +++ b/service/apigateway/api_op_UpdateStage.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateStage(ctx context.Context, params *UpdateStageInput, optF addawsRestjson1_serdeOpUpdateStageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateUsage.go b/service/apigateway/api_op_UpdateUsage.go index c3580a80ce7..0486d4922f8 100644 --- a/service/apigateway/api_op_UpdateUsage.go +++ b/service/apigateway/api_op_UpdateUsage.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateUsage(ctx context.Context, params *UpdateUsageInput, optF addawsRestjson1_serdeOpUpdateUsageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateUsagePlan.go b/service/apigateway/api_op_UpdateUsagePlan.go index fc24b67ffd4..62221e88f91 100644 --- a/service/apigateway/api_op_UpdateUsagePlan.go +++ b/service/apigateway/api_op_UpdateUsagePlan.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateUsagePlan(ctx context.Context, params *UpdateUsagePlanInp addawsRestjson1_serdeOpUpdateUsagePlanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/api_op_UpdateVpcLink.go b/service/apigateway/api_op_UpdateVpcLink.go index 5027fd2b68b..9f6f14091f1 100644 --- a/service/apigateway/api_op_UpdateVpcLink.go +++ b/service/apigateway/api_op_UpdateVpcLink.go @@ -5,7 +5,6 @@ package apigateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateVpcLink(ctx context.Context, params *UpdateVpcLinkInput, addawsRestjson1_serdeOpUpdateVpcLinkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigateway/endpoints.go b/service/apigateway/endpoints.go index a60f76d32fa..16b7cacdc16 100644 --- a/service/apigateway/endpoints.go +++ b/service/apigateway/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/apigatewaymanagementapi/api_client.go b/service/apigatewaymanagementapi/api_client.go index 3b3c9db4cb4..56459b04f83 100644 --- a/service/apigatewaymanagementapi/api_client.go +++ b/service/apigatewaymanagementapi/api_client.go @@ -82,30 +82,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -171,6 +147,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/apigatewaymanagementapi/api_op_DeleteConnection.go b/service/apigatewaymanagementapi/api_op_DeleteConnection.go index 5782df62bc4..5691a471518 100644 --- a/service/apigatewaymanagementapi/api_op_DeleteConnection.go +++ b/service/apigatewaymanagementapi/api_op_DeleteConnection.go @@ -5,7 +5,6 @@ package apigatewaymanagementapi import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteConnection(ctx context.Context, params *DeleteConnectionI addawsRestjson1_serdeOpDeleteConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewaymanagementapi/api_op_GetConnection.go b/service/apigatewaymanagementapi/api_op_GetConnection.go index c19b9e3cf6b..40cc79d4228 100644 --- a/service/apigatewaymanagementapi/api_op_GetConnection.go +++ b/service/apigatewaymanagementapi/api_op_GetConnection.go @@ -5,7 +5,6 @@ package apigatewaymanagementapi import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewaymanagementapi/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetConnection(ctx context.Context, params *GetConnectionInput, addawsRestjson1_serdeOpGetConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewaymanagementapi/api_op_PostToConnection.go b/service/apigatewaymanagementapi/api_op_PostToConnection.go index 6e220808815..a10d77b23a4 100644 --- a/service/apigatewaymanagementapi/api_op_PostToConnection.go +++ b/service/apigatewaymanagementapi/api_op_PostToConnection.go @@ -5,7 +5,6 @@ package apigatewaymanagementapi import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) PostToConnection(ctx context.Context, params *PostToConnectionI addawsRestjson1_serdeOpPostToConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewaymanagementapi/endpoints.go b/service/apigatewaymanagementapi/endpoints.go index 6bf3019ea02..417686ea13d 100644 --- a/service/apigatewaymanagementapi/endpoints.go +++ b/service/apigatewaymanagementapi/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/apigatewayv2/api_client.go b/service/apigatewayv2/api_client.go index a75d4b9ab9b..4e9c574165d 100644 --- a/service/apigatewayv2/api_client.go +++ b/service/apigatewayv2/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/apigatewayv2/api_op_CreateApi.go b/service/apigatewayv2/api_op_CreateApi.go index 992e4960971..3f9af31e3c2 100644 --- a/service/apigatewayv2/api_op_CreateApi.go +++ b/service/apigatewayv2/api_op_CreateApi.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateApi(ctx context.Context, params *CreateApiInput, optFns . addawsRestjson1_serdeOpCreateApiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_CreateApiMapping.go b/service/apigatewayv2/api_op_CreateApiMapping.go index 523109f08a3..5a399becfd1 100644 --- a/service/apigatewayv2/api_op_CreateApiMapping.go +++ b/service/apigatewayv2/api_op_CreateApiMapping.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateApiMapping(ctx context.Context, params *CreateApiMappingI addawsRestjson1_serdeOpCreateApiMappingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_CreateAuthorizer.go b/service/apigatewayv2/api_op_CreateAuthorizer.go index f8d82fbdbb9..10109734364 100644 --- a/service/apigatewayv2/api_op_CreateAuthorizer.go +++ b/service/apigatewayv2/api_op_CreateAuthorizer.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateAuthorizer(ctx context.Context, params *CreateAuthorizerI addawsRestjson1_serdeOpCreateAuthorizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_CreateDeployment.go b/service/apigatewayv2/api_op_CreateDeployment.go index 363f847c200..47707935cd7 100644 --- a/service/apigatewayv2/api_op_CreateDeployment.go +++ b/service/apigatewayv2/api_op_CreateDeployment.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateDeployment(ctx context.Context, params *CreateDeploymentI addawsRestjson1_serdeOpCreateDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_CreateDomainName.go b/service/apigatewayv2/api_op_CreateDomainName.go index e4143d541cb..ea2b661dfa8 100644 --- a/service/apigatewayv2/api_op_CreateDomainName.go +++ b/service/apigatewayv2/api_op_CreateDomainName.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDomainName(ctx context.Context, params *CreateDomainNameI addawsRestjson1_serdeOpCreateDomainNameMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_CreateIntegration.go b/service/apigatewayv2/api_op_CreateIntegration.go index e760d083bd7..67fd26321fb 100644 --- a/service/apigatewayv2/api_op_CreateIntegration.go +++ b/service/apigatewayv2/api_op_CreateIntegration.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateIntegration(ctx context.Context, params *CreateIntegratio addawsRestjson1_serdeOpCreateIntegrationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_CreateIntegrationResponse.go b/service/apigatewayv2/api_op_CreateIntegrationResponse.go index 2178de92500..4bb8c1709d0 100644 --- a/service/apigatewayv2/api_op_CreateIntegrationResponse.go +++ b/service/apigatewayv2/api_op_CreateIntegrationResponse.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateIntegrationResponse(ctx context.Context, params *CreateIn addawsRestjson1_serdeOpCreateIntegrationResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_CreateModel.go b/service/apigatewayv2/api_op_CreateModel.go index 61074fc7a8d..320cbd2ef09 100644 --- a/service/apigatewayv2/api_op_CreateModel.go +++ b/service/apigatewayv2/api_op_CreateModel.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateModel(ctx context.Context, params *CreateModelInput, optF addawsRestjson1_serdeOpCreateModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_CreateRoute.go b/service/apigatewayv2/api_op_CreateRoute.go index 44f925fc5d9..23ea6c7abb0 100644 --- a/service/apigatewayv2/api_op_CreateRoute.go +++ b/service/apigatewayv2/api_op_CreateRoute.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateRoute(ctx context.Context, params *CreateRouteInput, optF addawsRestjson1_serdeOpCreateRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_CreateRouteResponse.go b/service/apigatewayv2/api_op_CreateRouteResponse.go index b07fb0e23e3..ef521a51205 100644 --- a/service/apigatewayv2/api_op_CreateRouteResponse.go +++ b/service/apigatewayv2/api_op_CreateRouteResponse.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateRouteResponse(ctx context.Context, params *CreateRouteRes addawsRestjson1_serdeOpCreateRouteResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_CreateStage.go b/service/apigatewayv2/api_op_CreateStage.go index 24b1ccb0b5e..27f623aedec 100644 --- a/service/apigatewayv2/api_op_CreateStage.go +++ b/service/apigatewayv2/api_op_CreateStage.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateStage(ctx context.Context, params *CreateStageInput, optF addawsRestjson1_serdeOpCreateStageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_CreateVpcLink.go b/service/apigatewayv2/api_op_CreateVpcLink.go index 9f05c56ec4d..1db88872158 100644 --- a/service/apigatewayv2/api_op_CreateVpcLink.go +++ b/service/apigatewayv2/api_op_CreateVpcLink.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateVpcLink(ctx context.Context, params *CreateVpcLinkInput, addawsRestjson1_serdeOpCreateVpcLinkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_DeleteAccessLogSettings.go b/service/apigatewayv2/api_op_DeleteAccessLogSettings.go index 23c1724e950..2a904bc70b8 100644 --- a/service/apigatewayv2/api_op_DeleteAccessLogSettings.go +++ b/service/apigatewayv2/api_op_DeleteAccessLogSettings.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteAccessLogSettings(ctx context.Context, params *DeleteAcce addawsRestjson1_serdeOpDeleteAccessLogSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_DeleteApi.go b/service/apigatewayv2/api_op_DeleteApi.go index f6f4005879d..0f67b3658fb 100644 --- a/service/apigatewayv2/api_op_DeleteApi.go +++ b/service/apigatewayv2/api_op_DeleteApi.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteApi(ctx context.Context, params *DeleteApiInput, optFns . addawsRestjson1_serdeOpDeleteApiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_DeleteApiMapping.go b/service/apigatewayv2/api_op_DeleteApiMapping.go index 2d84c20a303..3edf8cd3a00 100644 --- a/service/apigatewayv2/api_op_DeleteApiMapping.go +++ b/service/apigatewayv2/api_op_DeleteApiMapping.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteApiMapping(ctx context.Context, params *DeleteApiMappingI addawsRestjson1_serdeOpDeleteApiMappingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_DeleteAuthorizer.go b/service/apigatewayv2/api_op_DeleteAuthorizer.go index 2b9d67093f8..9607f94ea28 100644 --- a/service/apigatewayv2/api_op_DeleteAuthorizer.go +++ b/service/apigatewayv2/api_op_DeleteAuthorizer.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteAuthorizer(ctx context.Context, params *DeleteAuthorizerI addawsRestjson1_serdeOpDeleteAuthorizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_DeleteCorsConfiguration.go b/service/apigatewayv2/api_op_DeleteCorsConfiguration.go index d1e41b1e007..6f2b17572ad 100644 --- a/service/apigatewayv2/api_op_DeleteCorsConfiguration.go +++ b/service/apigatewayv2/api_op_DeleteCorsConfiguration.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteCorsConfiguration(ctx context.Context, params *DeleteCors addawsRestjson1_serdeOpDeleteCorsConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_DeleteDeployment.go b/service/apigatewayv2/api_op_DeleteDeployment.go index e88a959f447..a17e9d05e00 100644 --- a/service/apigatewayv2/api_op_DeleteDeployment.go +++ b/service/apigatewayv2/api_op_DeleteDeployment.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDeployment(ctx context.Context, params *DeleteDeploymentI addawsRestjson1_serdeOpDeleteDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_DeleteDomainName.go b/service/apigatewayv2/api_op_DeleteDomainName.go index 95c840009ed..7b73e924cd0 100644 --- a/service/apigatewayv2/api_op_DeleteDomainName.go +++ b/service/apigatewayv2/api_op_DeleteDomainName.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDomainName(ctx context.Context, params *DeleteDomainNameI addawsRestjson1_serdeOpDeleteDomainNameMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_DeleteIntegration.go b/service/apigatewayv2/api_op_DeleteIntegration.go index 8081d2ff3eb..3e2cc603e67 100644 --- a/service/apigatewayv2/api_op_DeleteIntegration.go +++ b/service/apigatewayv2/api_op_DeleteIntegration.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteIntegration(ctx context.Context, params *DeleteIntegratio addawsRestjson1_serdeOpDeleteIntegrationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_DeleteIntegrationResponse.go b/service/apigatewayv2/api_op_DeleteIntegrationResponse.go index 35657b20a90..efd051f939c 100644 --- a/service/apigatewayv2/api_op_DeleteIntegrationResponse.go +++ b/service/apigatewayv2/api_op_DeleteIntegrationResponse.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteIntegrationResponse(ctx context.Context, params *DeleteIn addawsRestjson1_serdeOpDeleteIntegrationResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_DeleteModel.go b/service/apigatewayv2/api_op_DeleteModel.go index 9ef9cb27de7..fde4562ddb1 100644 --- a/service/apigatewayv2/api_op_DeleteModel.go +++ b/service/apigatewayv2/api_op_DeleteModel.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteModel(ctx context.Context, params *DeleteModelInput, optF addawsRestjson1_serdeOpDeleteModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_DeleteRoute.go b/service/apigatewayv2/api_op_DeleteRoute.go index d3fff5e3644..1aa7d34dbe4 100644 --- a/service/apigatewayv2/api_op_DeleteRoute.go +++ b/service/apigatewayv2/api_op_DeleteRoute.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRoute(ctx context.Context, params *DeleteRouteInput, optF addawsRestjson1_serdeOpDeleteRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_DeleteRouteRequestParameter.go b/service/apigatewayv2/api_op_DeleteRouteRequestParameter.go index 1ad06d0eddc..e695276f6bf 100644 --- a/service/apigatewayv2/api_op_DeleteRouteRequestParameter.go +++ b/service/apigatewayv2/api_op_DeleteRouteRequestParameter.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRouteRequestParameter(ctx context.Context, params *Delete addawsRestjson1_serdeOpDeleteRouteRequestParameterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_DeleteRouteResponse.go b/service/apigatewayv2/api_op_DeleteRouteResponse.go index 94143fd2c22..56c3ea2bbf5 100644 --- a/service/apigatewayv2/api_op_DeleteRouteResponse.go +++ b/service/apigatewayv2/api_op_DeleteRouteResponse.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRouteResponse(ctx context.Context, params *DeleteRouteRes addawsRestjson1_serdeOpDeleteRouteResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_DeleteRouteSettings.go b/service/apigatewayv2/api_op_DeleteRouteSettings.go index 21058fca43e..92e4401a189 100644 --- a/service/apigatewayv2/api_op_DeleteRouteSettings.go +++ b/service/apigatewayv2/api_op_DeleteRouteSettings.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRouteSettings(ctx context.Context, params *DeleteRouteSet addawsRestjson1_serdeOpDeleteRouteSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_DeleteStage.go b/service/apigatewayv2/api_op_DeleteStage.go index 7b5ac20a024..eb4ad489b43 100644 --- a/service/apigatewayv2/api_op_DeleteStage.go +++ b/service/apigatewayv2/api_op_DeleteStage.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteStage(ctx context.Context, params *DeleteStageInput, optF addawsRestjson1_serdeOpDeleteStageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_DeleteVpcLink.go b/service/apigatewayv2/api_op_DeleteVpcLink.go index f1de7d24fd1..fbaab7342bb 100644 --- a/service/apigatewayv2/api_op_DeleteVpcLink.go +++ b/service/apigatewayv2/api_op_DeleteVpcLink.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteVpcLink(ctx context.Context, params *DeleteVpcLinkInput, addawsRestjson1_serdeOpDeleteVpcLinkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_ExportApi.go b/service/apigatewayv2/api_op_ExportApi.go index 78de1ef0a5f..faa2a17f0cc 100644 --- a/service/apigatewayv2/api_op_ExportApi.go +++ b/service/apigatewayv2/api_op_ExportApi.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -21,9 +20,9 @@ func (c *Client) ExportApi(ctx context.Context, params *ExportApiInput, optFns . addawsRestjson1_serdeOpExportApiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetApi.go b/service/apigatewayv2/api_op_GetApi.go index 4b628e039cf..f2e03b11704 100644 --- a/service/apigatewayv2/api_op_GetApi.go +++ b/service/apigatewayv2/api_op_GetApi.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetApi(ctx context.Context, params *GetApiInput, optFns ...func addawsRestjson1_serdeOpGetApiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetApiMapping.go b/service/apigatewayv2/api_op_GetApiMapping.go index 6f6419ff955..ad962eed83f 100644 --- a/service/apigatewayv2/api_op_GetApiMapping.go +++ b/service/apigatewayv2/api_op_GetApiMapping.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetApiMapping(ctx context.Context, params *GetApiMappingInput, addawsRestjson1_serdeOpGetApiMappingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetApiMappings.go b/service/apigatewayv2/api_op_GetApiMappings.go index 38fd8bda437..508e97363be 100644 --- a/service/apigatewayv2/api_op_GetApiMappings.go +++ b/service/apigatewayv2/api_op_GetApiMappings.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetApiMappings(ctx context.Context, params *GetApiMappingsInput addawsRestjson1_serdeOpGetApiMappingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetApis.go b/service/apigatewayv2/api_op_GetApis.go index 3d1e0a97d61..867ecb3897d 100644 --- a/service/apigatewayv2/api_op_GetApis.go +++ b/service/apigatewayv2/api_op_GetApis.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetApis(ctx context.Context, params *GetApisInput, optFns ...fu addawsRestjson1_serdeOpGetApisMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetAuthorizer.go b/service/apigatewayv2/api_op_GetAuthorizer.go index 4a4d49beca7..001f22eec50 100644 --- a/service/apigatewayv2/api_op_GetAuthorizer.go +++ b/service/apigatewayv2/api_op_GetAuthorizer.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetAuthorizer(ctx context.Context, params *GetAuthorizerInput, addawsRestjson1_serdeOpGetAuthorizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetAuthorizers.go b/service/apigatewayv2/api_op_GetAuthorizers.go index de21aebad37..677d22c9886 100644 --- a/service/apigatewayv2/api_op_GetAuthorizers.go +++ b/service/apigatewayv2/api_op_GetAuthorizers.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetAuthorizers(ctx context.Context, params *GetAuthorizersInput addawsRestjson1_serdeOpGetAuthorizersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetDeployment.go b/service/apigatewayv2/api_op_GetDeployment.go index 4dd300e18f6..28e4f7aeff9 100644 --- a/service/apigatewayv2/api_op_GetDeployment.go +++ b/service/apigatewayv2/api_op_GetDeployment.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetDeployment(ctx context.Context, params *GetDeploymentInput, addawsRestjson1_serdeOpGetDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetDeployments.go b/service/apigatewayv2/api_op_GetDeployments.go index f356695be56..9cf2a27f932 100644 --- a/service/apigatewayv2/api_op_GetDeployments.go +++ b/service/apigatewayv2/api_op_GetDeployments.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDeployments(ctx context.Context, params *GetDeploymentsInput addawsRestjson1_serdeOpGetDeploymentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetDomainName.go b/service/apigatewayv2/api_op_GetDomainName.go index 4099a18fad2..82661d0fd68 100644 --- a/service/apigatewayv2/api_op_GetDomainName.go +++ b/service/apigatewayv2/api_op_GetDomainName.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDomainName(ctx context.Context, params *GetDomainNameInput, addawsRestjson1_serdeOpGetDomainNameMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetDomainNames.go b/service/apigatewayv2/api_op_GetDomainNames.go index 2a93a360694..c040c72ac92 100644 --- a/service/apigatewayv2/api_op_GetDomainNames.go +++ b/service/apigatewayv2/api_op_GetDomainNames.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDomainNames(ctx context.Context, params *GetDomainNamesInput addawsRestjson1_serdeOpGetDomainNamesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetIntegration.go b/service/apigatewayv2/api_op_GetIntegration.go index 82389d05b96..13e0fe289b2 100644 --- a/service/apigatewayv2/api_op_GetIntegration.go +++ b/service/apigatewayv2/api_op_GetIntegration.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetIntegration(ctx context.Context, params *GetIntegrationInput addawsRestjson1_serdeOpGetIntegrationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetIntegrationResponse.go b/service/apigatewayv2/api_op_GetIntegrationResponse.go index 0d1e10b1e0a..e37a917491e 100644 --- a/service/apigatewayv2/api_op_GetIntegrationResponse.go +++ b/service/apigatewayv2/api_op_GetIntegrationResponse.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetIntegrationResponse(ctx context.Context, params *GetIntegrat addawsRestjson1_serdeOpGetIntegrationResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetIntegrationResponses.go b/service/apigatewayv2/api_op_GetIntegrationResponses.go index 547b86c8685..d86868e91c9 100644 --- a/service/apigatewayv2/api_op_GetIntegrationResponses.go +++ b/service/apigatewayv2/api_op_GetIntegrationResponses.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetIntegrationResponses(ctx context.Context, params *GetIntegra addawsRestjson1_serdeOpGetIntegrationResponsesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetIntegrations.go b/service/apigatewayv2/api_op_GetIntegrations.go index af3764868de..12359d2e4a1 100644 --- a/service/apigatewayv2/api_op_GetIntegrations.go +++ b/service/apigatewayv2/api_op_GetIntegrations.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetIntegrations(ctx context.Context, params *GetIntegrationsInp addawsRestjson1_serdeOpGetIntegrationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetModel.go b/service/apigatewayv2/api_op_GetModel.go index 47d8379234e..59b76ab9557 100644 --- a/service/apigatewayv2/api_op_GetModel.go +++ b/service/apigatewayv2/api_op_GetModel.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetModel(ctx context.Context, params *GetModelInput, optFns ... addawsRestjson1_serdeOpGetModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetModelTemplate.go b/service/apigatewayv2/api_op_GetModelTemplate.go index 7b03f636d3e..897a1b6086a 100644 --- a/service/apigatewayv2/api_op_GetModelTemplate.go +++ b/service/apigatewayv2/api_op_GetModelTemplate.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetModelTemplate(ctx context.Context, params *GetModelTemplateI addawsRestjson1_serdeOpGetModelTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetModels.go b/service/apigatewayv2/api_op_GetModels.go index f8ebdba8e83..b46b81ca6c3 100644 --- a/service/apigatewayv2/api_op_GetModels.go +++ b/service/apigatewayv2/api_op_GetModels.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetModels(ctx context.Context, params *GetModelsInput, optFns . addawsRestjson1_serdeOpGetModelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetRoute.go b/service/apigatewayv2/api_op_GetRoute.go index a3bcaaf4c77..cfaaa86c6f5 100644 --- a/service/apigatewayv2/api_op_GetRoute.go +++ b/service/apigatewayv2/api_op_GetRoute.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetRoute(ctx context.Context, params *GetRouteInput, optFns ... addawsRestjson1_serdeOpGetRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetRouteResponse.go b/service/apigatewayv2/api_op_GetRouteResponse.go index 09d88179754..3bc02736594 100644 --- a/service/apigatewayv2/api_op_GetRouteResponse.go +++ b/service/apigatewayv2/api_op_GetRouteResponse.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetRouteResponse(ctx context.Context, params *GetRouteResponseI addawsRestjson1_serdeOpGetRouteResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetRouteResponses.go b/service/apigatewayv2/api_op_GetRouteResponses.go index 874731945fc..8fd7843d12e 100644 --- a/service/apigatewayv2/api_op_GetRouteResponses.go +++ b/service/apigatewayv2/api_op_GetRouteResponses.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetRouteResponses(ctx context.Context, params *GetRouteResponse addawsRestjson1_serdeOpGetRouteResponsesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetRoutes.go b/service/apigatewayv2/api_op_GetRoutes.go index a54592498ef..862325dd3fa 100644 --- a/service/apigatewayv2/api_op_GetRoutes.go +++ b/service/apigatewayv2/api_op_GetRoutes.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetRoutes(ctx context.Context, params *GetRoutesInput, optFns . addawsRestjson1_serdeOpGetRoutesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetStage.go b/service/apigatewayv2/api_op_GetStage.go index a2f8e48dd6c..e1941d0617e 100644 --- a/service/apigatewayv2/api_op_GetStage.go +++ b/service/apigatewayv2/api_op_GetStage.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetStage(ctx context.Context, params *GetStageInput, optFns ... addawsRestjson1_serdeOpGetStageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetStages.go b/service/apigatewayv2/api_op_GetStages.go index 320bd2ad4fc..a92fc1120ec 100644 --- a/service/apigatewayv2/api_op_GetStages.go +++ b/service/apigatewayv2/api_op_GetStages.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetStages(ctx context.Context, params *GetStagesInput, optFns . addawsRestjson1_serdeOpGetStagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetTags.go b/service/apigatewayv2/api_op_GetTags.go index d36bf955b23..51bcdc9313d 100644 --- a/service/apigatewayv2/api_op_GetTags.go +++ b/service/apigatewayv2/api_op_GetTags.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetTags(ctx context.Context, params *GetTagsInput, optFns ...fu addawsRestjson1_serdeOpGetTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetVpcLink.go b/service/apigatewayv2/api_op_GetVpcLink.go index 4569b7377b3..a7bcc8089c5 100644 --- a/service/apigatewayv2/api_op_GetVpcLink.go +++ b/service/apigatewayv2/api_op_GetVpcLink.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetVpcLink(ctx context.Context, params *GetVpcLinkInput, optFns addawsRestjson1_serdeOpGetVpcLinkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_GetVpcLinks.go b/service/apigatewayv2/api_op_GetVpcLinks.go index b026b3637b2..41328fe9973 100644 --- a/service/apigatewayv2/api_op_GetVpcLinks.go +++ b/service/apigatewayv2/api_op_GetVpcLinks.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetVpcLinks(ctx context.Context, params *GetVpcLinksInput, optF addawsRestjson1_serdeOpGetVpcLinksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_ImportApi.go b/service/apigatewayv2/api_op_ImportApi.go index 8618fac88b4..bd6db9373c0 100644 --- a/service/apigatewayv2/api_op_ImportApi.go +++ b/service/apigatewayv2/api_op_ImportApi.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ImportApi(ctx context.Context, params *ImportApiInput, optFns . addawsRestjson1_serdeOpImportApiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_ReimportApi.go b/service/apigatewayv2/api_op_ReimportApi.go index 1ef4a808f3a..24ae7fcf327 100644 --- a/service/apigatewayv2/api_op_ReimportApi.go +++ b/service/apigatewayv2/api_op_ReimportApi.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ReimportApi(ctx context.Context, params *ReimportApiInput, optF addawsRestjson1_serdeOpReimportApiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_TagResource.go b/service/apigatewayv2/api_op_TagResource.go index 1c57db4ed51..acf831ca5da 100644 --- a/service/apigatewayv2/api_op_TagResource.go +++ b/service/apigatewayv2/api_op_TagResource.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_UntagResource.go b/service/apigatewayv2/api_op_UntagResource.go index 94e75f64059..0d82022c6cf 100644 --- a/service/apigatewayv2/api_op_UntagResource.go +++ b/service/apigatewayv2/api_op_UntagResource.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_UpdateApi.go b/service/apigatewayv2/api_op_UpdateApi.go index 1f2ec79b5ce..87a7c6c627d 100644 --- a/service/apigatewayv2/api_op_UpdateApi.go +++ b/service/apigatewayv2/api_op_UpdateApi.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateApi(ctx context.Context, params *UpdateApiInput, optFns . addawsRestjson1_serdeOpUpdateApiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_UpdateApiMapping.go b/service/apigatewayv2/api_op_UpdateApiMapping.go index 26f78ea72e0..88964c92e4f 100644 --- a/service/apigatewayv2/api_op_UpdateApiMapping.go +++ b/service/apigatewayv2/api_op_UpdateApiMapping.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateApiMapping(ctx context.Context, params *UpdateApiMappingI addawsRestjson1_serdeOpUpdateApiMappingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_UpdateAuthorizer.go b/service/apigatewayv2/api_op_UpdateAuthorizer.go index 6eaa82b14af..2007a8cf886 100644 --- a/service/apigatewayv2/api_op_UpdateAuthorizer.go +++ b/service/apigatewayv2/api_op_UpdateAuthorizer.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateAuthorizer(ctx context.Context, params *UpdateAuthorizerI addawsRestjson1_serdeOpUpdateAuthorizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_UpdateDeployment.go b/service/apigatewayv2/api_op_UpdateDeployment.go index 1ba6b8fcd30..89ea58da50e 100644 --- a/service/apigatewayv2/api_op_UpdateDeployment.go +++ b/service/apigatewayv2/api_op_UpdateDeployment.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateDeployment(ctx context.Context, params *UpdateDeploymentI addawsRestjson1_serdeOpUpdateDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_UpdateDomainName.go b/service/apigatewayv2/api_op_UpdateDomainName.go index 20869251073..16c326fc90c 100644 --- a/service/apigatewayv2/api_op_UpdateDomainName.go +++ b/service/apigatewayv2/api_op_UpdateDomainName.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDomainName(ctx context.Context, params *UpdateDomainNameI addawsRestjson1_serdeOpUpdateDomainNameMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_UpdateIntegration.go b/service/apigatewayv2/api_op_UpdateIntegration.go index f466be13d9e..5285ef1eba7 100644 --- a/service/apigatewayv2/api_op_UpdateIntegration.go +++ b/service/apigatewayv2/api_op_UpdateIntegration.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateIntegration(ctx context.Context, params *UpdateIntegratio addawsRestjson1_serdeOpUpdateIntegrationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_UpdateIntegrationResponse.go b/service/apigatewayv2/api_op_UpdateIntegrationResponse.go index eb14d462191..7f978665bac 100644 --- a/service/apigatewayv2/api_op_UpdateIntegrationResponse.go +++ b/service/apigatewayv2/api_op_UpdateIntegrationResponse.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateIntegrationResponse(ctx context.Context, params *UpdateIn addawsRestjson1_serdeOpUpdateIntegrationResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_UpdateModel.go b/service/apigatewayv2/api_op_UpdateModel.go index c440b670b65..b675d81539c 100644 --- a/service/apigatewayv2/api_op_UpdateModel.go +++ b/service/apigatewayv2/api_op_UpdateModel.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateModel(ctx context.Context, params *UpdateModelInput, optF addawsRestjson1_serdeOpUpdateModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_UpdateRoute.go b/service/apigatewayv2/api_op_UpdateRoute.go index bc5beb3a658..81d4642a490 100644 --- a/service/apigatewayv2/api_op_UpdateRoute.go +++ b/service/apigatewayv2/api_op_UpdateRoute.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateRoute(ctx context.Context, params *UpdateRouteInput, optF addawsRestjson1_serdeOpUpdateRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_UpdateRouteResponse.go b/service/apigatewayv2/api_op_UpdateRouteResponse.go index 5edbfd89167..5538df0e4f3 100644 --- a/service/apigatewayv2/api_op_UpdateRouteResponse.go +++ b/service/apigatewayv2/api_op_UpdateRouteResponse.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateRouteResponse(ctx context.Context, params *UpdateRouteRes addawsRestjson1_serdeOpUpdateRouteResponseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_UpdateStage.go b/service/apigatewayv2/api_op_UpdateStage.go index 3e91374aa09..49708876238 100644 --- a/service/apigatewayv2/api_op_UpdateStage.go +++ b/service/apigatewayv2/api_op_UpdateStage.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateStage(ctx context.Context, params *UpdateStageInput, optF addawsRestjson1_serdeOpUpdateStageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/api_op_UpdateVpcLink.go b/service/apigatewayv2/api_op_UpdateVpcLink.go index 0bccd2d22fe..fbbb2ea98ed 100644 --- a/service/apigatewayv2/api_op_UpdateVpcLink.go +++ b/service/apigatewayv2/api_op_UpdateVpcLink.go @@ -5,7 +5,6 @@ package apigatewayv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateVpcLink(ctx context.Context, params *UpdateVpcLinkInput, addawsRestjson1_serdeOpUpdateVpcLinkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/apigatewayv2/endpoints.go b/service/apigatewayv2/endpoints.go index 136574e29be..179db17bd1d 100644 --- a/service/apigatewayv2/endpoints.go +++ b/service/apigatewayv2/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/appconfig/api_client.go b/service/appconfig/api_client.go index d5e574860ea..431d068687e 100644 --- a/service/appconfig/api_client.go +++ b/service/appconfig/api_client.go @@ -106,30 +106,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -195,6 +171,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/appconfig/api_op_CreateApplication.go b/service/appconfig/api_op_CreateApplication.go index f7c596861ad..1b02847e14e 100644 --- a/service/appconfig/api_op_CreateApplication.go +++ b/service/appconfig/api_op_CreateApplication.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) CreateApplication(ctx context.Context, params *CreateApplicatio addawsRestjson1_serdeOpCreateApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_CreateConfigurationProfile.go b/service/appconfig/api_op_CreateConfigurationProfile.go index 8d75facd863..b747e2a8183 100644 --- a/service/appconfig/api_op_CreateConfigurationProfile.go +++ b/service/appconfig/api_op_CreateConfigurationProfile.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appconfig/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) CreateConfigurationProfile(ctx context.Context, params *CreateC addawsRestjson1_serdeOpCreateConfigurationProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_CreateDeploymentStrategy.go b/service/appconfig/api_op_CreateDeploymentStrategy.go index 8cd60b4b6b6..f8c8db0dac6 100644 --- a/service/appconfig/api_op_CreateDeploymentStrategy.go +++ b/service/appconfig/api_op_CreateDeploymentStrategy.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appconfig/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateDeploymentStrategy(ctx context.Context, params *CreateDep addawsRestjson1_serdeOpCreateDeploymentStrategyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_CreateEnvironment.go b/service/appconfig/api_op_CreateEnvironment.go index 38abe8be454..c65317837d6 100644 --- a/service/appconfig/api_op_CreateEnvironment.go +++ b/service/appconfig/api_op_CreateEnvironment.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appconfig/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateEnvironment(ctx context.Context, params *CreateEnvironmen addawsRestjson1_serdeOpCreateEnvironmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_CreateHostedConfigurationVersion.go b/service/appconfig/api_op_CreateHostedConfigurationVersion.go index d8fc92c5bb4..ca97c0fb491 100644 --- a/service/appconfig/api_op_CreateHostedConfigurationVersion.go +++ b/service/appconfig/api_op_CreateHostedConfigurationVersion.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateHostedConfigurationVersion(ctx context.Context, params *C addawsRestjson1_serdeOpCreateHostedConfigurationVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_DeleteApplication.go b/service/appconfig/api_op_DeleteApplication.go index 5d3ab6ca064..c4fd564fdaa 100644 --- a/service/appconfig/api_op_DeleteApplication.go +++ b/service/appconfig/api_op_DeleteApplication.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteApplication(ctx context.Context, params *DeleteApplicatio addawsRestjson1_serdeOpDeleteApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_DeleteConfigurationProfile.go b/service/appconfig/api_op_DeleteConfigurationProfile.go index 42891b45ccd..a458909353e 100644 --- a/service/appconfig/api_op_DeleteConfigurationProfile.go +++ b/service/appconfig/api_op_DeleteConfigurationProfile.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteConfigurationProfile(ctx context.Context, params *DeleteC addawsRestjson1_serdeOpDeleteConfigurationProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_DeleteDeploymentStrategy.go b/service/appconfig/api_op_DeleteDeploymentStrategy.go index 0607e14e9ab..78f3b620b8b 100644 --- a/service/appconfig/api_op_DeleteDeploymentStrategy.go +++ b/service/appconfig/api_op_DeleteDeploymentStrategy.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDeploymentStrategy(ctx context.Context, params *DeleteDep addawsRestjson1_serdeOpDeleteDeploymentStrategyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_DeleteEnvironment.go b/service/appconfig/api_op_DeleteEnvironment.go index 9c86f2b3cdd..6848d979d68 100644 --- a/service/appconfig/api_op_DeleteEnvironment.go +++ b/service/appconfig/api_op_DeleteEnvironment.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteEnvironment(ctx context.Context, params *DeleteEnvironmen addawsRestjson1_serdeOpDeleteEnvironmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_DeleteHostedConfigurationVersion.go b/service/appconfig/api_op_DeleteHostedConfigurationVersion.go index 270ab49213d..dfb73d1adf9 100644 --- a/service/appconfig/api_op_DeleteHostedConfigurationVersion.go +++ b/service/appconfig/api_op_DeleteHostedConfigurationVersion.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteHostedConfigurationVersion(ctx context.Context, params *D addawsRestjson1_serdeOpDeleteHostedConfigurationVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_GetApplication.go b/service/appconfig/api_op_GetApplication.go index d9ff0b83100..0413c6f7270 100644 --- a/service/appconfig/api_op_GetApplication.go +++ b/service/appconfig/api_op_GetApplication.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetApplication(ctx context.Context, params *GetApplicationInput addawsRestjson1_serdeOpGetApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_GetConfiguration.go b/service/appconfig/api_op_GetConfiguration.go index c1c612c3d8f..256c4acb241 100644 --- a/service/appconfig/api_op_GetConfiguration.go +++ b/service/appconfig/api_op_GetConfiguration.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) GetConfiguration(ctx context.Context, params *GetConfigurationI addawsRestjson1_serdeOpGetConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_GetConfigurationProfile.go b/service/appconfig/api_op_GetConfigurationProfile.go index 0783a539561..703a0eddbd7 100644 --- a/service/appconfig/api_op_GetConfigurationProfile.go +++ b/service/appconfig/api_op_GetConfigurationProfile.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appconfig/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetConfigurationProfile(ctx context.Context, params *GetConfigu addawsRestjson1_serdeOpGetConfigurationProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_GetDeployment.go b/service/appconfig/api_op_GetDeployment.go index d10e94c8ab9..a0b8728f68a 100644 --- a/service/appconfig/api_op_GetDeployment.go +++ b/service/appconfig/api_op_GetDeployment.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appconfig/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetDeployment(ctx context.Context, params *GetDeploymentInput, addawsRestjson1_serdeOpGetDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_GetDeploymentStrategy.go b/service/appconfig/api_op_GetDeploymentStrategy.go index 2e1c903f6fe..b93730c4a93 100644 --- a/service/appconfig/api_op_GetDeploymentStrategy.go +++ b/service/appconfig/api_op_GetDeploymentStrategy.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appconfig/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetDeploymentStrategy(ctx context.Context, params *GetDeploymen addawsRestjson1_serdeOpGetDeploymentStrategyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_GetEnvironment.go b/service/appconfig/api_op_GetEnvironment.go index 1349fd72ab6..906c433c14e 100644 --- a/service/appconfig/api_op_GetEnvironment.go +++ b/service/appconfig/api_op_GetEnvironment.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appconfig/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetEnvironment(ctx context.Context, params *GetEnvironmentInput addawsRestjson1_serdeOpGetEnvironmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_GetHostedConfigurationVersion.go b/service/appconfig/api_op_GetHostedConfigurationVersion.go index f9e987a8984..b0da0e272ef 100644 --- a/service/appconfig/api_op_GetHostedConfigurationVersion.go +++ b/service/appconfig/api_op_GetHostedConfigurationVersion.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetHostedConfigurationVersion(ctx context.Context, params *GetH addawsRestjson1_serdeOpGetHostedConfigurationVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_ListApplications.go b/service/appconfig/api_op_ListApplications.go index c039816934e..8098314d006 100644 --- a/service/appconfig/api_op_ListApplications.go +++ b/service/appconfig/api_op_ListApplications.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appconfig/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListApplications(ctx context.Context, params *ListApplicationsI addawsRestjson1_serdeOpListApplicationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_ListConfigurationProfiles.go b/service/appconfig/api_op_ListConfigurationProfiles.go index 69c6684a159..5122b896bb6 100644 --- a/service/appconfig/api_op_ListConfigurationProfiles.go +++ b/service/appconfig/api_op_ListConfigurationProfiles.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appconfig/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListConfigurationProfiles(ctx context.Context, params *ListConf addawsRestjson1_serdeOpListConfigurationProfilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_ListDeploymentStrategies.go b/service/appconfig/api_op_ListDeploymentStrategies.go index 2eeeca653b6..7d493fe9031 100644 --- a/service/appconfig/api_op_ListDeploymentStrategies.go +++ b/service/appconfig/api_op_ListDeploymentStrategies.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appconfig/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDeploymentStrategies(ctx context.Context, params *ListDeplo addawsRestjson1_serdeOpListDeploymentStrategiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_ListDeployments.go b/service/appconfig/api_op_ListDeployments.go index edfc779d283..ee7f9d1ca5f 100644 --- a/service/appconfig/api_op_ListDeployments.go +++ b/service/appconfig/api_op_ListDeployments.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appconfig/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDeployments(ctx context.Context, params *ListDeploymentsInp addawsRestjson1_serdeOpListDeploymentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_ListEnvironments.go b/service/appconfig/api_op_ListEnvironments.go index be8f6ab54e8..2e1cb34e09a 100644 --- a/service/appconfig/api_op_ListEnvironments.go +++ b/service/appconfig/api_op_ListEnvironments.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appconfig/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListEnvironments(ctx context.Context, params *ListEnvironmentsI addawsRestjson1_serdeOpListEnvironmentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_ListHostedConfigurationVersions.go b/service/appconfig/api_op_ListHostedConfigurationVersions.go index 8730f430d21..6c0741d0d5d 100644 --- a/service/appconfig/api_op_ListHostedConfigurationVersions.go +++ b/service/appconfig/api_op_ListHostedConfigurationVersions.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appconfig/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListHostedConfigurationVersions(ctx context.Context, params *Li addawsRestjson1_serdeOpListHostedConfigurationVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_ListTagsForResource.go b/service/appconfig/api_op_ListTagsForResource.go index 6967a71d88f..9c81c5bab2f 100644 --- a/service/appconfig/api_op_ListTagsForResource.go +++ b/service/appconfig/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_StartDeployment.go b/service/appconfig/api_op_StartDeployment.go index 4b5bd2c7589..e856fd37672 100644 --- a/service/appconfig/api_op_StartDeployment.go +++ b/service/appconfig/api_op_StartDeployment.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appconfig/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) StartDeployment(ctx context.Context, params *StartDeploymentInp addawsRestjson1_serdeOpStartDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_StopDeployment.go b/service/appconfig/api_op_StopDeployment.go index 5ec666c295b..984ad425028 100644 --- a/service/appconfig/api_op_StopDeployment.go +++ b/service/appconfig/api_op_StopDeployment.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appconfig/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) StopDeployment(ctx context.Context, params *StopDeploymentInput addawsRestjson1_serdeOpStopDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_TagResource.go b/service/appconfig/api_op_TagResource.go index 4deeb49c309..c771acc7edb 100644 --- a/service/appconfig/api_op_TagResource.go +++ b/service/appconfig/api_op_TagResource.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_UntagResource.go b/service/appconfig/api_op_UntagResource.go index bd8edd55fd5..f2cdf831c06 100644 --- a/service/appconfig/api_op_UntagResource.go +++ b/service/appconfig/api_op_UntagResource.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_UpdateApplication.go b/service/appconfig/api_op_UpdateApplication.go index 19bea25f394..d9fb2afeb44 100644 --- a/service/appconfig/api_op_UpdateApplication.go +++ b/service/appconfig/api_op_UpdateApplication.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateApplication(ctx context.Context, params *UpdateApplicatio addawsRestjson1_serdeOpUpdateApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_UpdateConfigurationProfile.go b/service/appconfig/api_op_UpdateConfigurationProfile.go index 7f901b818c4..ae1435b5964 100644 --- a/service/appconfig/api_op_UpdateConfigurationProfile.go +++ b/service/appconfig/api_op_UpdateConfigurationProfile.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appconfig/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateConfigurationProfile(ctx context.Context, params *UpdateC addawsRestjson1_serdeOpUpdateConfigurationProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_UpdateDeploymentStrategy.go b/service/appconfig/api_op_UpdateDeploymentStrategy.go index 7dcb98a8212..e8959d7e3a5 100644 --- a/service/appconfig/api_op_UpdateDeploymentStrategy.go +++ b/service/appconfig/api_op_UpdateDeploymentStrategy.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appconfig/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDeploymentStrategy(ctx context.Context, params *UpdateDep addawsRestjson1_serdeOpUpdateDeploymentStrategyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_UpdateEnvironment.go b/service/appconfig/api_op_UpdateEnvironment.go index 5c17d3caa83..1db15433566 100644 --- a/service/appconfig/api_op_UpdateEnvironment.go +++ b/service/appconfig/api_op_UpdateEnvironment.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appconfig/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateEnvironment(ctx context.Context, params *UpdateEnvironmen addawsRestjson1_serdeOpUpdateEnvironmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/api_op_ValidateConfiguration.go b/service/appconfig/api_op_ValidateConfiguration.go index 96a1a664593..a80ec13fc2a 100644 --- a/service/appconfig/api_op_ValidateConfiguration.go +++ b/service/appconfig/api_op_ValidateConfiguration.go @@ -5,7 +5,6 @@ package appconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ValidateConfiguration(ctx context.Context, params *ValidateConf addawsRestjson1_serdeOpValidateConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appconfig/endpoints.go b/service/appconfig/endpoints.go index 2f006acb19d..6ace9f630c9 100644 --- a/service/appconfig/endpoints.go +++ b/service/appconfig/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/applicationautoscaling/api_client.go b/service/applicationautoscaling/api_client.go index ce0a2a5b1ec..c80429e63c3 100644 --- a/service/applicationautoscaling/api_client.go +++ b/service/applicationautoscaling/api_client.go @@ -134,30 +134,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -223,6 +199,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/applicationautoscaling/api_op_DeleteScalingPolicy.go b/service/applicationautoscaling/api_op_DeleteScalingPolicy.go index 89e9131cd50..76fd5f2ef43 100644 --- a/service/applicationautoscaling/api_op_DeleteScalingPolicy.go +++ b/service/applicationautoscaling/api_op_DeleteScalingPolicy.go @@ -5,7 +5,6 @@ package applicationautoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DeleteScalingPolicy(ctx context.Context, params *DeleteScalingP addawsAwsjson11_serdeOpDeleteScalingPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationautoscaling/api_op_DeleteScheduledAction.go b/service/applicationautoscaling/api_op_DeleteScheduledAction.go index d867ab4c85f..572601399e7 100644 --- a/service/applicationautoscaling/api_op_DeleteScheduledAction.go +++ b/service/applicationautoscaling/api_op_DeleteScheduledAction.go @@ -5,7 +5,6 @@ package applicationautoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteScheduledAction(ctx context.Context, params *DeleteSchedu addawsAwsjson11_serdeOpDeleteScheduledActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationautoscaling/api_op_DeregisterScalableTarget.go b/service/applicationautoscaling/api_op_DeregisterScalableTarget.go index 7664e4e7fb6..422434a49a4 100644 --- a/service/applicationautoscaling/api_op_DeregisterScalableTarget.go +++ b/service/applicationautoscaling/api_op_DeregisterScalableTarget.go @@ -5,7 +5,6 @@ package applicationautoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DeregisterScalableTarget(ctx context.Context, params *Deregiste addawsAwsjson11_serdeOpDeregisterScalableTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationautoscaling/api_op_DescribeScalableTargets.go b/service/applicationautoscaling/api_op_DescribeScalableTargets.go index c7be3d2c270..7ec164cf9b8 100644 --- a/service/applicationautoscaling/api_op_DescribeScalableTargets.go +++ b/service/applicationautoscaling/api_op_DescribeScalableTargets.go @@ -5,7 +5,6 @@ package applicationautoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeScalableTargets(ctx context.Context, params *DescribeSc addawsAwsjson11_serdeOpDescribeScalableTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationautoscaling/api_op_DescribeScalingActivities.go b/service/applicationautoscaling/api_op_DescribeScalingActivities.go index bf15bd01437..02c0138d65e 100644 --- a/service/applicationautoscaling/api_op_DescribeScalingActivities.go +++ b/service/applicationautoscaling/api_op_DescribeScalingActivities.go @@ -5,7 +5,6 @@ package applicationautoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeScalingActivities(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeScalingActivitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationautoscaling/api_op_DescribeScalingPolicies.go b/service/applicationautoscaling/api_op_DescribeScalingPolicies.go index 743271d506a..c5f4e25f6b0 100644 --- a/service/applicationautoscaling/api_op_DescribeScalingPolicies.go +++ b/service/applicationautoscaling/api_op_DescribeScalingPolicies.go @@ -5,7 +5,6 @@ package applicationautoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DescribeScalingPolicies(ctx context.Context, params *DescribeSc addawsAwsjson11_serdeOpDescribeScalingPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationautoscaling/api_op_DescribeScheduledActions.go b/service/applicationautoscaling/api_op_DescribeScheduledActions.go index df6aa88aa5d..fd23ba9c6d1 100644 --- a/service/applicationautoscaling/api_op_DescribeScheduledActions.go +++ b/service/applicationautoscaling/api_op_DescribeScheduledActions.go @@ -5,7 +5,6 @@ package applicationautoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeScheduledActions(ctx context.Context, params *DescribeS addawsAwsjson11_serdeOpDescribeScheduledActionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationautoscaling/api_op_PutScalingPolicy.go b/service/applicationautoscaling/api_op_PutScalingPolicy.go index 1a94fdff57c..829603504c2 100644 --- a/service/applicationautoscaling/api_op_PutScalingPolicy.go +++ b/service/applicationautoscaling/api_op_PutScalingPolicy.go @@ -5,7 +5,6 @@ package applicationautoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -50,9 +49,9 @@ func (c *Client) PutScalingPolicy(ctx context.Context, params *PutScalingPolicyI addawsAwsjson11_serdeOpPutScalingPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationautoscaling/api_op_PutScheduledAction.go b/service/applicationautoscaling/api_op_PutScheduledAction.go index feab4b653be..0c857e5e7ee 100644 --- a/service/applicationautoscaling/api_op_PutScheduledAction.go +++ b/service/applicationautoscaling/api_op_PutScheduledAction.go @@ -5,7 +5,6 @@ package applicationautoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) PutScheduledAction(ctx context.Context, params *PutScheduledAct addawsAwsjson11_serdeOpPutScheduledActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationautoscaling/api_op_RegisterScalableTarget.go b/service/applicationautoscaling/api_op_RegisterScalableTarget.go index cc9abb011ec..c70f945cb4e 100644 --- a/service/applicationautoscaling/api_op_RegisterScalableTarget.go +++ b/service/applicationautoscaling/api_op_RegisterScalableTarget.go @@ -5,7 +5,6 @@ package applicationautoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) RegisterScalableTarget(ctx context.Context, params *RegisterSca addawsAwsjson11_serdeOpRegisterScalableTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationautoscaling/endpoints.go b/service/applicationautoscaling/endpoints.go index 3d4118e9cfa..8f2cc0f2d14 100644 --- a/service/applicationautoscaling/endpoints.go +++ b/service/applicationautoscaling/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/applicationdiscoveryservice/api_client.go b/service/applicationdiscoveryservice/api_client.go index 94161cea00a..831082bce39 100644 --- a/service/applicationdiscoveryservice/api_client.go +++ b/service/applicationdiscoveryservice/api_client.go @@ -142,34 +142,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -242,6 +214,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/applicationdiscoveryservice/api_op_AssociateConfigurationItemsToApplication.go b/service/applicationdiscoveryservice/api_op_AssociateConfigurationItemsToApplication.go index 63f460b87e4..2c844149413 100644 --- a/service/applicationdiscoveryservice/api_op_AssociateConfigurationItemsToApplication.go +++ b/service/applicationdiscoveryservice/api_op_AssociateConfigurationItemsToApplication.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AssociateConfigurationItemsToApplication(ctx context.Context, p addawsAwsjson11_serdeOpAssociateConfigurationItemsToApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_BatchDeleteImportData.go b/service/applicationdiscoveryservice/api_op_BatchDeleteImportData.go index 5e53dc0daec..3a0a7c571dd 100644 --- a/service/applicationdiscoveryservice/api_op_BatchDeleteImportData.go +++ b/service/applicationdiscoveryservice/api_op_BatchDeleteImportData.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) BatchDeleteImportData(ctx context.Context, params *BatchDeleteI addawsAwsjson11_serdeOpBatchDeleteImportDataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_CreateApplication.go b/service/applicationdiscoveryservice/api_op_CreateApplication.go index 8a50c221053..076cb1f32b1 100644 --- a/service/applicationdiscoveryservice/api_op_CreateApplication.go +++ b/service/applicationdiscoveryservice/api_op_CreateApplication.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateApplication(ctx context.Context, params *CreateApplicatio addawsAwsjson11_serdeOpCreateApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_CreateTags.go b/service/applicationdiscoveryservice/api_op_CreateTags.go index 0b395c4ee4d..c9d32451b7b 100644 --- a/service/applicationdiscoveryservice/api_op_CreateTags.go +++ b/service/applicationdiscoveryservice/api_op_CreateTags.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateTags(ctx context.Context, params *CreateTagsInput, optFns addawsAwsjson11_serdeOpCreateTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_DeleteApplications.go b/service/applicationdiscoveryservice/api_op_DeleteApplications.go index 5cb52feeca9..a90c35478e1 100644 --- a/service/applicationdiscoveryservice/api_op_DeleteApplications.go +++ b/service/applicationdiscoveryservice/api_op_DeleteApplications.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteApplications(ctx context.Context, params *DeleteApplicati addawsAwsjson11_serdeOpDeleteApplicationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_DeleteTags.go b/service/applicationdiscoveryservice/api_op_DeleteTags.go index ef674824165..011da8ff295 100644 --- a/service/applicationdiscoveryservice/api_op_DeleteTags.go +++ b/service/applicationdiscoveryservice/api_op_DeleteTags.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteTags(ctx context.Context, params *DeleteTagsInput, optFns addawsAwsjson11_serdeOpDeleteTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_DescribeAgents.go b/service/applicationdiscoveryservice/api_op_DescribeAgents.go index 306f4ead813..a888d43a698 100644 --- a/service/applicationdiscoveryservice/api_op_DescribeAgents.go +++ b/service/applicationdiscoveryservice/api_op_DescribeAgents.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeAgents(ctx context.Context, params *DescribeAgentsInput addawsAwsjson11_serdeOpDescribeAgentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_DescribeConfigurations.go b/service/applicationdiscoveryservice/api_op_DescribeConfigurations.go index 963bfa27f70..f10c2f67436 100644 --- a/service/applicationdiscoveryservice/api_op_DescribeConfigurations.go +++ b/service/applicationdiscoveryservice/api_op_DescribeConfigurations.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) DescribeConfigurations(ctx context.Context, params *DescribeCon addawsAwsjson11_serdeOpDescribeConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_DescribeContinuousExports.go b/service/applicationdiscoveryservice/api_op_DescribeContinuousExports.go index 61c744c2a83..706f0710478 100644 --- a/service/applicationdiscoveryservice/api_op_DescribeContinuousExports.go +++ b/service/applicationdiscoveryservice/api_op_DescribeContinuousExports.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeContinuousExports(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeContinuousExportsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_DescribeExportConfigurations.go b/service/applicationdiscoveryservice/api_op_DescribeExportConfigurations.go index 3fd3a8ca07a..b865fe4e1da 100644 --- a/service/applicationdiscoveryservice/api_op_DescribeExportConfigurations.go +++ b/service/applicationdiscoveryservice/api_op_DescribeExportConfigurations.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeExportConfigurations(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribeExportConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_DescribeExportTasks.go b/service/applicationdiscoveryservice/api_op_DescribeExportTasks.go index e0bec889968..3bd85b4b42e 100644 --- a/service/applicationdiscoveryservice/api_op_DescribeExportTasks.go +++ b/service/applicationdiscoveryservice/api_op_DescribeExportTasks.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeExportTasks(ctx context.Context, params *DescribeExport addawsAwsjson11_serdeOpDescribeExportTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_DescribeImportTasks.go b/service/applicationdiscoveryservice/api_op_DescribeImportTasks.go index 1606d2f4e98..a0f7690ff09 100644 --- a/service/applicationdiscoveryservice/api_op_DescribeImportTasks.go +++ b/service/applicationdiscoveryservice/api_op_DescribeImportTasks.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeImportTasks(ctx context.Context, params *DescribeImport addawsAwsjson11_serdeOpDescribeImportTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_DescribeTags.go b/service/applicationdiscoveryservice/api_op_DescribeTags.go index 0c4ea7e8c1b..96506ba6a25 100644 --- a/service/applicationdiscoveryservice/api_op_DescribeTags.go +++ b/service/applicationdiscoveryservice/api_op_DescribeTags.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) DescribeTags(ctx context.Context, params *DescribeTagsInput, op addawsAwsjson11_serdeOpDescribeTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_DisassociateConfigurationItemsFromApplication.go b/service/applicationdiscoveryservice/api_op_DisassociateConfigurationItemsFromApplication.go index 789cdac17ce..1bf6558ce90 100644 --- a/service/applicationdiscoveryservice/api_op_DisassociateConfigurationItemsFromApplication.go +++ b/service/applicationdiscoveryservice/api_op_DisassociateConfigurationItemsFromApplication.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisassociateConfigurationItemsFromApplication(ctx context.Conte addawsAwsjson11_serdeOpDisassociateConfigurationItemsFromApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_ExportConfigurations.go b/service/applicationdiscoveryservice/api_op_ExportConfigurations.go index 59d31d717d7..735c013447d 100644 --- a/service/applicationdiscoveryservice/api_op_ExportConfigurations.go +++ b/service/applicationdiscoveryservice/api_op_ExportConfigurations.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) ExportConfigurations(ctx context.Context, params *ExportConfigu addawsAwsjson11_serdeOpExportConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_GetDiscoverySummary.go b/service/applicationdiscoveryservice/api_op_GetDiscoverySummary.go index 65003dad266..06c3b23554c 100644 --- a/service/applicationdiscoveryservice/api_op_GetDiscoverySummary.go +++ b/service/applicationdiscoveryservice/api_op_GetDiscoverySummary.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetDiscoverySummary(ctx context.Context, params *GetDiscoverySu addawsAwsjson11_serdeOpGetDiscoverySummaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_ListConfigurations.go b/service/applicationdiscoveryservice/api_op_ListConfigurations.go index 5d111b29e89..4dcd335676a 100644 --- a/service/applicationdiscoveryservice/api_op_ListConfigurations.go +++ b/service/applicationdiscoveryservice/api_op_ListConfigurations.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListConfigurations(ctx context.Context, params *ListConfigurati addawsAwsjson11_serdeOpListConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_ListServerNeighbors.go b/service/applicationdiscoveryservice/api_op_ListServerNeighbors.go index 950b8786e57..f5cffd8dd05 100644 --- a/service/applicationdiscoveryservice/api_op_ListServerNeighbors.go +++ b/service/applicationdiscoveryservice/api_op_ListServerNeighbors.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListServerNeighbors(ctx context.Context, params *ListServerNeig addawsAwsjson11_serdeOpListServerNeighborsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_StartContinuousExport.go b/service/applicationdiscoveryservice/api_op_StartContinuousExport.go index 2fb5f6f0467..5c8271f63f0 100644 --- a/service/applicationdiscoveryservice/api_op_StartContinuousExport.go +++ b/service/applicationdiscoveryservice/api_op_StartContinuousExport.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) StartContinuousExport(ctx context.Context, params *StartContinu addawsAwsjson11_serdeOpStartContinuousExportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_StartDataCollectionByAgentIds.go b/service/applicationdiscoveryservice/api_op_StartDataCollectionByAgentIds.go index 7f82cf24625..6c6472a6968 100644 --- a/service/applicationdiscoveryservice/api_op_StartDataCollectionByAgentIds.go +++ b/service/applicationdiscoveryservice/api_op_StartDataCollectionByAgentIds.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StartDataCollectionByAgentIds(ctx context.Context, params *Star addawsAwsjson11_serdeOpStartDataCollectionByAgentIdsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_StartExportTask.go b/service/applicationdiscoveryservice/api_op_StartExportTask.go index c9a0e53a475..a0cda665076 100644 --- a/service/applicationdiscoveryservice/api_op_StartExportTask.go +++ b/service/applicationdiscoveryservice/api_op_StartExportTask.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) StartExportTask(ctx context.Context, params *StartExportTaskInp addawsAwsjson11_serdeOpStartExportTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_StartImportTask.go b/service/applicationdiscoveryservice/api_op_StartImportTask.go index c41303b5e80..bdb11a363d6 100644 --- a/service/applicationdiscoveryservice/api_op_StartImportTask.go +++ b/service/applicationdiscoveryservice/api_op_StartImportTask.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) StartImportTask(ctx context.Context, params *StartImportTaskInp addawsAwsjson11_serdeOpStartImportTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_StopContinuousExport.go b/service/applicationdiscoveryservice/api_op_StopContinuousExport.go index 26d556365c2..ba39eeb7a09 100644 --- a/service/applicationdiscoveryservice/api_op_StopContinuousExport.go +++ b/service/applicationdiscoveryservice/api_op_StopContinuousExport.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) StopContinuousExport(ctx context.Context, params *StopContinuou addawsAwsjson11_serdeOpStopContinuousExportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_StopDataCollectionByAgentIds.go b/service/applicationdiscoveryservice/api_op_StopDataCollectionByAgentIds.go index effef460ba1..5d1d822d115 100644 --- a/service/applicationdiscoveryservice/api_op_StopDataCollectionByAgentIds.go +++ b/service/applicationdiscoveryservice/api_op_StopDataCollectionByAgentIds.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StopDataCollectionByAgentIds(ctx context.Context, params *StopD addawsAwsjson11_serdeOpStopDataCollectionByAgentIdsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/api_op_UpdateApplication.go b/service/applicationdiscoveryservice/api_op_UpdateApplication.go index 7a89c9d802e..8679b3800a0 100644 --- a/service/applicationdiscoveryservice/api_op_UpdateApplication.go +++ b/service/applicationdiscoveryservice/api_op_UpdateApplication.go @@ -5,7 +5,6 @@ package applicationdiscoveryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateApplication(ctx context.Context, params *UpdateApplicatio addawsAwsjson11_serdeOpUpdateApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationdiscoveryservice/endpoints.go b/service/applicationdiscoveryservice/endpoints.go index a87d07424f5..cbfc19ddd06 100644 --- a/service/applicationdiscoveryservice/endpoints.go +++ b/service/applicationdiscoveryservice/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/applicationinsights/api_client.go b/service/applicationinsights/api_client.go index eb916aaed8d..3c898a7fce1 100644 --- a/service/applicationinsights/api_client.go +++ b/service/applicationinsights/api_client.go @@ -89,30 +89,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -178,6 +154,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/applicationinsights/api_op_CreateApplication.go b/service/applicationinsights/api_op_CreateApplication.go index c1a0344ff49..c6bc03b63ff 100644 --- a/service/applicationinsights/api_op_CreateApplication.go +++ b/service/applicationinsights/api_op_CreateApplication.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateApplication(ctx context.Context, params *CreateApplicatio addawsAwsjson11_serdeOpCreateApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_CreateComponent.go b/service/applicationinsights/api_op_CreateComponent.go index cc21b2b1ec6..b1d30bb45de 100644 --- a/service/applicationinsights/api_op_CreateComponent.go +++ b/service/applicationinsights/api_op_CreateComponent.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateComponent(ctx context.Context, params *CreateComponentInp addawsAwsjson11_serdeOpCreateComponentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_CreateLogPattern.go b/service/applicationinsights/api_op_CreateLogPattern.go index 975c1bb58db..3921b925629 100644 --- a/service/applicationinsights/api_op_CreateLogPattern.go +++ b/service/applicationinsights/api_op_CreateLogPattern.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateLogPattern(ctx context.Context, params *CreateLogPatternI addawsAwsjson11_serdeOpCreateLogPatternMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_DeleteApplication.go b/service/applicationinsights/api_op_DeleteApplication.go index 74d9ab5be59..8b1a7ca6099 100644 --- a/service/applicationinsights/api_op_DeleteApplication.go +++ b/service/applicationinsights/api_op_DeleteApplication.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteApplication(ctx context.Context, params *DeleteApplicatio addawsAwsjson11_serdeOpDeleteApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_DeleteComponent.go b/service/applicationinsights/api_op_DeleteComponent.go index 295f360db06..0c72c99010b 100644 --- a/service/applicationinsights/api_op_DeleteComponent.go +++ b/service/applicationinsights/api_op_DeleteComponent.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteComponent(ctx context.Context, params *DeleteComponentInp addawsAwsjson11_serdeOpDeleteComponentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_DeleteLogPattern.go b/service/applicationinsights/api_op_DeleteLogPattern.go index 713ba5c9669..97c7a15f664 100644 --- a/service/applicationinsights/api_op_DeleteLogPattern.go +++ b/service/applicationinsights/api_op_DeleteLogPattern.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteLogPattern(ctx context.Context, params *DeleteLogPatternI addawsAwsjson11_serdeOpDeleteLogPatternMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_DescribeApplication.go b/service/applicationinsights/api_op_DescribeApplication.go index c1da03fc5cb..c46cb93a9ca 100644 --- a/service/applicationinsights/api_op_DescribeApplication.go +++ b/service/applicationinsights/api_op_DescribeApplication.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeApplication(ctx context.Context, params *DescribeApplic addawsAwsjson11_serdeOpDescribeApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_DescribeComponent.go b/service/applicationinsights/api_op_DescribeComponent.go index 7440938af65..fe450aaffb8 100644 --- a/service/applicationinsights/api_op_DescribeComponent.go +++ b/service/applicationinsights/api_op_DescribeComponent.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeComponent(ctx context.Context, params *DescribeComponen addawsAwsjson11_serdeOpDescribeComponentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_DescribeComponentConfiguration.go b/service/applicationinsights/api_op_DescribeComponentConfiguration.go index 1d57b676eda..125532808a8 100644 --- a/service/applicationinsights/api_op_DescribeComponentConfiguration.go +++ b/service/applicationinsights/api_op_DescribeComponentConfiguration.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeComponentConfiguration(ctx context.Context, params *Des addawsAwsjson11_serdeOpDescribeComponentConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_DescribeComponentConfigurationRecommendation.go b/service/applicationinsights/api_op_DescribeComponentConfigurationRecommendation.go index a0308b0df37..e4658d49373 100644 --- a/service/applicationinsights/api_op_DescribeComponentConfigurationRecommendation.go +++ b/service/applicationinsights/api_op_DescribeComponentConfigurationRecommendation.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeComponentConfigurationRecommendation(ctx context.Contex addawsAwsjson11_serdeOpDescribeComponentConfigurationRecommendationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_DescribeLogPattern.go b/service/applicationinsights/api_op_DescribeLogPattern.go index 2e3ad4410fe..a4c20e9d7c3 100644 --- a/service/applicationinsights/api_op_DescribeLogPattern.go +++ b/service/applicationinsights/api_op_DescribeLogPattern.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeLogPattern(ctx context.Context, params *DescribeLogPatt addawsAwsjson11_serdeOpDescribeLogPatternMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_DescribeObservation.go b/service/applicationinsights/api_op_DescribeObservation.go index 63c634a9d0b..949efff4dfb 100644 --- a/service/applicationinsights/api_op_DescribeObservation.go +++ b/service/applicationinsights/api_op_DescribeObservation.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeObservation(ctx context.Context, params *DescribeObserv addawsAwsjson11_serdeOpDescribeObservationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_DescribeProblem.go b/service/applicationinsights/api_op_DescribeProblem.go index aa4bcd1004b..d5c42da8ca9 100644 --- a/service/applicationinsights/api_op_DescribeProblem.go +++ b/service/applicationinsights/api_op_DescribeProblem.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeProblem(ctx context.Context, params *DescribeProblemInp addawsAwsjson11_serdeOpDescribeProblemMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_DescribeProblemObservations.go b/service/applicationinsights/api_op_DescribeProblemObservations.go index 9f9d59473b8..a1254a3f3c0 100644 --- a/service/applicationinsights/api_op_DescribeProblemObservations.go +++ b/service/applicationinsights/api_op_DescribeProblemObservations.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeProblemObservations(ctx context.Context, params *Descri addawsAwsjson11_serdeOpDescribeProblemObservationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_ListApplications.go b/service/applicationinsights/api_op_ListApplications.go index 1e6e3acf52d..5874a909ca5 100644 --- a/service/applicationinsights/api_op_ListApplications.go +++ b/service/applicationinsights/api_op_ListApplications.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListApplications(ctx context.Context, params *ListApplicationsI addawsAwsjson11_serdeOpListApplicationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_ListComponents.go b/service/applicationinsights/api_op_ListComponents.go index 919da12f48c..e8b19ab6c5c 100644 --- a/service/applicationinsights/api_op_ListComponents.go +++ b/service/applicationinsights/api_op_ListComponents.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListComponents(ctx context.Context, params *ListComponentsInput addawsAwsjson11_serdeOpListComponentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_ListConfigurationHistory.go b/service/applicationinsights/api_op_ListConfigurationHistory.go index f0c269f5039..d0c61afdad9 100644 --- a/service/applicationinsights/api_op_ListConfigurationHistory.go +++ b/service/applicationinsights/api_op_ListConfigurationHistory.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) ListConfigurationHistory(ctx context.Context, params *ListConfi addawsAwsjson11_serdeOpListConfigurationHistoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_ListLogPatternSets.go b/service/applicationinsights/api_op_ListLogPatternSets.go index c5317756dbb..063772f5958 100644 --- a/service/applicationinsights/api_op_ListLogPatternSets.go +++ b/service/applicationinsights/api_op_ListLogPatternSets.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListLogPatternSets(ctx context.Context, params *ListLogPatternS addawsAwsjson11_serdeOpListLogPatternSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_ListLogPatterns.go b/service/applicationinsights/api_op_ListLogPatterns.go index 075ace50405..339d250cd05 100644 --- a/service/applicationinsights/api_op_ListLogPatterns.go +++ b/service/applicationinsights/api_op_ListLogPatterns.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListLogPatterns(ctx context.Context, params *ListLogPatternsInp addawsAwsjson11_serdeOpListLogPatternsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_ListProblems.go b/service/applicationinsights/api_op_ListProblems.go index 2925426bba5..3d80a428f17 100644 --- a/service/applicationinsights/api_op_ListProblems.go +++ b/service/applicationinsights/api_op_ListProblems.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListProblems(ctx context.Context, params *ListProblemsInput, op addawsAwsjson11_serdeOpListProblemsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_ListTagsForResource.go b/service/applicationinsights/api_op_ListTagsForResource.go index 5e7a3d31262..22808fb9947 100644 --- a/service/applicationinsights/api_op_ListTagsForResource.go +++ b/service/applicationinsights/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_TagResource.go b/service/applicationinsights/api_op_TagResource.go index f11c231f152..115f5b6a46f 100644 --- a/service/applicationinsights/api_op_TagResource.go +++ b/service/applicationinsights/api_op_TagResource.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_UntagResource.go b/service/applicationinsights/api_op_UntagResource.go index ca007b5491a..6067fe98f14 100644 --- a/service/applicationinsights/api_op_UntagResource.go +++ b/service/applicationinsights/api_op_UntagResource.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_UpdateApplication.go b/service/applicationinsights/api_op_UpdateApplication.go index b68fe7e7dd3..338901492e3 100644 --- a/service/applicationinsights/api_op_UpdateApplication.go +++ b/service/applicationinsights/api_op_UpdateApplication.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateApplication(ctx context.Context, params *UpdateApplicatio addawsAwsjson11_serdeOpUpdateApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_UpdateComponent.go b/service/applicationinsights/api_op_UpdateComponent.go index df7d5de2437..b20215437b6 100644 --- a/service/applicationinsights/api_op_UpdateComponent.go +++ b/service/applicationinsights/api_op_UpdateComponent.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpdateComponent(ctx context.Context, params *UpdateComponentInp addawsAwsjson11_serdeOpUpdateComponentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_UpdateComponentConfiguration.go b/service/applicationinsights/api_op_UpdateComponentConfiguration.go index af81dc01e45..b16d18eb18e 100644 --- a/service/applicationinsights/api_op_UpdateComponentConfiguration.go +++ b/service/applicationinsights/api_op_UpdateComponentConfiguration.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateComponentConfiguration(ctx context.Context, params *Updat addawsAwsjson11_serdeOpUpdateComponentConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/api_op_UpdateLogPattern.go b/service/applicationinsights/api_op_UpdateLogPattern.go index c22fcf3e21b..518fae2197b 100644 --- a/service/applicationinsights/api_op_UpdateLogPattern.go +++ b/service/applicationinsights/api_op_UpdateLogPattern.go @@ -5,7 +5,6 @@ package applicationinsights import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/applicationinsights/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateLogPattern(ctx context.Context, params *UpdateLogPatternI addawsAwsjson11_serdeOpUpdateLogPatternMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/applicationinsights/endpoints.go b/service/applicationinsights/endpoints.go index c702673f26b..0d416c0bbfa 100644 --- a/service/applicationinsights/endpoints.go +++ b/service/applicationinsights/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/appmesh/api_client.go b/service/appmesh/api_client.go index 50160abdb72..e0e2d7dad7f 100644 --- a/service/appmesh/api_client.go +++ b/service/appmesh/api_client.go @@ -90,30 +90,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -179,6 +155,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/appmesh/api_op_CreateGatewayRoute.go b/service/appmesh/api_op_CreateGatewayRoute.go index d6d1fbbac7d..72b5a939641 100644 --- a/service/appmesh/api_op_CreateGatewayRoute.go +++ b/service/appmesh/api_op_CreateGatewayRoute.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateGatewayRoute(ctx context.Context, params *CreateGatewayRo addawsRestjson1_serdeOpCreateGatewayRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_CreateMesh.go b/service/appmesh/api_op_CreateMesh.go index 984120cd4f1..aacd8f69c82 100644 --- a/service/appmesh/api_op_CreateMesh.go +++ b/service/appmesh/api_op_CreateMesh.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateMesh(ctx context.Context, params *CreateMeshInput, optFns addawsRestjson1_serdeOpCreateMeshMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_CreateRoute.go b/service/appmesh/api_op_CreateRoute.go index 2c7a107b506..10eac42c811 100644 --- a/service/appmesh/api_op_CreateRoute.go +++ b/service/appmesh/api_op_CreateRoute.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateRoute(ctx context.Context, params *CreateRouteInput, optF addawsRestjson1_serdeOpCreateRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_CreateVirtualGateway.go b/service/appmesh/api_op_CreateVirtualGateway.go index e8b6e00d1bb..a8cccccdbaf 100644 --- a/service/appmesh/api_op_CreateVirtualGateway.go +++ b/service/appmesh/api_op_CreateVirtualGateway.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateVirtualGateway(ctx context.Context, params *CreateVirtual addawsRestjson1_serdeOpCreateVirtualGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_CreateVirtualNode.go b/service/appmesh/api_op_CreateVirtualNode.go index faf17125e75..7da628a33aa 100644 --- a/service/appmesh/api_op_CreateVirtualNode.go +++ b/service/appmesh/api_op_CreateVirtualNode.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) CreateVirtualNode(ctx context.Context, params *CreateVirtualNod addawsRestjson1_serdeOpCreateVirtualNodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_CreateVirtualRouter.go b/service/appmesh/api_op_CreateVirtualRouter.go index aa45d3b4cf7..a7049d6c2d0 100644 --- a/service/appmesh/api_op_CreateVirtualRouter.go +++ b/service/appmesh/api_op_CreateVirtualRouter.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateVirtualRouter(ctx context.Context, params *CreateVirtualR addawsRestjson1_serdeOpCreateVirtualRouterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_CreateVirtualService.go b/service/appmesh/api_op_CreateVirtualService.go index 9257705c472..92a1d97d31a 100644 --- a/service/appmesh/api_op_CreateVirtualService.go +++ b/service/appmesh/api_op_CreateVirtualService.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateVirtualService(ctx context.Context, params *CreateVirtual addawsRestjson1_serdeOpCreateVirtualServiceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_DeleteGatewayRoute.go b/service/appmesh/api_op_DeleteGatewayRoute.go index aa4d27ab259..b5cd5012c38 100644 --- a/service/appmesh/api_op_DeleteGatewayRoute.go +++ b/service/appmesh/api_op_DeleteGatewayRoute.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteGatewayRoute(ctx context.Context, params *DeleteGatewayRo addawsRestjson1_serdeOpDeleteGatewayRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_DeleteMesh.go b/service/appmesh/api_op_DeleteMesh.go index 28fe0eb9501..8cde40175ce 100644 --- a/service/appmesh/api_op_DeleteMesh.go +++ b/service/appmesh/api_op_DeleteMesh.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DeleteMesh(ctx context.Context, params *DeleteMeshInput, optFns addawsRestjson1_serdeOpDeleteMeshMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_DeleteRoute.go b/service/appmesh/api_op_DeleteRoute.go index 479a3d1c8a5..b7dff4dc463 100644 --- a/service/appmesh/api_op_DeleteRoute.go +++ b/service/appmesh/api_op_DeleteRoute.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteRoute(ctx context.Context, params *DeleteRouteInput, optF addawsRestjson1_serdeOpDeleteRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_DeleteVirtualGateway.go b/service/appmesh/api_op_DeleteVirtualGateway.go index b7cb3aa08f1..faaa827c216 100644 --- a/service/appmesh/api_op_DeleteVirtualGateway.go +++ b/service/appmesh/api_op_DeleteVirtualGateway.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteVirtualGateway(ctx context.Context, params *DeleteVirtual addawsRestjson1_serdeOpDeleteVirtualGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_DeleteVirtualNode.go b/service/appmesh/api_op_DeleteVirtualNode.go index b2c33c78b69..42355897aa4 100644 --- a/service/appmesh/api_op_DeleteVirtualNode.go +++ b/service/appmesh/api_op_DeleteVirtualNode.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DeleteVirtualNode(ctx context.Context, params *DeleteVirtualNod addawsRestjson1_serdeOpDeleteVirtualNodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_DeleteVirtualRouter.go b/service/appmesh/api_op_DeleteVirtualRouter.go index 65b87963586..c58415a69d6 100644 --- a/service/appmesh/api_op_DeleteVirtualRouter.go +++ b/service/appmesh/api_op_DeleteVirtualRouter.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteVirtualRouter(ctx context.Context, params *DeleteVirtualR addawsRestjson1_serdeOpDeleteVirtualRouterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_DeleteVirtualService.go b/service/appmesh/api_op_DeleteVirtualService.go index 5b19804ed67..0774614b8b7 100644 --- a/service/appmesh/api_op_DeleteVirtualService.go +++ b/service/appmesh/api_op_DeleteVirtualService.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteVirtualService(ctx context.Context, params *DeleteVirtual addawsRestjson1_serdeOpDeleteVirtualServiceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_DescribeGatewayRoute.go b/service/appmesh/api_op_DescribeGatewayRoute.go index fb24f71f991..454b72efacb 100644 --- a/service/appmesh/api_op_DescribeGatewayRoute.go +++ b/service/appmesh/api_op_DescribeGatewayRoute.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeGatewayRoute(ctx context.Context, params *DescribeGatew addawsRestjson1_serdeOpDescribeGatewayRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_DescribeMesh.go b/service/appmesh/api_op_DescribeMesh.go index 37485bc4b61..13f9438e432 100644 --- a/service/appmesh/api_op_DescribeMesh.go +++ b/service/appmesh/api_op_DescribeMesh.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeMesh(ctx context.Context, params *DescribeMeshInput, op addawsRestjson1_serdeOpDescribeMeshMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_DescribeRoute.go b/service/appmesh/api_op_DescribeRoute.go index dfa5edf7e42..7b68c0a24d7 100644 --- a/service/appmesh/api_op_DescribeRoute.go +++ b/service/appmesh/api_op_DescribeRoute.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeRoute(ctx context.Context, params *DescribeRouteInput, addawsRestjson1_serdeOpDescribeRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_DescribeVirtualGateway.go b/service/appmesh/api_op_DescribeVirtualGateway.go index fd627f9eb0d..9f37dd77360 100644 --- a/service/appmesh/api_op_DescribeVirtualGateway.go +++ b/service/appmesh/api_op_DescribeVirtualGateway.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeVirtualGateway(ctx context.Context, params *DescribeVir addawsRestjson1_serdeOpDescribeVirtualGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_DescribeVirtualNode.go b/service/appmesh/api_op_DescribeVirtualNode.go index 720d0b1feba..a8a7c921d3e 100644 --- a/service/appmesh/api_op_DescribeVirtualNode.go +++ b/service/appmesh/api_op_DescribeVirtualNode.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeVirtualNode(ctx context.Context, params *DescribeVirtua addawsRestjson1_serdeOpDescribeVirtualNodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_DescribeVirtualRouter.go b/service/appmesh/api_op_DescribeVirtualRouter.go index 43039b1f834..d4fe2cd4da3 100644 --- a/service/appmesh/api_op_DescribeVirtualRouter.go +++ b/service/appmesh/api_op_DescribeVirtualRouter.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeVirtualRouter(ctx context.Context, params *DescribeVirt addawsRestjson1_serdeOpDescribeVirtualRouterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_DescribeVirtualService.go b/service/appmesh/api_op_DescribeVirtualService.go index 6bb716277f4..c946b566abd 100644 --- a/service/appmesh/api_op_DescribeVirtualService.go +++ b/service/appmesh/api_op_DescribeVirtualService.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeVirtualService(ctx context.Context, params *DescribeVir addawsRestjson1_serdeOpDescribeVirtualServiceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_ListGatewayRoutes.go b/service/appmesh/api_op_ListGatewayRoutes.go index b664d98781e..f8b309abed2 100644 --- a/service/appmesh/api_op_ListGatewayRoutes.go +++ b/service/appmesh/api_op_ListGatewayRoutes.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListGatewayRoutes(ctx context.Context, params *ListGatewayRoute addawsRestjson1_serdeOpListGatewayRoutesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_ListMeshes.go b/service/appmesh/api_op_ListMeshes.go index f7d10a318f8..7d5da2c4bbc 100644 --- a/service/appmesh/api_op_ListMeshes.go +++ b/service/appmesh/api_op_ListMeshes.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListMeshes(ctx context.Context, params *ListMeshesInput, optFns addawsRestjson1_serdeOpListMeshesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_ListRoutes.go b/service/appmesh/api_op_ListRoutes.go index 5139e2bd5ea..a3a54ed8552 100644 --- a/service/appmesh/api_op_ListRoutes.go +++ b/service/appmesh/api_op_ListRoutes.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListRoutes(ctx context.Context, params *ListRoutesInput, optFns addawsRestjson1_serdeOpListRoutesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_ListTagsForResource.go b/service/appmesh/api_op_ListTagsForResource.go index 3b1f5ca1293..4271575ac07 100644 --- a/service/appmesh/api_op_ListTagsForResource.go +++ b/service/appmesh/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_ListVirtualGateways.go b/service/appmesh/api_op_ListVirtualGateways.go index a3a1afa28bf..411f04f0755 100644 --- a/service/appmesh/api_op_ListVirtualGateways.go +++ b/service/appmesh/api_op_ListVirtualGateways.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListVirtualGateways(ctx context.Context, params *ListVirtualGat addawsRestjson1_serdeOpListVirtualGatewaysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_ListVirtualNodes.go b/service/appmesh/api_op_ListVirtualNodes.go index 48301522297..a9df45ac23a 100644 --- a/service/appmesh/api_op_ListVirtualNodes.go +++ b/service/appmesh/api_op_ListVirtualNodes.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListVirtualNodes(ctx context.Context, params *ListVirtualNodesI addawsRestjson1_serdeOpListVirtualNodesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_ListVirtualRouters.go b/service/appmesh/api_op_ListVirtualRouters.go index cd23feaa817..55a04970ad7 100644 --- a/service/appmesh/api_op_ListVirtualRouters.go +++ b/service/appmesh/api_op_ListVirtualRouters.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListVirtualRouters(ctx context.Context, params *ListVirtualRout addawsRestjson1_serdeOpListVirtualRoutersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_ListVirtualServices.go b/service/appmesh/api_op_ListVirtualServices.go index 1f883a45464..a01287d4ab5 100644 --- a/service/appmesh/api_op_ListVirtualServices.go +++ b/service/appmesh/api_op_ListVirtualServices.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListVirtualServices(ctx context.Context, params *ListVirtualSer addawsRestjson1_serdeOpListVirtualServicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_TagResource.go b/service/appmesh/api_op_TagResource.go index 89425edbcb1..88bae3c7de6 100644 --- a/service/appmesh/api_op_TagResource.go +++ b/service/appmesh/api_op_TagResource.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_UntagResource.go b/service/appmesh/api_op_UntagResource.go index 3e28cea564a..27f795e5a13 100644 --- a/service/appmesh/api_op_UntagResource.go +++ b/service/appmesh/api_op_UntagResource.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_UpdateGatewayRoute.go b/service/appmesh/api_op_UpdateGatewayRoute.go index 9e30ae86fba..b0d4f861a5c 100644 --- a/service/appmesh/api_op_UpdateGatewayRoute.go +++ b/service/appmesh/api_op_UpdateGatewayRoute.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateGatewayRoute(ctx context.Context, params *UpdateGatewayRo addawsRestjson1_serdeOpUpdateGatewayRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_UpdateMesh.go b/service/appmesh/api_op_UpdateMesh.go index a7863ee9b5e..5a540350368 100644 --- a/service/appmesh/api_op_UpdateMesh.go +++ b/service/appmesh/api_op_UpdateMesh.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateMesh(ctx context.Context, params *UpdateMeshInput, optFns addawsRestjson1_serdeOpUpdateMeshMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_UpdateRoute.go b/service/appmesh/api_op_UpdateRoute.go index 6a2d4a1531f..15c6857704f 100644 --- a/service/appmesh/api_op_UpdateRoute.go +++ b/service/appmesh/api_op_UpdateRoute.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateRoute(ctx context.Context, params *UpdateRouteInput, optF addawsRestjson1_serdeOpUpdateRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_UpdateVirtualGateway.go b/service/appmesh/api_op_UpdateVirtualGateway.go index 89fc43589f3..126dad26c06 100644 --- a/service/appmesh/api_op_UpdateVirtualGateway.go +++ b/service/appmesh/api_op_UpdateVirtualGateway.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateVirtualGateway(ctx context.Context, params *UpdateVirtual addawsRestjson1_serdeOpUpdateVirtualGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_UpdateVirtualNode.go b/service/appmesh/api_op_UpdateVirtualNode.go index 421afb5b87c..e78c511290a 100644 --- a/service/appmesh/api_op_UpdateVirtualNode.go +++ b/service/appmesh/api_op_UpdateVirtualNode.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateVirtualNode(ctx context.Context, params *UpdateVirtualNod addawsRestjson1_serdeOpUpdateVirtualNodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_UpdateVirtualRouter.go b/service/appmesh/api_op_UpdateVirtualRouter.go index 6edca3020b0..d5ac1cd5809 100644 --- a/service/appmesh/api_op_UpdateVirtualRouter.go +++ b/service/appmesh/api_op_UpdateVirtualRouter.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateVirtualRouter(ctx context.Context, params *UpdateVirtualR addawsRestjson1_serdeOpUpdateVirtualRouterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/api_op_UpdateVirtualService.go b/service/appmesh/api_op_UpdateVirtualService.go index baf77750106..0c4b483a9d9 100644 --- a/service/appmesh/api_op_UpdateVirtualService.go +++ b/service/appmesh/api_op_UpdateVirtualService.go @@ -5,7 +5,6 @@ package appmesh import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appmesh/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateVirtualService(ctx context.Context, params *UpdateVirtual addawsRestjson1_serdeOpUpdateVirtualServiceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appmesh/endpoints.go b/service/appmesh/endpoints.go index 78a518b8ea2..c5ce4242104 100644 --- a/service/appmesh/endpoints.go +++ b/service/appmesh/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/appstream/api_client.go b/service/appstream/api_client.go index ffb96c20539..031761ed145 100644 --- a/service/appstream/api_client.go +++ b/service/appstream/api_client.go @@ -93,30 +93,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -182,6 +158,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/appstream/api_op_AssociateFleet.go b/service/appstream/api_op_AssociateFleet.go index 1443b39129e..721c5190822 100644 --- a/service/appstream/api_op_AssociateFleet.go +++ b/service/appstream/api_op_AssociateFleet.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AssociateFleet(ctx context.Context, params *AssociateFleetInput addawsAwsjson11_serdeOpAssociateFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_BatchAssociateUserStack.go b/service/appstream/api_op_BatchAssociateUserStack.go index abbab2c0f1f..ef00ec67b9e 100644 --- a/service/appstream/api_op_BatchAssociateUserStack.go +++ b/service/appstream/api_op_BatchAssociateUserStack.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) BatchAssociateUserStack(ctx context.Context, params *BatchAssoc addawsAwsjson11_serdeOpBatchAssociateUserStackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_BatchDisassociateUserStack.go b/service/appstream/api_op_BatchDisassociateUserStack.go index 83d6288ab3b..2d4fe69194e 100644 --- a/service/appstream/api_op_BatchDisassociateUserStack.go +++ b/service/appstream/api_op_BatchDisassociateUserStack.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchDisassociateUserStack(ctx context.Context, params *BatchDi addawsAwsjson11_serdeOpBatchDisassociateUserStackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_CopyImage.go b/service/appstream/api_op_CopyImage.go index 13e4c81e09d..d5d16b4d31b 100644 --- a/service/appstream/api_op_CopyImage.go +++ b/service/appstream/api_op_CopyImage.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CopyImage(ctx context.Context, params *CopyImageInput, optFns . addawsAwsjson11_serdeOpCopyImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_CreateDirectoryConfig.go b/service/appstream/api_op_CreateDirectoryConfig.go index b8ee99a7321..7abe7accb3d 100644 --- a/service/appstream/api_op_CreateDirectoryConfig.go +++ b/service/appstream/api_op_CreateDirectoryConfig.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateDirectoryConfig(ctx context.Context, params *CreateDirect addawsAwsjson11_serdeOpCreateDirectoryConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_CreateFleet.go b/service/appstream/api_op_CreateFleet.go index 9bdfe410a93..51f4e961343 100644 --- a/service/appstream/api_op_CreateFleet.go +++ b/service/appstream/api_op_CreateFleet.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateFleet(ctx context.Context, params *CreateFleetInput, optF addawsAwsjson11_serdeOpCreateFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_CreateImageBuilder.go b/service/appstream/api_op_CreateImageBuilder.go index 351f4f03e78..92b9f56f32d 100644 --- a/service/appstream/api_op_CreateImageBuilder.go +++ b/service/appstream/api_op_CreateImageBuilder.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateImageBuilder(ctx context.Context, params *CreateImageBuil addawsAwsjson11_serdeOpCreateImageBuilderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_CreateImageBuilderStreamingURL.go b/service/appstream/api_op_CreateImageBuilderStreamingURL.go index 9c38272e48e..8314300dd2e 100644 --- a/service/appstream/api_op_CreateImageBuilderStreamingURL.go +++ b/service/appstream/api_op_CreateImageBuilderStreamingURL.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateImageBuilderStreamingURL(ctx context.Context, params *Cre addawsAwsjson11_serdeOpCreateImageBuilderStreamingURLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_CreateStack.go b/service/appstream/api_op_CreateStack.go index be4965d94c6..7c02160f24a 100644 --- a/service/appstream/api_op_CreateStack.go +++ b/service/appstream/api_op_CreateStack.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateStack(ctx context.Context, params *CreateStackInput, optF addawsAwsjson11_serdeOpCreateStackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_CreateStreamingURL.go b/service/appstream/api_op_CreateStreamingURL.go index fcff3106562..c2cc6778d76 100644 --- a/service/appstream/api_op_CreateStreamingURL.go +++ b/service/appstream/api_op_CreateStreamingURL.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) CreateStreamingURL(ctx context.Context, params *CreateStreaming addawsAwsjson11_serdeOpCreateStreamingURLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_CreateUsageReportSubscription.go b/service/appstream/api_op_CreateUsageReportSubscription.go index 3ca74f59a77..36dcfda2e5d 100644 --- a/service/appstream/api_op_CreateUsageReportSubscription.go +++ b/service/appstream/api_op_CreateUsageReportSubscription.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateUsageReportSubscription(ctx context.Context, params *Crea addawsAwsjson11_serdeOpCreateUsageReportSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_CreateUser.go b/service/appstream/api_op_CreateUser.go index 176da4ccecc..bb992ef6ad5 100644 --- a/service/appstream/api_op_CreateUser.go +++ b/service/appstream/api_op_CreateUser.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateUser(ctx context.Context, params *CreateUserInput, optFns addawsAwsjson11_serdeOpCreateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DeleteDirectoryConfig.go b/service/appstream/api_op_DeleteDirectoryConfig.go index f9273b9248e..e2f41e9bd2c 100644 --- a/service/appstream/api_op_DeleteDirectoryConfig.go +++ b/service/appstream/api_op_DeleteDirectoryConfig.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteDirectoryConfig(ctx context.Context, params *DeleteDirect addawsAwsjson11_serdeOpDeleteDirectoryConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DeleteFleet.go b/service/appstream/api_op_DeleteFleet.go index 6ac79b8b1c8..c333156e31c 100644 --- a/service/appstream/api_op_DeleteFleet.go +++ b/service/appstream/api_op_DeleteFleet.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteFleet(ctx context.Context, params *DeleteFleetInput, optF addawsAwsjson11_serdeOpDeleteFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DeleteImage.go b/service/appstream/api_op_DeleteImage.go index 854b7837a98..767ebbc191d 100644 --- a/service/appstream/api_op_DeleteImage.go +++ b/service/appstream/api_op_DeleteImage.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteImage(ctx context.Context, params *DeleteImageInput, optF addawsAwsjson11_serdeOpDeleteImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DeleteImageBuilder.go b/service/appstream/api_op_DeleteImageBuilder.go index 2ba3f4fdc64..170c06953fe 100644 --- a/service/appstream/api_op_DeleteImageBuilder.go +++ b/service/appstream/api_op_DeleteImageBuilder.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteImageBuilder(ctx context.Context, params *DeleteImageBuil addawsAwsjson11_serdeOpDeleteImageBuilderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DeleteImagePermissions.go b/service/appstream/api_op_DeleteImagePermissions.go index a8673de566b..14b68d5458d 100644 --- a/service/appstream/api_op_DeleteImagePermissions.go +++ b/service/appstream/api_op_DeleteImagePermissions.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteImagePermissions(ctx context.Context, params *DeleteImage addawsAwsjson11_serdeOpDeleteImagePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DeleteStack.go b/service/appstream/api_op_DeleteStack.go index 9bb9b7fc843..6f4ba961fb0 100644 --- a/service/appstream/api_op_DeleteStack.go +++ b/service/appstream/api_op_DeleteStack.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteStack(ctx context.Context, params *DeleteStackInput, optF addawsAwsjson11_serdeOpDeleteStackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DeleteUsageReportSubscription.go b/service/appstream/api_op_DeleteUsageReportSubscription.go index dcdbd316526..3fa1e77eb24 100644 --- a/service/appstream/api_op_DeleteUsageReportSubscription.go +++ b/service/appstream/api_op_DeleteUsageReportSubscription.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteUsageReportSubscription(ctx context.Context, params *Dele addawsAwsjson11_serdeOpDeleteUsageReportSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DeleteUser.go b/service/appstream/api_op_DeleteUser.go index 4cbf4f79b97..0f0418630ce 100644 --- a/service/appstream/api_op_DeleteUser.go +++ b/service/appstream/api_op_DeleteUser.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteUser(ctx context.Context, params *DeleteUserInput, optFns addawsAwsjson11_serdeOpDeleteUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DescribeDirectoryConfigs.go b/service/appstream/api_op_DescribeDirectoryConfigs.go index e74ae42a4b1..5ac6d913d3a 100644 --- a/service/appstream/api_op_DescribeDirectoryConfigs.go +++ b/service/appstream/api_op_DescribeDirectoryConfigs.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeDirectoryConfigs(ctx context.Context, params *DescribeD addawsAwsjson11_serdeOpDescribeDirectoryConfigsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DescribeFleets.go b/service/appstream/api_op_DescribeFleets.go index fa5080c3ade..54cc3199429 100644 --- a/service/appstream/api_op_DescribeFleets.go +++ b/service/appstream/api_op_DescribeFleets.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeFleets(ctx context.Context, params *DescribeFleetsInput addawsAwsjson11_serdeOpDescribeFleetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DescribeImageBuilders.go b/service/appstream/api_op_DescribeImageBuilders.go index 882a9d9b4fc..ce664dc7d86 100644 --- a/service/appstream/api_op_DescribeImageBuilders.go +++ b/service/appstream/api_op_DescribeImageBuilders.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeImageBuilders(ctx context.Context, params *DescribeImag addawsAwsjson11_serdeOpDescribeImageBuildersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DescribeImagePermissions.go b/service/appstream/api_op_DescribeImagePermissions.go index 1d4a5f6f499..0534a85443b 100644 --- a/service/appstream/api_op_DescribeImagePermissions.go +++ b/service/appstream/api_op_DescribeImagePermissions.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeImagePermissions(ctx context.Context, params *DescribeI addawsAwsjson11_serdeOpDescribeImagePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DescribeImages.go b/service/appstream/api_op_DescribeImages.go index 3a5e3169d9b..8cd275b8141 100644 --- a/service/appstream/api_op_DescribeImages.go +++ b/service/appstream/api_op_DescribeImages.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeImages(ctx context.Context, params *DescribeImagesInput addawsAwsjson11_serdeOpDescribeImagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DescribeSessions.go b/service/appstream/api_op_DescribeSessions.go index 640315f4f33..1c70a02aa09 100644 --- a/service/appstream/api_op_DescribeSessions.go +++ b/service/appstream/api_op_DescribeSessions.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeSessions(ctx context.Context, params *DescribeSessionsI addawsAwsjson11_serdeOpDescribeSessionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DescribeStacks.go b/service/appstream/api_op_DescribeStacks.go index 66140abda2c..9524f384113 100644 --- a/service/appstream/api_op_DescribeStacks.go +++ b/service/appstream/api_op_DescribeStacks.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeStacks(ctx context.Context, params *DescribeStacksInput addawsAwsjson11_serdeOpDescribeStacksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DescribeUsageReportSubscriptions.go b/service/appstream/api_op_DescribeUsageReportSubscriptions.go index a339fa4083e..11730b10d65 100644 --- a/service/appstream/api_op_DescribeUsageReportSubscriptions.go +++ b/service/appstream/api_op_DescribeUsageReportSubscriptions.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeUsageReportSubscriptions(ctx context.Context, params *D addawsAwsjson11_serdeOpDescribeUsageReportSubscriptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DescribeUserStackAssociations.go b/service/appstream/api_op_DescribeUserStackAssociations.go index 2e11182a1fd..5924b12b627 100644 --- a/service/appstream/api_op_DescribeUserStackAssociations.go +++ b/service/appstream/api_op_DescribeUserStackAssociations.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DescribeUserStackAssociations(ctx context.Context, params *Desc addawsAwsjson11_serdeOpDescribeUserStackAssociationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DescribeUsers.go b/service/appstream/api_op_DescribeUsers.go index 1ae3f7d529c..f7b7e86706b 100644 --- a/service/appstream/api_op_DescribeUsers.go +++ b/service/appstream/api_op_DescribeUsers.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeUsers(ctx context.Context, params *DescribeUsersInput, addawsAwsjson11_serdeOpDescribeUsersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DisableUser.go b/service/appstream/api_op_DisableUser.go index 0d819d36342..0f38e28f655 100644 --- a/service/appstream/api_op_DisableUser.go +++ b/service/appstream/api_op_DisableUser.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DisableUser(ctx context.Context, params *DisableUserInput, optF addawsAwsjson11_serdeOpDisableUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_DisassociateFleet.go b/service/appstream/api_op_DisassociateFleet.go index 99e741dc564..943df1ef6f6 100644 --- a/service/appstream/api_op_DisassociateFleet.go +++ b/service/appstream/api_op_DisassociateFleet.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisassociateFleet(ctx context.Context, params *DisassociateFlee addawsAwsjson11_serdeOpDisassociateFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_EnableUser.go b/service/appstream/api_op_EnableUser.go index 99914e2e871..aa0e517d8d7 100644 --- a/service/appstream/api_op_EnableUser.go +++ b/service/appstream/api_op_EnableUser.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) EnableUser(ctx context.Context, params *EnableUserInput, optFns addawsAwsjson11_serdeOpEnableUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_ExpireSession.go b/service/appstream/api_op_ExpireSession.go index 42dc259382e..4fca848ef97 100644 --- a/service/appstream/api_op_ExpireSession.go +++ b/service/appstream/api_op_ExpireSession.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ExpireSession(ctx context.Context, params *ExpireSessionInput, addawsAwsjson11_serdeOpExpireSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_ListAssociatedFleets.go b/service/appstream/api_op_ListAssociatedFleets.go index 09ff4485b8d..12cc53e207c 100644 --- a/service/appstream/api_op_ListAssociatedFleets.go +++ b/service/appstream/api_op_ListAssociatedFleets.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListAssociatedFleets(ctx context.Context, params *ListAssociate addawsAwsjson11_serdeOpListAssociatedFleetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_ListAssociatedStacks.go b/service/appstream/api_op_ListAssociatedStacks.go index 6af93930c13..d95960542fd 100644 --- a/service/appstream/api_op_ListAssociatedStacks.go +++ b/service/appstream/api_op_ListAssociatedStacks.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListAssociatedStacks(ctx context.Context, params *ListAssociate addawsAwsjson11_serdeOpListAssociatedStacksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_ListTagsForResource.go b/service/appstream/api_op_ListTagsForResource.go index 1ff210c7168..7336daf98bc 100644 --- a/service/appstream/api_op_ListTagsForResource.go +++ b/service/appstream/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_StartFleet.go b/service/appstream/api_op_StartFleet.go index f6408088248..ebb18e827d2 100644 --- a/service/appstream/api_op_StartFleet.go +++ b/service/appstream/api_op_StartFleet.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StartFleet(ctx context.Context, params *StartFleetInput, optFns addawsAwsjson11_serdeOpStartFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_StartImageBuilder.go b/service/appstream/api_op_StartImageBuilder.go index 5e06f136a3f..852d87c2212 100644 --- a/service/appstream/api_op_StartImageBuilder.go +++ b/service/appstream/api_op_StartImageBuilder.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StartImageBuilder(ctx context.Context, params *StartImageBuilde addawsAwsjson11_serdeOpStartImageBuilderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_StopFleet.go b/service/appstream/api_op_StopFleet.go index 790c7be2a4f..43d3f356917 100644 --- a/service/appstream/api_op_StopFleet.go +++ b/service/appstream/api_op_StopFleet.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StopFleet(ctx context.Context, params *StopFleetInput, optFns . addawsAwsjson11_serdeOpStopFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_StopImageBuilder.go b/service/appstream/api_op_StopImageBuilder.go index 4d475ca5b46..e0e3f988b08 100644 --- a/service/appstream/api_op_StopImageBuilder.go +++ b/service/appstream/api_op_StopImageBuilder.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StopImageBuilder(ctx context.Context, params *StopImageBuilderI addawsAwsjson11_serdeOpStopImageBuilderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_TagResource.go b/service/appstream/api_op_TagResource.go index b0731ed4a51..a814b8bc818 100644 --- a/service/appstream/api_op_TagResource.go +++ b/service/appstream/api_op_TagResource.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_UntagResource.go b/service/appstream/api_op_UntagResource.go index 8a0e72d0908..a7b651a63e5 100644 --- a/service/appstream/api_op_UntagResource.go +++ b/service/appstream/api_op_UntagResource.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_UpdateDirectoryConfig.go b/service/appstream/api_op_UpdateDirectoryConfig.go index d1faf77b6a9..5035cdd7f22 100644 --- a/service/appstream/api_op_UpdateDirectoryConfig.go +++ b/service/appstream/api_op_UpdateDirectoryConfig.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateDirectoryConfig(ctx context.Context, params *UpdateDirect addawsAwsjson11_serdeOpUpdateDirectoryConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_UpdateFleet.go b/service/appstream/api_op_UpdateFleet.go index eb468d25d04..994412724fb 100644 --- a/service/appstream/api_op_UpdateFleet.go +++ b/service/appstream/api_op_UpdateFleet.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateFleet(ctx context.Context, params *UpdateFleetInput, optF addawsAwsjson11_serdeOpUpdateFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_UpdateImagePermissions.go b/service/appstream/api_op_UpdateImagePermissions.go index 7741d489fbb..dbc65d19042 100644 --- a/service/appstream/api_op_UpdateImagePermissions.go +++ b/service/appstream/api_op_UpdateImagePermissions.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateImagePermissions(ctx context.Context, params *UpdateImage addawsAwsjson11_serdeOpUpdateImagePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/api_op_UpdateStack.go b/service/appstream/api_op_UpdateStack.go index 688d2972c5d..4e14b9f4952 100644 --- a/service/appstream/api_op_UpdateStack.go +++ b/service/appstream/api_op_UpdateStack.go @@ -5,7 +5,6 @@ package appstream import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appstream/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateStack(ctx context.Context, params *UpdateStackInput, optF addawsAwsjson11_serdeOpUpdateStackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appstream/endpoints.go b/service/appstream/endpoints.go index b0cbcf03833..334a4989b09 100644 --- a/service/appstream/endpoints.go +++ b/service/appstream/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/appsync/api_client.go b/service/appsync/api_client.go index bc21a41f9c3..b288aec1302 100644 --- a/service/appsync/api_client.go +++ b/service/appsync/api_client.go @@ -78,30 +78,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -167,6 +143,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/appsync/api_op_CreateApiCache.go b/service/appsync/api_op_CreateApiCache.go index e2a8f60d2be..e6dd0a06c57 100644 --- a/service/appsync/api_op_CreateApiCache.go +++ b/service/appsync/api_op_CreateApiCache.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateApiCache(ctx context.Context, params *CreateApiCacheInput addawsRestjson1_serdeOpCreateApiCacheMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_CreateApiKey.go b/service/appsync/api_op_CreateApiKey.go index 34e274b9e56..94ca63cee82 100644 --- a/service/appsync/api_op_CreateApiKey.go +++ b/service/appsync/api_op_CreateApiKey.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateApiKey(ctx context.Context, params *CreateApiKeyInput, op addawsRestjson1_serdeOpCreateApiKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_CreateDataSource.go b/service/appsync/api_op_CreateDataSource.go index 04513c4e598..22f3431bd55 100644 --- a/service/appsync/api_op_CreateDataSource.go +++ b/service/appsync/api_op_CreateDataSource.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDataSource(ctx context.Context, params *CreateDataSourceI addawsRestjson1_serdeOpCreateDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_CreateFunction.go b/service/appsync/api_op_CreateFunction.go index c89442c1178..e1e23ef4631 100644 --- a/service/appsync/api_op_CreateFunction.go +++ b/service/appsync/api_op_CreateFunction.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateFunction(ctx context.Context, params *CreateFunctionInput addawsRestjson1_serdeOpCreateFunctionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_CreateGraphqlApi.go b/service/appsync/api_op_CreateGraphqlApi.go index 011cce0c127..38096dd053c 100644 --- a/service/appsync/api_op_CreateGraphqlApi.go +++ b/service/appsync/api_op_CreateGraphqlApi.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateGraphqlApi(ctx context.Context, params *CreateGraphqlApiI addawsRestjson1_serdeOpCreateGraphqlApiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_CreateResolver.go b/service/appsync/api_op_CreateResolver.go index 451dcf26f0d..86fa796f5ad 100644 --- a/service/appsync/api_op_CreateResolver.go +++ b/service/appsync/api_op_CreateResolver.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateResolver(ctx context.Context, params *CreateResolverInput addawsRestjson1_serdeOpCreateResolverMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_CreateType.go b/service/appsync/api_op_CreateType.go index 648037913af..1c55081a547 100644 --- a/service/appsync/api_op_CreateType.go +++ b/service/appsync/api_op_CreateType.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateType(ctx context.Context, params *CreateTypeInput, optFns addawsRestjson1_serdeOpCreateTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_DeleteApiCache.go b/service/appsync/api_op_DeleteApiCache.go index a3785641e60..92eab6359f0 100644 --- a/service/appsync/api_op_DeleteApiCache.go +++ b/service/appsync/api_op_DeleteApiCache.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteApiCache(ctx context.Context, params *DeleteApiCacheInput addawsRestjson1_serdeOpDeleteApiCacheMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_DeleteApiKey.go b/service/appsync/api_op_DeleteApiKey.go index ad124c873e2..e753b5ba0ae 100644 --- a/service/appsync/api_op_DeleteApiKey.go +++ b/service/appsync/api_op_DeleteApiKey.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteApiKey(ctx context.Context, params *DeleteApiKeyInput, op addawsRestjson1_serdeOpDeleteApiKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_DeleteDataSource.go b/service/appsync/api_op_DeleteDataSource.go index abeb5ec953c..b80c007b6cf 100644 --- a/service/appsync/api_op_DeleteDataSource.go +++ b/service/appsync/api_op_DeleteDataSource.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDataSource(ctx context.Context, params *DeleteDataSourceI addawsRestjson1_serdeOpDeleteDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_DeleteFunction.go b/service/appsync/api_op_DeleteFunction.go index 3d59554907e..938ea1aebbe 100644 --- a/service/appsync/api_op_DeleteFunction.go +++ b/service/appsync/api_op_DeleteFunction.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteFunction(ctx context.Context, params *DeleteFunctionInput addawsRestjson1_serdeOpDeleteFunctionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_DeleteGraphqlApi.go b/service/appsync/api_op_DeleteGraphqlApi.go index a95007a4e50..e512549cbbd 100644 --- a/service/appsync/api_op_DeleteGraphqlApi.go +++ b/service/appsync/api_op_DeleteGraphqlApi.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteGraphqlApi(ctx context.Context, params *DeleteGraphqlApiI addawsRestjson1_serdeOpDeleteGraphqlApiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_DeleteResolver.go b/service/appsync/api_op_DeleteResolver.go index b1b63e602c7..aca43c6c67c 100644 --- a/service/appsync/api_op_DeleteResolver.go +++ b/service/appsync/api_op_DeleteResolver.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteResolver(ctx context.Context, params *DeleteResolverInput addawsRestjson1_serdeOpDeleteResolverMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_DeleteType.go b/service/appsync/api_op_DeleteType.go index fbb97a1ff8b..149b542c308 100644 --- a/service/appsync/api_op_DeleteType.go +++ b/service/appsync/api_op_DeleteType.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteType(ctx context.Context, params *DeleteTypeInput, optFns addawsRestjson1_serdeOpDeleteTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_FlushApiCache.go b/service/appsync/api_op_FlushApiCache.go index bc8e9827b3b..1b7df03b658 100644 --- a/service/appsync/api_op_FlushApiCache.go +++ b/service/appsync/api_op_FlushApiCache.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) FlushApiCache(ctx context.Context, params *FlushApiCacheInput, addawsRestjson1_serdeOpFlushApiCacheMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_GetApiCache.go b/service/appsync/api_op_GetApiCache.go index 4d2792c859e..2e5b26877cf 100644 --- a/service/appsync/api_op_GetApiCache.go +++ b/service/appsync/api_op_GetApiCache.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetApiCache(ctx context.Context, params *GetApiCacheInput, optF addawsRestjson1_serdeOpGetApiCacheMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_GetDataSource.go b/service/appsync/api_op_GetDataSource.go index da93aa4f215..adcd8414c0e 100644 --- a/service/appsync/api_op_GetDataSource.go +++ b/service/appsync/api_op_GetDataSource.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDataSource(ctx context.Context, params *GetDataSourceInput, addawsRestjson1_serdeOpGetDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_GetFunction.go b/service/appsync/api_op_GetFunction.go index aeff557fdd0..066bf4f8ea7 100644 --- a/service/appsync/api_op_GetFunction.go +++ b/service/appsync/api_op_GetFunction.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetFunction(ctx context.Context, params *GetFunctionInput, optF addawsRestjson1_serdeOpGetFunctionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_GetGraphqlApi.go b/service/appsync/api_op_GetGraphqlApi.go index 164c14138e3..60eec6982b9 100644 --- a/service/appsync/api_op_GetGraphqlApi.go +++ b/service/appsync/api_op_GetGraphqlApi.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetGraphqlApi(ctx context.Context, params *GetGraphqlApiInput, addawsRestjson1_serdeOpGetGraphqlApiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_GetIntrospectionSchema.go b/service/appsync/api_op_GetIntrospectionSchema.go index f6be333fbf7..52830e22ede 100644 --- a/service/appsync/api_op_GetIntrospectionSchema.go +++ b/service/appsync/api_op_GetIntrospectionSchema.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetIntrospectionSchema(ctx context.Context, params *GetIntrospe addawsRestjson1_serdeOpGetIntrospectionSchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_GetResolver.go b/service/appsync/api_op_GetResolver.go index ef942dbb969..c28579fd4ff 100644 --- a/service/appsync/api_op_GetResolver.go +++ b/service/appsync/api_op_GetResolver.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetResolver(ctx context.Context, params *GetResolverInput, optF addawsRestjson1_serdeOpGetResolverMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_GetSchemaCreationStatus.go b/service/appsync/api_op_GetSchemaCreationStatus.go index 5256434a482..6667972037a 100644 --- a/service/appsync/api_op_GetSchemaCreationStatus.go +++ b/service/appsync/api_op_GetSchemaCreationStatus.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetSchemaCreationStatus(ctx context.Context, params *GetSchemaC addawsRestjson1_serdeOpGetSchemaCreationStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_GetType.go b/service/appsync/api_op_GetType.go index ad948562ffc..4ade51b5a64 100644 --- a/service/appsync/api_op_GetType.go +++ b/service/appsync/api_op_GetType.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetType(ctx context.Context, params *GetTypeInput, optFns ...fu addawsRestjson1_serdeOpGetTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_ListApiKeys.go b/service/appsync/api_op_ListApiKeys.go index d9f487e4e37..5fd83071072 100644 --- a/service/appsync/api_op_ListApiKeys.go +++ b/service/appsync/api_op_ListApiKeys.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListApiKeys(ctx context.Context, params *ListApiKeysInput, optF addawsRestjson1_serdeOpListApiKeysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_ListDataSources.go b/service/appsync/api_op_ListDataSources.go index dbe77614d9b..2be0a5913be 100644 --- a/service/appsync/api_op_ListDataSources.go +++ b/service/appsync/api_op_ListDataSources.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDataSources(ctx context.Context, params *ListDataSourcesInp addawsRestjson1_serdeOpListDataSourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_ListFunctions.go b/service/appsync/api_op_ListFunctions.go index 9b85ec29a69..6fa1f95f7b7 100644 --- a/service/appsync/api_op_ListFunctions.go +++ b/service/appsync/api_op_ListFunctions.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListFunctions(ctx context.Context, params *ListFunctionsInput, addawsRestjson1_serdeOpListFunctionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_ListGraphqlApis.go b/service/appsync/api_op_ListGraphqlApis.go index 7c303392b55..5a3e784d296 100644 --- a/service/appsync/api_op_ListGraphqlApis.go +++ b/service/appsync/api_op_ListGraphqlApis.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListGraphqlApis(ctx context.Context, params *ListGraphqlApisInp addawsRestjson1_serdeOpListGraphqlApisMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_ListResolvers.go b/service/appsync/api_op_ListResolvers.go index 30bd1bbf25d..743f52c5a36 100644 --- a/service/appsync/api_op_ListResolvers.go +++ b/service/appsync/api_op_ListResolvers.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListResolvers(ctx context.Context, params *ListResolversInput, addawsRestjson1_serdeOpListResolversMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_ListResolversByFunction.go b/service/appsync/api_op_ListResolversByFunction.go index 74b2fb10cbc..77d5f1d3187 100644 --- a/service/appsync/api_op_ListResolversByFunction.go +++ b/service/appsync/api_op_ListResolversByFunction.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListResolversByFunction(ctx context.Context, params *ListResolv addawsRestjson1_serdeOpListResolversByFunctionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_ListTagsForResource.go b/service/appsync/api_op_ListTagsForResource.go index 715c07c9ba1..0581bca3469 100644 --- a/service/appsync/api_op_ListTagsForResource.go +++ b/service/appsync/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_ListTypes.go b/service/appsync/api_op_ListTypes.go index eb398ea3202..a983794b941 100644 --- a/service/appsync/api_op_ListTypes.go +++ b/service/appsync/api_op_ListTypes.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTypes(ctx context.Context, params *ListTypesInput, optFns . addawsRestjson1_serdeOpListTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_StartSchemaCreation.go b/service/appsync/api_op_StartSchemaCreation.go index 40e16dd77ea..e8b59c6952f 100644 --- a/service/appsync/api_op_StartSchemaCreation.go +++ b/service/appsync/api_op_StartSchemaCreation.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) StartSchemaCreation(ctx context.Context, params *StartSchemaCre addawsRestjson1_serdeOpStartSchemaCreationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_TagResource.go b/service/appsync/api_op_TagResource.go index 1c13490d5d4..b12ded441c3 100644 --- a/service/appsync/api_op_TagResource.go +++ b/service/appsync/api_op_TagResource.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_UntagResource.go b/service/appsync/api_op_UntagResource.go index bc556b40428..9e06b02744d 100644 --- a/service/appsync/api_op_UntagResource.go +++ b/service/appsync/api_op_UntagResource.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_UpdateApiCache.go b/service/appsync/api_op_UpdateApiCache.go index 84485a53c50..a08995187c0 100644 --- a/service/appsync/api_op_UpdateApiCache.go +++ b/service/appsync/api_op_UpdateApiCache.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateApiCache(ctx context.Context, params *UpdateApiCacheInput addawsRestjson1_serdeOpUpdateApiCacheMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_UpdateApiKey.go b/service/appsync/api_op_UpdateApiKey.go index 05fe02ec152..a3ce4a120c0 100644 --- a/service/appsync/api_op_UpdateApiKey.go +++ b/service/appsync/api_op_UpdateApiKey.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateApiKey(ctx context.Context, params *UpdateApiKeyInput, op addawsRestjson1_serdeOpUpdateApiKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_UpdateDataSource.go b/service/appsync/api_op_UpdateDataSource.go index ffc01908b5b..7e284a26411 100644 --- a/service/appsync/api_op_UpdateDataSource.go +++ b/service/appsync/api_op_UpdateDataSource.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDataSource(ctx context.Context, params *UpdateDataSourceI addawsRestjson1_serdeOpUpdateDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_UpdateFunction.go b/service/appsync/api_op_UpdateFunction.go index e01038d9ce6..2b655f3b82f 100644 --- a/service/appsync/api_op_UpdateFunction.go +++ b/service/appsync/api_op_UpdateFunction.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateFunction(ctx context.Context, params *UpdateFunctionInput addawsRestjson1_serdeOpUpdateFunctionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_UpdateGraphqlApi.go b/service/appsync/api_op_UpdateGraphqlApi.go index f60914619b3..8ebc020ed12 100644 --- a/service/appsync/api_op_UpdateGraphqlApi.go +++ b/service/appsync/api_op_UpdateGraphqlApi.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateGraphqlApi(ctx context.Context, params *UpdateGraphqlApiI addawsRestjson1_serdeOpUpdateGraphqlApiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_UpdateResolver.go b/service/appsync/api_op_UpdateResolver.go index e482b1a8f97..2ce77cc0b25 100644 --- a/service/appsync/api_op_UpdateResolver.go +++ b/service/appsync/api_op_UpdateResolver.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateResolver(ctx context.Context, params *UpdateResolverInput addawsRestjson1_serdeOpUpdateResolverMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/api_op_UpdateType.go b/service/appsync/api_op_UpdateType.go index 341f9ac33d1..7cc3d116232 100644 --- a/service/appsync/api_op_UpdateType.go +++ b/service/appsync/api_op_UpdateType.go @@ -5,7 +5,6 @@ package appsync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/appsync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateType(ctx context.Context, params *UpdateTypeInput, optFns addawsRestjson1_serdeOpUpdateTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/appsync/endpoints.go b/service/appsync/endpoints.go index 36d7b6bcd3c..8edabc783a0 100644 --- a/service/appsync/endpoints.go +++ b/service/appsync/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/athena/api_client.go b/service/athena/api_client.go index 8c2b4785ad6..1ebdd13300f 100644 --- a/service/athena/api_client.go +++ b/service/athena/api_client.go @@ -99,34 +99,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -199,6 +171,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/athena/api_op_BatchGetNamedQuery.go b/service/athena/api_op_BatchGetNamedQuery.go index baf7ac5a05d..eca49912d76 100644 --- a/service/athena/api_op_BatchGetNamedQuery.go +++ b/service/athena/api_op_BatchGetNamedQuery.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) BatchGetNamedQuery(ctx context.Context, params *BatchGetNamedQu addawsAwsjson11_serdeOpBatchGetNamedQueryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_BatchGetQueryExecution.go b/service/athena/api_op_BatchGetQueryExecution.go index 56e03ec8473..c5783e326e5 100644 --- a/service/athena/api_op_BatchGetQueryExecution.go +++ b/service/athena/api_op_BatchGetQueryExecution.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) BatchGetQueryExecution(ctx context.Context, params *BatchGetQue addawsAwsjson11_serdeOpBatchGetQueryExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_CreateDataCatalog.go b/service/athena/api_op_CreateDataCatalog.go index 6cbe3f3ad7d..8a7b175c820 100644 --- a/service/athena/api_op_CreateDataCatalog.go +++ b/service/athena/api_op_CreateDataCatalog.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateDataCatalog(ctx context.Context, params *CreateDataCatalo addawsAwsjson11_serdeOpCreateDataCatalogMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_CreateNamedQuery.go b/service/athena/api_op_CreateNamedQuery.go index 3d6937647ad..7c8fd71a80e 100644 --- a/service/athena/api_op_CreateNamedQuery.go +++ b/service/athena/api_op_CreateNamedQuery.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) CreateNamedQuery(ctx context.Context, params *CreateNamedQueryI addawsAwsjson11_serdeOpCreateNamedQueryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_CreateWorkGroup.go b/service/athena/api_op_CreateWorkGroup.go index ff6448dcbac..a29e1f61daf 100644 --- a/service/athena/api_op_CreateWorkGroup.go +++ b/service/athena/api_op_CreateWorkGroup.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateWorkGroup(ctx context.Context, params *CreateWorkGroupInp addawsAwsjson11_serdeOpCreateWorkGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_DeleteDataCatalog.go b/service/athena/api_op_DeleteDataCatalog.go index 7d8a4ff83e4..57141f4d74a 100644 --- a/service/athena/api_op_DeleteDataCatalog.go +++ b/service/athena/api_op_DeleteDataCatalog.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDataCatalog(ctx context.Context, params *DeleteDataCatalo addawsAwsjson11_serdeOpDeleteDataCatalogMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_DeleteNamedQuery.go b/service/athena/api_op_DeleteNamedQuery.go index 2dc91360894..51ed5b97b20 100644 --- a/service/athena/api_op_DeleteNamedQuery.go +++ b/service/athena/api_op_DeleteNamedQuery.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteNamedQuery(ctx context.Context, params *DeleteNamedQueryI addawsAwsjson11_serdeOpDeleteNamedQueryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_DeleteWorkGroup.go b/service/athena/api_op_DeleteWorkGroup.go index be0c1b8846f..6824fe92637 100644 --- a/service/athena/api_op_DeleteWorkGroup.go +++ b/service/athena/api_op_DeleteWorkGroup.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteWorkGroup(ctx context.Context, params *DeleteWorkGroupInp addawsAwsjson11_serdeOpDeleteWorkGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_GetDataCatalog.go b/service/athena/api_op_GetDataCatalog.go index 024b333d095..20ad2696b43 100644 --- a/service/athena/api_op_GetDataCatalog.go +++ b/service/athena/api_op_GetDataCatalog.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDataCatalog(ctx context.Context, params *GetDataCatalogInput addawsAwsjson11_serdeOpGetDataCatalogMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_GetDatabase.go b/service/athena/api_op_GetDatabase.go index cf4575bd6e4..74e2ab05503 100644 --- a/service/athena/api_op_GetDatabase.go +++ b/service/athena/api_op_GetDatabase.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDatabase(ctx context.Context, params *GetDatabaseInput, optF addawsAwsjson11_serdeOpGetDatabaseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_GetNamedQuery.go b/service/athena/api_op_GetNamedQuery.go index 3c0c9def4ff..8f445c606d6 100644 --- a/service/athena/api_op_GetNamedQuery.go +++ b/service/athena/api_op_GetNamedQuery.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetNamedQuery(ctx context.Context, params *GetNamedQueryInput, addawsAwsjson11_serdeOpGetNamedQueryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_GetQueryExecution.go b/service/athena/api_op_GetQueryExecution.go index 1b7593f29a9..d237cc113e0 100644 --- a/service/athena/api_op_GetQueryExecution.go +++ b/service/athena/api_op_GetQueryExecution.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetQueryExecution(ctx context.Context, params *GetQueryExecutio addawsAwsjson11_serdeOpGetQueryExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_GetQueryResults.go b/service/athena/api_op_GetQueryResults.go index 7a4d6fdc16b..674e33d5539 100644 --- a/service/athena/api_op_GetQueryResults.go +++ b/service/athena/api_op_GetQueryResults.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) GetQueryResults(ctx context.Context, params *GetQueryResultsInp addawsAwsjson11_serdeOpGetQueryResultsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_GetTableMetadata.go b/service/athena/api_op_GetTableMetadata.go index c501430491b..57752b88f83 100644 --- a/service/athena/api_op_GetTableMetadata.go +++ b/service/athena/api_op_GetTableMetadata.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetTableMetadata(ctx context.Context, params *GetTableMetadataI addawsAwsjson11_serdeOpGetTableMetadataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_GetWorkGroup.go b/service/athena/api_op_GetWorkGroup.go index 08fdd3c0b27..93e90e04858 100644 --- a/service/athena/api_op_GetWorkGroup.go +++ b/service/athena/api_op_GetWorkGroup.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetWorkGroup(ctx context.Context, params *GetWorkGroupInput, op addawsAwsjson11_serdeOpGetWorkGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_ListDataCatalogs.go b/service/athena/api_op_ListDataCatalogs.go index e242e7a9eee..5f9427ff3af 100644 --- a/service/athena/api_op_ListDataCatalogs.go +++ b/service/athena/api_op_ListDataCatalogs.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDataCatalogs(ctx context.Context, params *ListDataCatalogsI addawsAwsjson11_serdeOpListDataCatalogsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_ListDatabases.go b/service/athena/api_op_ListDatabases.go index b394b58d670..0c9a05800ea 100644 --- a/service/athena/api_op_ListDatabases.go +++ b/service/athena/api_op_ListDatabases.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDatabases(ctx context.Context, params *ListDatabasesInput, addawsAwsjson11_serdeOpListDatabasesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_ListNamedQueries.go b/service/athena/api_op_ListNamedQueries.go index e5571f903ae..d6724be533e 100644 --- a/service/athena/api_op_ListNamedQueries.go +++ b/service/athena/api_op_ListNamedQueries.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) ListNamedQueries(ctx context.Context, params *ListNamedQueriesI addawsAwsjson11_serdeOpListNamedQueriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_ListQueryExecutions.go b/service/athena/api_op_ListQueryExecutions.go index 504802f738b..52470a023ad 100644 --- a/service/athena/api_op_ListQueryExecutions.go +++ b/service/athena/api_op_ListQueryExecutions.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) ListQueryExecutions(ctx context.Context, params *ListQueryExecu addawsAwsjson11_serdeOpListQueryExecutionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_ListTableMetadata.go b/service/athena/api_op_ListTableMetadata.go index 697e1e7c980..962de59a0d0 100644 --- a/service/athena/api_op_ListTableMetadata.go +++ b/service/athena/api_op_ListTableMetadata.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTableMetadata(ctx context.Context, params *ListTableMetadat addawsAwsjson11_serdeOpListTableMetadataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_ListTagsForResource.go b/service/athena/api_op_ListTagsForResource.go index 0b40f80da52..069dae9811a 100644 --- a/service/athena/api_op_ListTagsForResource.go +++ b/service/athena/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_ListWorkGroups.go b/service/athena/api_op_ListWorkGroups.go index 10456954929..b9c13bfe71d 100644 --- a/service/athena/api_op_ListWorkGroups.go +++ b/service/athena/api_op_ListWorkGroups.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListWorkGroups(ctx context.Context, params *ListWorkGroupsInput addawsAwsjson11_serdeOpListWorkGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_StartQueryExecution.go b/service/athena/api_op_StartQueryExecution.go index 6f2fa38fadb..ae8a4a04e78 100644 --- a/service/athena/api_op_StartQueryExecution.go +++ b/service/athena/api_op_StartQueryExecution.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) StartQueryExecution(ctx context.Context, params *StartQueryExec addawsAwsjson11_serdeOpStartQueryExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_StopQueryExecution.go b/service/athena/api_op_StopQueryExecution.go index 5b4b82eb131..0492889d1bb 100644 --- a/service/athena/api_op_StopQueryExecution.go +++ b/service/athena/api_op_StopQueryExecution.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) StopQueryExecution(ctx context.Context, params *StopQueryExecut addawsAwsjson11_serdeOpStopQueryExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_TagResource.go b/service/athena/api_op_TagResource.go index edf6704c1d3..49339726f97 100644 --- a/service/athena/api_op_TagResource.go +++ b/service/athena/api_op_TagResource.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_UntagResource.go b/service/athena/api_op_UntagResource.go index 0e647f3bdb5..e265b65c2a8 100644 --- a/service/athena/api_op_UntagResource.go +++ b/service/athena/api_op_UntagResource.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_UpdateDataCatalog.go b/service/athena/api_op_UpdateDataCatalog.go index e86ae91a36a..601191eb74e 100644 --- a/service/athena/api_op_UpdateDataCatalog.go +++ b/service/athena/api_op_UpdateDataCatalog.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDataCatalog(ctx context.Context, params *UpdateDataCatalo addawsAwsjson11_serdeOpUpdateDataCatalogMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/api_op_UpdateWorkGroup.go b/service/athena/api_op_UpdateWorkGroup.go index 02fba1ad78a..35ed125a470 100644 --- a/service/athena/api_op_UpdateWorkGroup.go +++ b/service/athena/api_op_UpdateWorkGroup.go @@ -5,7 +5,6 @@ package athena import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/athena/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateWorkGroup(ctx context.Context, params *UpdateWorkGroupInp addawsAwsjson11_serdeOpUpdateWorkGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/athena/endpoints.go b/service/athena/endpoints.go index 607309281cc..1ad78df4892 100644 --- a/service/athena/endpoints.go +++ b/service/athena/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/autoscaling/api_client.go b/service/autoscaling/api_client.go index 268425a280b..e4b7bfa2ff9 100644 --- a/service/autoscaling/api_client.go +++ b/service/autoscaling/api_client.go @@ -84,30 +84,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -173,6 +149,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/autoscaling/api_op_AttachInstances.go b/service/autoscaling/api_op_AttachInstances.go index c32892523e3..54a07ad3099 100644 --- a/service/autoscaling/api_op_AttachInstances.go +++ b/service/autoscaling/api_op_AttachInstances.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) AttachInstances(ctx context.Context, params *AttachInstancesInp addawsAwsquery_serdeOpAttachInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_AttachLoadBalancerTargetGroups.go b/service/autoscaling/api_op_AttachLoadBalancerTargetGroups.go index 864f5199ae3..a066483fae3 100644 --- a/service/autoscaling/api_op_AttachLoadBalancerTargetGroups.go +++ b/service/autoscaling/api_op_AttachLoadBalancerTargetGroups.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) AttachLoadBalancerTargetGroups(ctx context.Context, params *Att addawsAwsquery_serdeOpAttachLoadBalancerTargetGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_AttachLoadBalancers.go b/service/autoscaling/api_op_AttachLoadBalancers.go index 14637aba165..74c0602ed75 100644 --- a/service/autoscaling/api_op_AttachLoadBalancers.go +++ b/service/autoscaling/api_op_AttachLoadBalancers.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) AttachLoadBalancers(ctx context.Context, params *AttachLoadBala addawsAwsquery_serdeOpAttachLoadBalancersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_BatchDeleteScheduledAction.go b/service/autoscaling/api_op_BatchDeleteScheduledAction.go index edd67117741..9046cf5db1e 100644 --- a/service/autoscaling/api_op_BatchDeleteScheduledAction.go +++ b/service/autoscaling/api_op_BatchDeleteScheduledAction.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchDeleteScheduledAction(ctx context.Context, params *BatchDe addawsAwsquery_serdeOpBatchDeleteScheduledActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_BatchPutScheduledUpdateGroupAction.go b/service/autoscaling/api_op_BatchPutScheduledUpdateGroupAction.go index 74dee0ea3f5..ce492080bfe 100644 --- a/service/autoscaling/api_op_BatchPutScheduledUpdateGroupAction.go +++ b/service/autoscaling/api_op_BatchPutScheduledUpdateGroupAction.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) BatchPutScheduledUpdateGroupAction(ctx context.Context, params addawsAwsquery_serdeOpBatchPutScheduledUpdateGroupActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_CancelInstanceRefresh.go b/service/autoscaling/api_op_CancelInstanceRefresh.go index b56632a7f55..62c0ad29b29 100644 --- a/service/autoscaling/api_op_CancelInstanceRefresh.go +++ b/service/autoscaling/api_op_CancelInstanceRefresh.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) CancelInstanceRefresh(ctx context.Context, params *CancelInstan addawsAwsquery_serdeOpCancelInstanceRefreshMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_CompleteLifecycleAction.go b/service/autoscaling/api_op_CompleteLifecycleAction.go index 49efa321b4a..b70dd149cb2 100644 --- a/service/autoscaling/api_op_CompleteLifecycleAction.go +++ b/service/autoscaling/api_op_CompleteLifecycleAction.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -48,9 +47,9 @@ func (c *Client) CompleteLifecycleAction(ctx context.Context, params *CompleteLi addawsAwsquery_serdeOpCompleteLifecycleActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_CreateAutoScalingGroup.go b/service/autoscaling/api_op_CreateAutoScalingGroup.go index b9adb24449b..a141f792502 100644 --- a/service/autoscaling/api_op_CreateAutoScalingGroup.go +++ b/service/autoscaling/api_op_CreateAutoScalingGroup.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) CreateAutoScalingGroup(ctx context.Context, params *CreateAutoS addawsAwsquery_serdeOpCreateAutoScalingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_CreateLaunchConfiguration.go b/service/autoscaling/api_op_CreateLaunchConfiguration.go index 828dac94cde..8175b89663b 100644 --- a/service/autoscaling/api_op_CreateLaunchConfiguration.go +++ b/service/autoscaling/api_op_CreateLaunchConfiguration.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateLaunchConfiguration(ctx context.Context, params *CreateLa addawsAwsquery_serdeOpCreateLaunchConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_CreateOrUpdateTags.go b/service/autoscaling/api_op_CreateOrUpdateTags.go index 58b1147fec2..190e959e859 100644 --- a/service/autoscaling/api_op_CreateOrUpdateTags.go +++ b/service/autoscaling/api_op_CreateOrUpdateTags.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateOrUpdateTags(ctx context.Context, params *CreateOrUpdateT addawsAwsquery_serdeOpCreateOrUpdateTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DeleteAutoScalingGroup.go b/service/autoscaling/api_op_DeleteAutoScalingGroup.go index 9e20d582050..485b8607501 100644 --- a/service/autoscaling/api_op_DeleteAutoScalingGroup.go +++ b/service/autoscaling/api_op_DeleteAutoScalingGroup.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) DeleteAutoScalingGroup(ctx context.Context, params *DeleteAutoS addawsAwsquery_serdeOpDeleteAutoScalingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DeleteLaunchConfiguration.go b/service/autoscaling/api_op_DeleteLaunchConfiguration.go index 92024e8699c..06afe0e8af8 100644 --- a/service/autoscaling/api_op_DeleteLaunchConfiguration.go +++ b/service/autoscaling/api_op_DeleteLaunchConfiguration.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteLaunchConfiguration(ctx context.Context, params *DeleteLa addawsAwsquery_serdeOpDeleteLaunchConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DeleteLifecycleHook.go b/service/autoscaling/api_op_DeleteLifecycleHook.go index afb85469812..d896e203bbc 100644 --- a/service/autoscaling/api_op_DeleteLifecycleHook.go +++ b/service/autoscaling/api_op_DeleteLifecycleHook.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteLifecycleHook(ctx context.Context, params *DeleteLifecycl addawsAwsquery_serdeOpDeleteLifecycleHookMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DeleteNotificationConfiguration.go b/service/autoscaling/api_op_DeleteNotificationConfiguration.go index e3905a5ba22..d37404f16af 100644 --- a/service/autoscaling/api_op_DeleteNotificationConfiguration.go +++ b/service/autoscaling/api_op_DeleteNotificationConfiguration.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteNotificationConfiguration(ctx context.Context, params *De addawsAwsquery_serdeOpDeleteNotificationConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DeletePolicy.go b/service/autoscaling/api_op_DeletePolicy.go index 725b7e5becb..5d0df4b8296 100644 --- a/service/autoscaling/api_op_DeletePolicy.go +++ b/service/autoscaling/api_op_DeletePolicy.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeletePolicy(ctx context.Context, params *DeletePolicyInput, op addawsAwsquery_serdeOpDeletePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DeleteScheduledAction.go b/service/autoscaling/api_op_DeleteScheduledAction.go index e31fde401b0..c12bda0dae5 100644 --- a/service/autoscaling/api_op_DeleteScheduledAction.go +++ b/service/autoscaling/api_op_DeleteScheduledAction.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteScheduledAction(ctx context.Context, params *DeleteSchedu addawsAwsquery_serdeOpDeleteScheduledActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DeleteTags.go b/service/autoscaling/api_op_DeleteTags.go index d176de92a06..75ed37a918d 100644 --- a/service/autoscaling/api_op_DeleteTags.go +++ b/service/autoscaling/api_op_DeleteTags.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteTags(ctx context.Context, params *DeleteTagsInput, optFns addawsAwsquery_serdeOpDeleteTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribeAccountLimits.go b/service/autoscaling/api_op_DescribeAccountLimits.go index 19bf9c0a058..510df3bed0d 100644 --- a/service/autoscaling/api_op_DescribeAccountLimits.go +++ b/service/autoscaling/api_op_DescribeAccountLimits.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DescribeAccountLimits(ctx context.Context, params *DescribeAcco addawsAwsquery_serdeOpDescribeAccountLimitsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribeAdjustmentTypes.go b/service/autoscaling/api_op_DescribeAdjustmentTypes.go index cbd64514f92..5722e255ac5 100644 --- a/service/autoscaling/api_op_DescribeAdjustmentTypes.go +++ b/service/autoscaling/api_op_DescribeAdjustmentTypes.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) DescribeAdjustmentTypes(ctx context.Context, params *DescribeAd addawsAwsquery_serdeOpDescribeAdjustmentTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribeAutoScalingGroups.go b/service/autoscaling/api_op_DescribeAutoScalingGroups.go index b66ee8ee743..79099687486 100644 --- a/service/autoscaling/api_op_DescribeAutoScalingGroups.go +++ b/service/autoscaling/api_op_DescribeAutoScalingGroups.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeAutoScalingGroups(ctx context.Context, params *Describe addawsAwsquery_serdeOpDescribeAutoScalingGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribeAutoScalingInstances.go b/service/autoscaling/api_op_DescribeAutoScalingInstances.go index 4f01246bcc1..a9884af52e0 100644 --- a/service/autoscaling/api_op_DescribeAutoScalingInstances.go +++ b/service/autoscaling/api_op_DescribeAutoScalingInstances.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeAutoScalingInstances(ctx context.Context, params *Descr addawsAwsquery_serdeOpDescribeAutoScalingInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribeAutoScalingNotificationTypes.go b/service/autoscaling/api_op_DescribeAutoScalingNotificationTypes.go index 383436dbae5..0bbd8070417 100644 --- a/service/autoscaling/api_op_DescribeAutoScalingNotificationTypes.go +++ b/service/autoscaling/api_op_DescribeAutoScalingNotificationTypes.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DescribeAutoScalingNotificationTypes(ctx context.Context, param addawsAwsquery_serdeOpDescribeAutoScalingNotificationTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribeInstanceRefreshes.go b/service/autoscaling/api_op_DescribeInstanceRefreshes.go index 3c4ffc2f36f..0fe4924ae78 100644 --- a/service/autoscaling/api_op_DescribeInstanceRefreshes.go +++ b/service/autoscaling/api_op_DescribeInstanceRefreshes.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -48,9 +47,9 @@ func (c *Client) DescribeInstanceRefreshes(ctx context.Context, params *Describe addawsAwsquery_serdeOpDescribeInstanceRefreshesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribeLaunchConfigurations.go b/service/autoscaling/api_op_DescribeLaunchConfigurations.go index 81aa8c6c4ce..c15bafb20df 100644 --- a/service/autoscaling/api_op_DescribeLaunchConfigurations.go +++ b/service/autoscaling/api_op_DescribeLaunchConfigurations.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeLaunchConfigurations(ctx context.Context, params *Descr addawsAwsquery_serdeOpDescribeLaunchConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribeLifecycleHookTypes.go b/service/autoscaling/api_op_DescribeLifecycleHookTypes.go index 2d0cdeccd56..915933a4a52 100644 --- a/service/autoscaling/api_op_DescribeLifecycleHookTypes.go +++ b/service/autoscaling/api_op_DescribeLifecycleHookTypes.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DescribeLifecycleHookTypes(ctx context.Context, params *Describ addawsAwsquery_serdeOpDescribeLifecycleHookTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribeLifecycleHooks.go b/service/autoscaling/api_op_DescribeLifecycleHooks.go index 676f3b6497d..42e94912461 100644 --- a/service/autoscaling/api_op_DescribeLifecycleHooks.go +++ b/service/autoscaling/api_op_DescribeLifecycleHooks.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeLifecycleHooks(ctx context.Context, params *DescribeLif addawsAwsquery_serdeOpDescribeLifecycleHooksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribeLoadBalancerTargetGroups.go b/service/autoscaling/api_op_DescribeLoadBalancerTargetGroups.go index c617a776c61..c60ea4e2dfc 100644 --- a/service/autoscaling/api_op_DescribeLoadBalancerTargetGroups.go +++ b/service/autoscaling/api_op_DescribeLoadBalancerTargetGroups.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeLoadBalancerTargetGroups(ctx context.Context, params *D addawsAwsquery_serdeOpDescribeLoadBalancerTargetGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribeLoadBalancers.go b/service/autoscaling/api_op_DescribeLoadBalancers.go index fc5ef2ee9e6..dd3150cdce6 100644 --- a/service/autoscaling/api_op_DescribeLoadBalancers.go +++ b/service/autoscaling/api_op_DescribeLoadBalancers.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeLoadBalancers(ctx context.Context, params *DescribeLoad addawsAwsquery_serdeOpDescribeLoadBalancersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribeMetricCollectionTypes.go b/service/autoscaling/api_op_DescribeMetricCollectionTypes.go index cc58b87c3c9..0fbf9d8edfc 100644 --- a/service/autoscaling/api_op_DescribeMetricCollectionTypes.go +++ b/service/autoscaling/api_op_DescribeMetricCollectionTypes.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeMetricCollectionTypes(ctx context.Context, params *Desc addawsAwsquery_serdeOpDescribeMetricCollectionTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribeNotificationConfigurations.go b/service/autoscaling/api_op_DescribeNotificationConfigurations.go index 2e138dc5d58..5e30304f235 100644 --- a/service/autoscaling/api_op_DescribeNotificationConfigurations.go +++ b/service/autoscaling/api_op_DescribeNotificationConfigurations.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeNotificationConfigurations(ctx context.Context, params addawsAwsquery_serdeOpDescribeNotificationConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribePolicies.go b/service/autoscaling/api_op_DescribePolicies.go index 54e922cd7c7..4309c57cb4b 100644 --- a/service/autoscaling/api_op_DescribePolicies.go +++ b/service/autoscaling/api_op_DescribePolicies.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribePolicies(ctx context.Context, params *DescribePoliciesI addawsAwsquery_serdeOpDescribePoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribeScalingActivities.go b/service/autoscaling/api_op_DescribeScalingActivities.go index 7f5175467eb..b0f6a09f33a 100644 --- a/service/autoscaling/api_op_DescribeScalingActivities.go +++ b/service/autoscaling/api_op_DescribeScalingActivities.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeScalingActivities(ctx context.Context, params *Describe addawsAwsquery_serdeOpDescribeScalingActivitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribeScalingProcessTypes.go b/service/autoscaling/api_op_DescribeScalingProcessTypes.go index 9018c2e354f..42db02f765c 100644 --- a/service/autoscaling/api_op_DescribeScalingProcessTypes.go +++ b/service/autoscaling/api_op_DescribeScalingProcessTypes.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeScalingProcessTypes(ctx context.Context, params *Descri addawsAwsquery_serdeOpDescribeScalingProcessTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribeScheduledActions.go b/service/autoscaling/api_op_DescribeScheduledActions.go index fb52293f08c..6f926774e00 100644 --- a/service/autoscaling/api_op_DescribeScheduledActions.go +++ b/service/autoscaling/api_op_DescribeScheduledActions.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeScheduledActions(ctx context.Context, params *DescribeS addawsAwsquery_serdeOpDescribeScheduledActionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribeTags.go b/service/autoscaling/api_op_DescribeTags.go index b7f24bffc50..ea5574adeca 100644 --- a/service/autoscaling/api_op_DescribeTags.go +++ b/service/autoscaling/api_op_DescribeTags.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DescribeTags(ctx context.Context, params *DescribeTagsInput, op addawsAwsquery_serdeOpDescribeTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DescribeTerminationPolicyTypes.go b/service/autoscaling/api_op_DescribeTerminationPolicyTypes.go index 082a5f397c2..7cdcfaf250c 100644 --- a/service/autoscaling/api_op_DescribeTerminationPolicyTypes.go +++ b/service/autoscaling/api_op_DescribeTerminationPolicyTypes.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DescribeTerminationPolicyTypes(ctx context.Context, params *Des addawsAwsquery_serdeOpDescribeTerminationPolicyTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DetachInstances.go b/service/autoscaling/api_op_DetachInstances.go index 03369bd9eb8..e96b8b0e452 100644 --- a/service/autoscaling/api_op_DetachInstances.go +++ b/service/autoscaling/api_op_DetachInstances.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) DetachInstances(ctx context.Context, params *DetachInstancesInp addawsAwsquery_serdeOpDetachInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DetachLoadBalancerTargetGroups.go b/service/autoscaling/api_op_DetachLoadBalancerTargetGroups.go index 2fd736452f9..5f63fb43191 100644 --- a/service/autoscaling/api_op_DetachLoadBalancerTargetGroups.go +++ b/service/autoscaling/api_op_DetachLoadBalancerTargetGroups.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DetachLoadBalancerTargetGroups(ctx context.Context, params *Det addawsAwsquery_serdeOpDetachLoadBalancerTargetGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DetachLoadBalancers.go b/service/autoscaling/api_op_DetachLoadBalancers.go index 172e66ff076..88e982437ee 100644 --- a/service/autoscaling/api_op_DetachLoadBalancers.go +++ b/service/autoscaling/api_op_DetachLoadBalancers.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DetachLoadBalancers(ctx context.Context, params *DetachLoadBala addawsAwsquery_serdeOpDetachLoadBalancersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_DisableMetricsCollection.go b/service/autoscaling/api_op_DisableMetricsCollection.go index 470e535baeb..f462d0c3843 100644 --- a/service/autoscaling/api_op_DisableMetricsCollection.go +++ b/service/autoscaling/api_op_DisableMetricsCollection.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisableMetricsCollection(ctx context.Context, params *DisableMe addawsAwsquery_serdeOpDisableMetricsCollectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_EnableMetricsCollection.go b/service/autoscaling/api_op_EnableMetricsCollection.go index 3585bb4bd06..6cab740a37e 100644 --- a/service/autoscaling/api_op_EnableMetricsCollection.go +++ b/service/autoscaling/api_op_EnableMetricsCollection.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) EnableMetricsCollection(ctx context.Context, params *EnableMetr addawsAwsquery_serdeOpEnableMetricsCollectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_EnterStandby.go b/service/autoscaling/api_op_EnterStandby.go index bbcb60f7e44..602922d4dfc 100644 --- a/service/autoscaling/api_op_EnterStandby.go +++ b/service/autoscaling/api_op_EnterStandby.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) EnterStandby(ctx context.Context, params *EnterStandbyInput, op addawsAwsquery_serdeOpEnterStandbyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_ExecutePolicy.go b/service/autoscaling/api_op_ExecutePolicy.go index 956429a2012..13f9a8e6ece 100644 --- a/service/autoscaling/api_op_ExecutePolicy.go +++ b/service/autoscaling/api_op_ExecutePolicy.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ExecutePolicy(ctx context.Context, params *ExecutePolicyInput, addawsAwsquery_serdeOpExecutePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_ExitStandby.go b/service/autoscaling/api_op_ExitStandby.go index 04b856f9f12..cd16bc789f2 100644 --- a/service/autoscaling/api_op_ExitStandby.go +++ b/service/autoscaling/api_op_ExitStandby.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ExitStandby(ctx context.Context, params *ExitStandbyInput, optF addawsAwsquery_serdeOpExitStandbyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_PutLifecycleHook.go b/service/autoscaling/api_op_PutLifecycleHook.go index 22a2bf9482d..3762d92d9a9 100644 --- a/service/autoscaling/api_op_PutLifecycleHook.go +++ b/service/autoscaling/api_op_PutLifecycleHook.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -55,9 +54,9 @@ func (c *Client) PutLifecycleHook(ctx context.Context, params *PutLifecycleHookI addawsAwsquery_serdeOpPutLifecycleHookMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_PutNotificationConfiguration.go b/service/autoscaling/api_op_PutNotificationConfiguration.go index 77080122316..86975cca0c4 100644 --- a/service/autoscaling/api_op_PutNotificationConfiguration.go +++ b/service/autoscaling/api_op_PutNotificationConfiguration.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) PutNotificationConfiguration(ctx context.Context, params *PutNo addawsAwsquery_serdeOpPutNotificationConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_PutScalingPolicy.go b/service/autoscaling/api_op_PutScalingPolicy.go index 40a5e29a180..f683b83aa5e 100644 --- a/service/autoscaling/api_op_PutScalingPolicy.go +++ b/service/autoscaling/api_op_PutScalingPolicy.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) PutScalingPolicy(ctx context.Context, params *PutScalingPolicyI addawsAwsquery_serdeOpPutScalingPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_PutScheduledUpdateGroupAction.go b/service/autoscaling/api_op_PutScheduledUpdateGroupAction.go index 13752eefe8f..a067c2b6c63 100644 --- a/service/autoscaling/api_op_PutScheduledUpdateGroupAction.go +++ b/service/autoscaling/api_op_PutScheduledUpdateGroupAction.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) PutScheduledUpdateGroupAction(ctx context.Context, params *PutS addawsAwsquery_serdeOpPutScheduledUpdateGroupActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_RecordLifecycleActionHeartbeat.go b/service/autoscaling/api_op_RecordLifecycleActionHeartbeat.go index b06851e5b66..1054c502747 100644 --- a/service/autoscaling/api_op_RecordLifecycleActionHeartbeat.go +++ b/service/autoscaling/api_op_RecordLifecycleActionHeartbeat.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -38,9 +37,9 @@ func (c *Client) RecordLifecycleActionHeartbeat(ctx context.Context, params *Rec addawsAwsquery_serdeOpRecordLifecycleActionHeartbeatMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_ResumeProcesses.go b/service/autoscaling/api_op_ResumeProcesses.go index bc05bde1ff4..fceadb0d604 100644 --- a/service/autoscaling/api_op_ResumeProcesses.go +++ b/service/autoscaling/api_op_ResumeProcesses.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) ResumeProcesses(ctx context.Context, params *ResumeProcessesInp addawsAwsquery_serdeOpResumeProcessesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_SetDesiredCapacity.go b/service/autoscaling/api_op_SetDesiredCapacity.go index 9b485584293..d26d985ce93 100644 --- a/service/autoscaling/api_op_SetDesiredCapacity.go +++ b/service/autoscaling/api_op_SetDesiredCapacity.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) SetDesiredCapacity(ctx context.Context, params *SetDesiredCapac addawsAwsquery_serdeOpSetDesiredCapacityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_SetInstanceHealth.go b/service/autoscaling/api_op_SetInstanceHealth.go index 1769df55110..bb514e28037 100644 --- a/service/autoscaling/api_op_SetInstanceHealth.go +++ b/service/autoscaling/api_op_SetInstanceHealth.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) SetInstanceHealth(ctx context.Context, params *SetInstanceHealt addawsAwsquery_serdeOpSetInstanceHealthMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_SetInstanceProtection.go b/service/autoscaling/api_op_SetInstanceProtection.go index 651c6237df3..b3827cca047 100644 --- a/service/autoscaling/api_op_SetInstanceProtection.go +++ b/service/autoscaling/api_op_SetInstanceProtection.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) SetInstanceProtection(ctx context.Context, params *SetInstanceP addawsAwsquery_serdeOpSetInstanceProtectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_StartInstanceRefresh.go b/service/autoscaling/api_op_StartInstanceRefresh.go index 24806a7452a..098395b7847 100644 --- a/service/autoscaling/api_op_StartInstanceRefresh.go +++ b/service/autoscaling/api_op_StartInstanceRefresh.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) StartInstanceRefresh(ctx context.Context, params *StartInstance addawsAwsquery_serdeOpStartInstanceRefreshMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_SuspendProcesses.go b/service/autoscaling/api_op_SuspendProcesses.go index 39faf7e6088..dc9f23aafb2 100644 --- a/service/autoscaling/api_op_SuspendProcesses.go +++ b/service/autoscaling/api_op_SuspendProcesses.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) SuspendProcesses(ctx context.Context, params *SuspendProcessesI addawsAwsquery_serdeOpSuspendProcessesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_TerminateInstanceInAutoScalingGroup.go b/service/autoscaling/api_op_TerminateInstanceInAutoScalingGroup.go index 0faa43d2ad2..c978fe41c71 100644 --- a/service/autoscaling/api_op_TerminateInstanceInAutoScalingGroup.go +++ b/service/autoscaling/api_op_TerminateInstanceInAutoScalingGroup.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) TerminateInstanceInAutoScalingGroup(ctx context.Context, params addawsAwsquery_serdeOpTerminateInstanceInAutoScalingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/api_op_UpdateAutoScalingGroup.go b/service/autoscaling/api_op_UpdateAutoScalingGroup.go index bb6a7538c77..a88b6b8859a 100644 --- a/service/autoscaling/api_op_UpdateAutoScalingGroup.go +++ b/service/autoscaling/api_op_UpdateAutoScalingGroup.go @@ -5,7 +5,6 @@ package autoscaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" smithy "github.com/awslabs/smithy-go" @@ -59,9 +58,9 @@ func (c *Client) UpdateAutoScalingGroup(ctx context.Context, params *UpdateAutoS addawsAwsquery_serdeOpUpdateAutoScalingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscaling/endpoints.go b/service/autoscaling/endpoints.go index 50b846e3d99..47111cb3680 100644 --- a/service/autoscaling/endpoints.go +++ b/service/autoscaling/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/autoscalingplans/api_client.go b/service/autoscalingplans/api_client.go index e5cbd0a4b91..b27bf360ede 100644 --- a/service/autoscalingplans/api_client.go +++ b/service/autoscalingplans/api_client.go @@ -85,30 +85,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -174,6 +150,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/autoscalingplans/api_op_CreateScalingPlan.go b/service/autoscalingplans/api_op_CreateScalingPlan.go index 8eea9690b1d..419dd6a482d 100644 --- a/service/autoscalingplans/api_op_CreateScalingPlan.go +++ b/service/autoscalingplans/api_op_CreateScalingPlan.go @@ -5,7 +5,6 @@ package autoscalingplans import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscalingplans/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateScalingPlan(ctx context.Context, params *CreateScalingPla addawsAwsjson11_serdeOpCreateScalingPlanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscalingplans/api_op_DeleteScalingPlan.go b/service/autoscalingplans/api_op_DeleteScalingPlan.go index 9967a2edea4..3162151f539 100644 --- a/service/autoscalingplans/api_op_DeleteScalingPlan.go +++ b/service/autoscalingplans/api_op_DeleteScalingPlan.go @@ -5,7 +5,6 @@ package autoscalingplans import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteScalingPlan(ctx context.Context, params *DeleteScalingPla addawsAwsjson11_serdeOpDeleteScalingPlanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscalingplans/api_op_DescribeScalingPlanResources.go b/service/autoscalingplans/api_op_DescribeScalingPlanResources.go index 00178c1a1a8..b05f83dbd2f 100644 --- a/service/autoscalingplans/api_op_DescribeScalingPlanResources.go +++ b/service/autoscalingplans/api_op_DescribeScalingPlanResources.go @@ -5,7 +5,6 @@ package autoscalingplans import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscalingplans/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeScalingPlanResources(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribeScalingPlanResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscalingplans/api_op_DescribeScalingPlans.go b/service/autoscalingplans/api_op_DescribeScalingPlans.go index bdac548eb8a..52e963e3ca0 100644 --- a/service/autoscalingplans/api_op_DescribeScalingPlans.go +++ b/service/autoscalingplans/api_op_DescribeScalingPlans.go @@ -5,7 +5,6 @@ package autoscalingplans import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscalingplans/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeScalingPlans(ctx context.Context, params *DescribeScali addawsAwsjson11_serdeOpDescribeScalingPlansMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscalingplans/api_op_GetScalingPlanResourceForecastData.go b/service/autoscalingplans/api_op_GetScalingPlanResourceForecastData.go index 4c9246cebb9..30d7db42754 100644 --- a/service/autoscalingplans/api_op_GetScalingPlanResourceForecastData.go +++ b/service/autoscalingplans/api_op_GetScalingPlanResourceForecastData.go @@ -5,7 +5,6 @@ package autoscalingplans import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscalingplans/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetScalingPlanResourceForecastData(ctx context.Context, params addawsAwsjson11_serdeOpGetScalingPlanResourceForecastDataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscalingplans/api_op_UpdateScalingPlan.go b/service/autoscalingplans/api_op_UpdateScalingPlan.go index 155c2af3ddb..dc512e77abe 100644 --- a/service/autoscalingplans/api_op_UpdateScalingPlan.go +++ b/service/autoscalingplans/api_op_UpdateScalingPlan.go @@ -5,7 +5,6 @@ package autoscalingplans import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/autoscalingplans/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateScalingPlan(ctx context.Context, params *UpdateScalingPla addawsAwsjson11_serdeOpUpdateScalingPlanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/autoscalingplans/endpoints.go b/service/autoscalingplans/endpoints.go index 893a390a8f0..8c7a8a1b6f3 100644 --- a/service/autoscalingplans/endpoints.go +++ b/service/autoscalingplans/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/backup/api_client.go b/service/backup/api_client.go index 971b1474307..b8c8730e19d 100644 --- a/service/backup/api_client.go +++ b/service/backup/api_client.go @@ -80,30 +80,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -169,6 +145,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/backup/api_op_CreateBackupPlan.go b/service/backup/api_op_CreateBackupPlan.go index 87e4649b7f2..9ceb278e8aa 100644 --- a/service/backup/api_op_CreateBackupPlan.go +++ b/service/backup/api_op_CreateBackupPlan.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateBackupPlan(ctx context.Context, params *CreateBackupPlanI addawsRestjson1_serdeOpCreateBackupPlanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_CreateBackupSelection.go b/service/backup/api_op_CreateBackupSelection.go index 6edde8ab537..233550bd3f1 100644 --- a/service/backup/api_op_CreateBackupSelection.go +++ b/service/backup/api_op_CreateBackupSelection.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) CreateBackupSelection(ctx context.Context, params *CreateBackup addawsRestjson1_serdeOpCreateBackupSelectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_CreateBackupVault.go b/service/backup/api_op_CreateBackupVault.go index df87a4211a7..8d2ad1a643a 100644 --- a/service/backup/api_op_CreateBackupVault.go +++ b/service/backup/api_op_CreateBackupVault.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) CreateBackupVault(ctx context.Context, params *CreateBackupVaul addawsRestjson1_serdeOpCreateBackupVaultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_DeleteBackupPlan.go b/service/backup/api_op_DeleteBackupPlan.go index c8e5e0e52b1..f4836a136cc 100644 --- a/service/backup/api_op_DeleteBackupPlan.go +++ b/service/backup/api_op_DeleteBackupPlan.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteBackupPlan(ctx context.Context, params *DeleteBackupPlanI addawsRestjson1_serdeOpDeleteBackupPlanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_DeleteBackupSelection.go b/service/backup/api_op_DeleteBackupSelection.go index 775873865db..a8bfc36368e 100644 --- a/service/backup/api_op_DeleteBackupSelection.go +++ b/service/backup/api_op_DeleteBackupSelection.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteBackupSelection(ctx context.Context, params *DeleteBackup addawsRestjson1_serdeOpDeleteBackupSelectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_DeleteBackupVault.go b/service/backup/api_op_DeleteBackupVault.go index a360c79d4b2..3f31d0ee9cc 100644 --- a/service/backup/api_op_DeleteBackupVault.go +++ b/service/backup/api_op_DeleteBackupVault.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteBackupVault(ctx context.Context, params *DeleteBackupVaul addawsRestjson1_serdeOpDeleteBackupVaultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_DeleteBackupVaultAccessPolicy.go b/service/backup/api_op_DeleteBackupVaultAccessPolicy.go index 8f2866d1b6e..190e58c7923 100644 --- a/service/backup/api_op_DeleteBackupVaultAccessPolicy.go +++ b/service/backup/api_op_DeleteBackupVaultAccessPolicy.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteBackupVaultAccessPolicy(ctx context.Context, params *Dele addawsRestjson1_serdeOpDeleteBackupVaultAccessPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_DeleteBackupVaultNotifications.go b/service/backup/api_op_DeleteBackupVaultNotifications.go index ecca4ac952e..725f16a763c 100644 --- a/service/backup/api_op_DeleteBackupVaultNotifications.go +++ b/service/backup/api_op_DeleteBackupVaultNotifications.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteBackupVaultNotifications(ctx context.Context, params *Del addawsRestjson1_serdeOpDeleteBackupVaultNotificationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_DeleteRecoveryPoint.go b/service/backup/api_op_DeleteRecoveryPoint.go index 1a84d7d5aab..6014cf1221d 100644 --- a/service/backup/api_op_DeleteRecoveryPoint.go +++ b/service/backup/api_op_DeleteRecoveryPoint.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRecoveryPoint(ctx context.Context, params *DeleteRecovery addawsRestjson1_serdeOpDeleteRecoveryPointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_DescribeBackupJob.go b/service/backup/api_op_DescribeBackupJob.go index f76d5e3a73c..bc49930fdee 100644 --- a/service/backup/api_op_DescribeBackupJob.go +++ b/service/backup/api_op_DescribeBackupJob.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeBackupJob(ctx context.Context, params *DescribeBackupJo addawsRestjson1_serdeOpDescribeBackupJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_DescribeBackupVault.go b/service/backup/api_op_DescribeBackupVault.go index 9ef72cc3ab8..a08b664d6f4 100644 --- a/service/backup/api_op_DescribeBackupVault.go +++ b/service/backup/api_op_DescribeBackupVault.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DescribeBackupVault(ctx context.Context, params *DescribeBackup addawsRestjson1_serdeOpDescribeBackupVaultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_DescribeCopyJob.go b/service/backup/api_op_DescribeCopyJob.go index 60bd42fe9f7..351a48c6da1 100644 --- a/service/backup/api_op_DescribeCopyJob.go +++ b/service/backup/api_op_DescribeCopyJob.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeCopyJob(ctx context.Context, params *DescribeCopyJobInp addawsRestjson1_serdeOpDescribeCopyJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_DescribeProtectedResource.go b/service/backup/api_op_DescribeProtectedResource.go index d1e36ac19a4..ab7373f470a 100644 --- a/service/backup/api_op_DescribeProtectedResource.go +++ b/service/backup/api_op_DescribeProtectedResource.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DescribeProtectedResource(ctx context.Context, params *Describe addawsRestjson1_serdeOpDescribeProtectedResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_DescribeRecoveryPoint.go b/service/backup/api_op_DescribeRecoveryPoint.go index 5d92d30f914..aa0a8ead4a2 100644 --- a/service/backup/api_op_DescribeRecoveryPoint.go +++ b/service/backup/api_op_DescribeRecoveryPoint.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeRecoveryPoint(ctx context.Context, params *DescribeReco addawsRestjson1_serdeOpDescribeRecoveryPointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_DescribeRegionSettings.go b/service/backup/api_op_DescribeRegionSettings.go index 18a97088a45..732b468c843 100644 --- a/service/backup/api_op_DescribeRegionSettings.go +++ b/service/backup/api_op_DescribeRegionSettings.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DescribeRegionSettings(ctx context.Context, params *DescribeReg addawsRestjson1_serdeOpDescribeRegionSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_DescribeRestoreJob.go b/service/backup/api_op_DescribeRestoreJob.go index 8105b8fb46e..b7a0c9a0e3a 100644 --- a/service/backup/api_op_DescribeRestoreJob.go +++ b/service/backup/api_op_DescribeRestoreJob.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeRestoreJob(ctx context.Context, params *DescribeRestore addawsRestjson1_serdeOpDescribeRestoreJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_ExportBackupPlanTemplate.go b/service/backup/api_op_ExportBackupPlanTemplate.go index 4b4f4cf70c5..0ad7260bbbc 100644 --- a/service/backup/api_op_ExportBackupPlanTemplate.go +++ b/service/backup/api_op_ExportBackupPlanTemplate.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ExportBackupPlanTemplate(ctx context.Context, params *ExportBac addawsRestjson1_serdeOpExportBackupPlanTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_GetBackupPlan.go b/service/backup/api_op_GetBackupPlan.go index 8cbec6a93da..54d5f602fab 100644 --- a/service/backup/api_op_GetBackupPlan.go +++ b/service/backup/api_op_GetBackupPlan.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetBackupPlan(ctx context.Context, params *GetBackupPlanInput, addawsRestjson1_serdeOpGetBackupPlanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_GetBackupPlanFromJSON.go b/service/backup/api_op_GetBackupPlanFromJSON.go index 664c4683b6f..14bd76bbe7f 100644 --- a/service/backup/api_op_GetBackupPlanFromJSON.go +++ b/service/backup/api_op_GetBackupPlanFromJSON.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetBackupPlanFromJSON(ctx context.Context, params *GetBackupPla addawsRestjson1_serdeOpGetBackupPlanFromJSONMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_GetBackupPlanFromTemplate.go b/service/backup/api_op_GetBackupPlanFromTemplate.go index 836dd58c288..5a2c4aa95f2 100644 --- a/service/backup/api_op_GetBackupPlanFromTemplate.go +++ b/service/backup/api_op_GetBackupPlanFromTemplate.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetBackupPlanFromTemplate(ctx context.Context, params *GetBacku addawsRestjson1_serdeOpGetBackupPlanFromTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_GetBackupSelection.go b/service/backup/api_op_GetBackupSelection.go index 62302cc8a00..56dd9111b9e 100644 --- a/service/backup/api_op_GetBackupSelection.go +++ b/service/backup/api_op_GetBackupSelection.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetBackupSelection(ctx context.Context, params *GetBackupSelect addawsRestjson1_serdeOpGetBackupSelectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_GetBackupVaultAccessPolicy.go b/service/backup/api_op_GetBackupVaultAccessPolicy.go index 850b2961bbf..ef359d52df3 100644 --- a/service/backup/api_op_GetBackupVaultAccessPolicy.go +++ b/service/backup/api_op_GetBackupVaultAccessPolicy.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetBackupVaultAccessPolicy(ctx context.Context, params *GetBack addawsRestjson1_serdeOpGetBackupVaultAccessPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_GetBackupVaultNotifications.go b/service/backup/api_op_GetBackupVaultNotifications.go index db1985985a8..2bb8e87778e 100644 --- a/service/backup/api_op_GetBackupVaultNotifications.go +++ b/service/backup/api_op_GetBackupVaultNotifications.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetBackupVaultNotifications(ctx context.Context, params *GetBac addawsRestjson1_serdeOpGetBackupVaultNotificationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_GetRecoveryPointRestoreMetadata.go b/service/backup/api_op_GetRecoveryPointRestoreMetadata.go index 146ee6c04c5..71d43ec1b9d 100644 --- a/service/backup/api_op_GetRecoveryPointRestoreMetadata.go +++ b/service/backup/api_op_GetRecoveryPointRestoreMetadata.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetRecoveryPointRestoreMetadata(ctx context.Context, params *Ge addawsRestjson1_serdeOpGetRecoveryPointRestoreMetadataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_GetSupportedResourceTypes.go b/service/backup/api_op_GetSupportedResourceTypes.go index 0b1e1d2afcd..f25e17c4256 100644 --- a/service/backup/api_op_GetSupportedResourceTypes.go +++ b/service/backup/api_op_GetSupportedResourceTypes.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetSupportedResourceTypes(ctx context.Context, params *GetSuppo addawsRestjson1_serdeOpGetSupportedResourceTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_ListBackupJobs.go b/service/backup/api_op_ListBackupJobs.go index 903f20e70f1..3f24118469e 100644 --- a/service/backup/api_op_ListBackupJobs.go +++ b/service/backup/api_op_ListBackupJobs.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListBackupJobs(ctx context.Context, params *ListBackupJobsInput addawsRestjson1_serdeOpListBackupJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_ListBackupPlanTemplates.go b/service/backup/api_op_ListBackupPlanTemplates.go index b51fa4744b0..4dc3a422c76 100644 --- a/service/backup/api_op_ListBackupPlanTemplates.go +++ b/service/backup/api_op_ListBackupPlanTemplates.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListBackupPlanTemplates(ctx context.Context, params *ListBackup addawsRestjson1_serdeOpListBackupPlanTemplatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_ListBackupPlanVersions.go b/service/backup/api_op_ListBackupPlanVersions.go index b49373add16..4e21c9e3af0 100644 --- a/service/backup/api_op_ListBackupPlanVersions.go +++ b/service/backup/api_op_ListBackupPlanVersions.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListBackupPlanVersions(ctx context.Context, params *ListBackupP addawsRestjson1_serdeOpListBackupPlanVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_ListBackupPlans.go b/service/backup/api_op_ListBackupPlans.go index 27a7247ef2f..e9374a87d20 100644 --- a/service/backup/api_op_ListBackupPlans.go +++ b/service/backup/api_op_ListBackupPlans.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListBackupPlans(ctx context.Context, params *ListBackupPlansInp addawsRestjson1_serdeOpListBackupPlansMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_ListBackupSelections.go b/service/backup/api_op_ListBackupSelections.go index c4e22bb889d..32b6298c6aa 100644 --- a/service/backup/api_op_ListBackupSelections.go +++ b/service/backup/api_op_ListBackupSelections.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListBackupSelections(ctx context.Context, params *ListBackupSel addawsRestjson1_serdeOpListBackupSelectionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_ListBackupVaults.go b/service/backup/api_op_ListBackupVaults.go index 29be28e4d26..d42fa0015db 100644 --- a/service/backup/api_op_ListBackupVaults.go +++ b/service/backup/api_op_ListBackupVaults.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListBackupVaults(ctx context.Context, params *ListBackupVaultsI addawsRestjson1_serdeOpListBackupVaultsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_ListCopyJobs.go b/service/backup/api_op_ListCopyJobs.go index 24f66ac0062..87760176beb 100644 --- a/service/backup/api_op_ListCopyJobs.go +++ b/service/backup/api_op_ListCopyJobs.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListCopyJobs(ctx context.Context, params *ListCopyJobsInput, op addawsRestjson1_serdeOpListCopyJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_ListProtectedResources.go b/service/backup/api_op_ListProtectedResources.go index 038c2641697..2896eac5dda 100644 --- a/service/backup/api_op_ListProtectedResources.go +++ b/service/backup/api_op_ListProtectedResources.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListProtectedResources(ctx context.Context, params *ListProtect addawsRestjson1_serdeOpListProtectedResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_ListRecoveryPointsByBackupVault.go b/service/backup/api_op_ListRecoveryPointsByBackupVault.go index 478e0f75c67..f37e27b54c7 100644 --- a/service/backup/api_op_ListRecoveryPointsByBackupVault.go +++ b/service/backup/api_op_ListRecoveryPointsByBackupVault.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListRecoveryPointsByBackupVault(ctx context.Context, params *Li addawsRestjson1_serdeOpListRecoveryPointsByBackupVaultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_ListRecoveryPointsByResource.go b/service/backup/api_op_ListRecoveryPointsByResource.go index 342f90e58df..680a10222d1 100644 --- a/service/backup/api_op_ListRecoveryPointsByResource.go +++ b/service/backup/api_op_ListRecoveryPointsByResource.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListRecoveryPointsByResource(ctx context.Context, params *ListR addawsRestjson1_serdeOpListRecoveryPointsByResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_ListRestoreJobs.go b/service/backup/api_op_ListRestoreJobs.go index 3fb9481a0f7..d30d31d11d6 100644 --- a/service/backup/api_op_ListRestoreJobs.go +++ b/service/backup/api_op_ListRestoreJobs.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListRestoreJobs(ctx context.Context, params *ListRestoreJobsInp addawsRestjson1_serdeOpListRestoreJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_ListTags.go b/service/backup/api_op_ListTags.go index c1efdc642dd..e34fd524d14 100644 --- a/service/backup/api_op_ListTags.go +++ b/service/backup/api_op_ListTags.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ListTags(ctx context.Context, params *ListTagsInput, optFns ... addawsRestjson1_serdeOpListTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_PutBackupVaultAccessPolicy.go b/service/backup/api_op_PutBackupVaultAccessPolicy.go index 8a2f5af29ab..1da4108e1e0 100644 --- a/service/backup/api_op_PutBackupVaultAccessPolicy.go +++ b/service/backup/api_op_PutBackupVaultAccessPolicy.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) PutBackupVaultAccessPolicy(ctx context.Context, params *PutBack addawsRestjson1_serdeOpPutBackupVaultAccessPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_PutBackupVaultNotifications.go b/service/backup/api_op_PutBackupVaultNotifications.go index 0377f8ec4f9..df108413912 100644 --- a/service/backup/api_op_PutBackupVaultNotifications.go +++ b/service/backup/api_op_PutBackupVaultNotifications.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutBackupVaultNotifications(ctx context.Context, params *PutBac addawsRestjson1_serdeOpPutBackupVaultNotificationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_StartBackupJob.go b/service/backup/api_op_StartBackupJob.go index 21d8d5dc301..2e6c311cc30 100644 --- a/service/backup/api_op_StartBackupJob.go +++ b/service/backup/api_op_StartBackupJob.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) StartBackupJob(ctx context.Context, params *StartBackupJobInput addawsRestjson1_serdeOpStartBackupJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_StartCopyJob.go b/service/backup/api_op_StartCopyJob.go index e110f809024..552a2747097 100644 --- a/service/backup/api_op_StartCopyJob.go +++ b/service/backup/api_op_StartCopyJob.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) StartCopyJob(ctx context.Context, params *StartCopyJobInput, op addawsRestjson1_serdeOpStartCopyJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_StartRestoreJob.go b/service/backup/api_op_StartRestoreJob.go index 7c57baec2e8..ca534739922 100644 --- a/service/backup/api_op_StartRestoreJob.go +++ b/service/backup/api_op_StartRestoreJob.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) StartRestoreJob(ctx context.Context, params *StartRestoreJobInp addawsRestjson1_serdeOpStartRestoreJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_StopBackupJob.go b/service/backup/api_op_StopBackupJob.go index 1214c8b6c22..76396734f2c 100644 --- a/service/backup/api_op_StopBackupJob.go +++ b/service/backup/api_op_StopBackupJob.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StopBackupJob(ctx context.Context, params *StopBackupJobInput, addawsRestjson1_serdeOpStopBackupJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_TagResource.go b/service/backup/api_op_TagResource.go index bc6218b7af9..30b8cc8687f 100644 --- a/service/backup/api_op_TagResource.go +++ b/service/backup/api_op_TagResource.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_UntagResource.go b/service/backup/api_op_UntagResource.go index b35544bd815..aff210499a8 100644 --- a/service/backup/api_op_UntagResource.go +++ b/service/backup/api_op_UntagResource.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_UpdateBackupPlan.go b/service/backup/api_op_UpdateBackupPlan.go index 763c1dc0c02..9019c03b54d 100644 --- a/service/backup/api_op_UpdateBackupPlan.go +++ b/service/backup/api_op_UpdateBackupPlan.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateBackupPlan(ctx context.Context, params *UpdateBackupPlanI addawsRestjson1_serdeOpUpdateBackupPlanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_UpdateRecoveryPointLifecycle.go b/service/backup/api_op_UpdateRecoveryPointLifecycle.go index 0374b62dd98..632c2683f6a 100644 --- a/service/backup/api_op_UpdateRecoveryPointLifecycle.go +++ b/service/backup/api_op_UpdateRecoveryPointLifecycle.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/backup/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) UpdateRecoveryPointLifecycle(ctx context.Context, params *Updat addawsRestjson1_serdeOpUpdateRecoveryPointLifecycleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/api_op_UpdateRegionSettings.go b/service/backup/api_op_UpdateRegionSettings.go index 8e3ed663e2a..c20132043c7 100644 --- a/service/backup/api_op_UpdateRegionSettings.go +++ b/service/backup/api_op_UpdateRegionSettings.go @@ -5,7 +5,6 @@ package backup import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) UpdateRegionSettings(ctx context.Context, params *UpdateRegionS addawsRestjson1_serdeOpUpdateRegionSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/backup/endpoints.go b/service/backup/endpoints.go index 81704c76991..902bd85696a 100644 --- a/service/backup/endpoints.go +++ b/service/backup/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/batch/api_client.go b/service/batch/api_client.go index d87c88d0237..490e3628356 100644 --- a/service/batch/api_client.go +++ b/service/batch/api_client.go @@ -91,30 +91,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -180,6 +156,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/batch/api_op_CancelJob.go b/service/batch/api_op_CancelJob.go index 09dea875d24..14833ed0b43 100644 --- a/service/batch/api_op_CancelJob.go +++ b/service/batch/api_op_CancelJob.go @@ -5,7 +5,6 @@ package batch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) CancelJob(ctx context.Context, params *CancelJobInput, optFns . addawsRestjson1_serdeOpCancelJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/batch/api_op_CreateComputeEnvironment.go b/service/batch/api_op_CreateComputeEnvironment.go index 015778bb8f5..29e2d6ee79a 100644 --- a/service/batch/api_op_CreateComputeEnvironment.go +++ b/service/batch/api_op_CreateComputeEnvironment.go @@ -5,7 +5,6 @@ package batch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/batch/types" smithy "github.com/awslabs/smithy-go" @@ -61,9 +60,9 @@ func (c *Client) CreateComputeEnvironment(ctx context.Context, params *CreateCom addawsRestjson1_serdeOpCreateComputeEnvironmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/batch/api_op_CreateJobQueue.go b/service/batch/api_op_CreateJobQueue.go index b49e376ac3b..a2f6eb85ff0 100644 --- a/service/batch/api_op_CreateJobQueue.go +++ b/service/batch/api_op_CreateJobQueue.go @@ -5,7 +5,6 @@ package batch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/batch/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateJobQueue(ctx context.Context, params *CreateJobQueueInput addawsRestjson1_serdeOpCreateJobQueueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/batch/api_op_DeleteComputeEnvironment.go b/service/batch/api_op_DeleteComputeEnvironment.go index d2e9454792d..1123ea72b5a 100644 --- a/service/batch/api_op_DeleteComputeEnvironment.go +++ b/service/batch/api_op_DeleteComputeEnvironment.go @@ -5,7 +5,6 @@ package batch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteComputeEnvironment(ctx context.Context, params *DeleteCom addawsRestjson1_serdeOpDeleteComputeEnvironmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/batch/api_op_DeleteJobQueue.go b/service/batch/api_op_DeleteJobQueue.go index 30c2efeb75c..f547402f549 100644 --- a/service/batch/api_op_DeleteJobQueue.go +++ b/service/batch/api_op_DeleteJobQueue.go @@ -5,7 +5,6 @@ package batch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteJobQueue(ctx context.Context, params *DeleteJobQueueInput addawsRestjson1_serdeOpDeleteJobQueueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/batch/api_op_DeregisterJobDefinition.go b/service/batch/api_op_DeregisterJobDefinition.go index 118a502bc4b..c1866d80d04 100644 --- a/service/batch/api_op_DeregisterJobDefinition.go +++ b/service/batch/api_op_DeregisterJobDefinition.go @@ -5,7 +5,6 @@ package batch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeregisterJobDefinition(ctx context.Context, params *Deregister addawsRestjson1_serdeOpDeregisterJobDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/batch/api_op_DescribeComputeEnvironments.go b/service/batch/api_op_DescribeComputeEnvironments.go index 403ad9f3ef2..24511a5db50 100644 --- a/service/batch/api_op_DescribeComputeEnvironments.go +++ b/service/batch/api_op_DescribeComputeEnvironments.go @@ -5,7 +5,6 @@ package batch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/batch/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeComputeEnvironments(ctx context.Context, params *Descri addawsRestjson1_serdeOpDescribeComputeEnvironmentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/batch/api_op_DescribeJobDefinitions.go b/service/batch/api_op_DescribeJobDefinitions.go index c1b440f9374..c318dbc1196 100644 --- a/service/batch/api_op_DescribeJobDefinitions.go +++ b/service/batch/api_op_DescribeJobDefinitions.go @@ -5,7 +5,6 @@ package batch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/batch/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeJobDefinitions(ctx context.Context, params *DescribeJob addawsRestjson1_serdeOpDescribeJobDefinitionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/batch/api_op_DescribeJobQueues.go b/service/batch/api_op_DescribeJobQueues.go index 879236f64ec..e9928dd6ced 100644 --- a/service/batch/api_op_DescribeJobQueues.go +++ b/service/batch/api_op_DescribeJobQueues.go @@ -5,7 +5,6 @@ package batch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/batch/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeJobQueues(ctx context.Context, params *DescribeJobQueue addawsRestjson1_serdeOpDescribeJobQueuesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/batch/api_op_DescribeJobs.go b/service/batch/api_op_DescribeJobs.go index aa8298cb170..b957f7eebf2 100644 --- a/service/batch/api_op_DescribeJobs.go +++ b/service/batch/api_op_DescribeJobs.go @@ -5,7 +5,6 @@ package batch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/batch/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeJobs(ctx context.Context, params *DescribeJobsInput, op addawsRestjson1_serdeOpDescribeJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/batch/api_op_ListJobs.go b/service/batch/api_op_ListJobs.go index f6fb460f6b0..c329a7e7c24 100644 --- a/service/batch/api_op_ListJobs.go +++ b/service/batch/api_op_ListJobs.go @@ -5,7 +5,6 @@ package batch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/batch/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) ListJobs(ctx context.Context, params *ListJobsInput, optFns ... addawsRestjson1_serdeOpListJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/batch/api_op_RegisterJobDefinition.go b/service/batch/api_op_RegisterJobDefinition.go index 45da5de438c..56c563ba2a4 100644 --- a/service/batch/api_op_RegisterJobDefinition.go +++ b/service/batch/api_op_RegisterJobDefinition.go @@ -5,7 +5,6 @@ package batch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/batch/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RegisterJobDefinition(ctx context.Context, params *RegisterJobD addawsRestjson1_serdeOpRegisterJobDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/batch/api_op_SubmitJob.go b/service/batch/api_op_SubmitJob.go index 40ee74715ed..ef35b9a79bb 100644 --- a/service/batch/api_op_SubmitJob.go +++ b/service/batch/api_op_SubmitJob.go @@ -5,7 +5,6 @@ package batch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/batch/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) SubmitJob(ctx context.Context, params *SubmitJobInput, optFns . addawsRestjson1_serdeOpSubmitJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/batch/api_op_TerminateJob.go b/service/batch/api_op_TerminateJob.go index 0ddb5319096..52460772cc6 100644 --- a/service/batch/api_op_TerminateJob.go +++ b/service/batch/api_op_TerminateJob.go @@ -5,7 +5,6 @@ package batch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) TerminateJob(ctx context.Context, params *TerminateJobInput, op addawsRestjson1_serdeOpTerminateJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/batch/api_op_UpdateComputeEnvironment.go b/service/batch/api_op_UpdateComputeEnvironment.go index d51f7eab666..c9a1923c844 100644 --- a/service/batch/api_op_UpdateComputeEnvironment.go +++ b/service/batch/api_op_UpdateComputeEnvironment.go @@ -5,7 +5,6 @@ package batch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/batch/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateComputeEnvironment(ctx context.Context, params *UpdateCom addawsRestjson1_serdeOpUpdateComputeEnvironmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/batch/api_op_UpdateJobQueue.go b/service/batch/api_op_UpdateJobQueue.go index 0c12a84466b..bf9fa7968c7 100644 --- a/service/batch/api_op_UpdateJobQueue.go +++ b/service/batch/api_op_UpdateJobQueue.go @@ -5,7 +5,6 @@ package batch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/batch/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateJobQueue(ctx context.Context, params *UpdateJobQueueInput addawsRestjson1_serdeOpUpdateJobQueueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/batch/endpoints.go b/service/batch/endpoints.go index 33f8f484453..f0a2c9f0df1 100644 --- a/service/batch/endpoints.go +++ b/service/batch/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/braket/api_client.go b/service/braket/api_client.go index 245ba269a98..cfc8e915929 100644 --- a/service/braket/api_client.go +++ b/service/braket/api_client.go @@ -78,30 +78,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -167,6 +143,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/braket/api_op_CancelQuantumTask.go b/service/braket/api_op_CancelQuantumTask.go index f47cafd439a..42e25f74b6e 100644 --- a/service/braket/api_op_CancelQuantumTask.go +++ b/service/braket/api_op_CancelQuantumTask.go @@ -5,7 +5,6 @@ package braket import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/braket/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CancelQuantumTask(ctx context.Context, params *CancelQuantumTas addawsRestjson1_serdeOpCancelQuantumTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/braket/api_op_CreateQuantumTask.go b/service/braket/api_op_CreateQuantumTask.go index 7ae8da34fe5..744b721de70 100644 --- a/service/braket/api_op_CreateQuantumTask.go +++ b/service/braket/api_op_CreateQuantumTask.go @@ -5,7 +5,6 @@ package braket import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateQuantumTask(ctx context.Context, params *CreateQuantumTas addawsRestjson1_serdeOpCreateQuantumTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/braket/api_op_GetDevice.go b/service/braket/api_op_GetDevice.go index e5cc1c3fc51..6d8713d5371 100644 --- a/service/braket/api_op_GetDevice.go +++ b/service/braket/api_op_GetDevice.go @@ -5,7 +5,6 @@ package braket import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/braket/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDevice(ctx context.Context, params *GetDeviceInput, optFns . addawsRestjson1_serdeOpGetDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/braket/api_op_GetQuantumTask.go b/service/braket/api_op_GetQuantumTask.go index 692097bf108..5876ccd055b 100644 --- a/service/braket/api_op_GetQuantumTask.go +++ b/service/braket/api_op_GetQuantumTask.go @@ -5,7 +5,6 @@ package braket import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/braket/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetQuantumTask(ctx context.Context, params *GetQuantumTaskInput addawsRestjson1_serdeOpGetQuantumTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/braket/api_op_SearchDevices.go b/service/braket/api_op_SearchDevices.go index 04556c5218e..8bdc230d48b 100644 --- a/service/braket/api_op_SearchDevices.go +++ b/service/braket/api_op_SearchDevices.go @@ -5,7 +5,6 @@ package braket import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/braket/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SearchDevices(ctx context.Context, params *SearchDevicesInput, addawsRestjson1_serdeOpSearchDevicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/braket/api_op_SearchQuantumTasks.go b/service/braket/api_op_SearchQuantumTasks.go index a6ff71df919..8253f560c07 100644 --- a/service/braket/api_op_SearchQuantumTasks.go +++ b/service/braket/api_op_SearchQuantumTasks.go @@ -5,7 +5,6 @@ package braket import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/braket/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SearchQuantumTasks(ctx context.Context, params *SearchQuantumTa addawsRestjson1_serdeOpSearchQuantumTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/braket/endpoints.go b/service/braket/endpoints.go index 3eacb83a1b1..4f26b06e967 100644 --- a/service/braket/endpoints.go +++ b/service/braket/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/budgets/api_client.go b/service/budgets/api_client.go index f6e9d0253fa..a6b3dcf93d7 100644 --- a/service/budgets/api_client.go +++ b/service/budgets/api_client.go @@ -122,30 +122,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -211,6 +187,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/budgets/api_op_CreateBudget.go b/service/budgets/api_op_CreateBudget.go index e4c9ef79db8..27456041b28 100644 --- a/service/budgets/api_op_CreateBudget.go +++ b/service/budgets/api_op_CreateBudget.go @@ -5,7 +5,6 @@ package budgets import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/budgets/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateBudget(ctx context.Context, params *CreateBudgetInput, op addawsAwsjson11_serdeOpCreateBudgetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/budgets/api_op_CreateNotification.go b/service/budgets/api_op_CreateNotification.go index 65f5e208fc4..fc2c5860053 100644 --- a/service/budgets/api_op_CreateNotification.go +++ b/service/budgets/api_op_CreateNotification.go @@ -5,7 +5,6 @@ package budgets import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/budgets/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateNotification(ctx context.Context, params *CreateNotificat addawsAwsjson11_serdeOpCreateNotificationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/budgets/api_op_CreateSubscriber.go b/service/budgets/api_op_CreateSubscriber.go index b7894b86d4a..a36eae52d0d 100644 --- a/service/budgets/api_op_CreateSubscriber.go +++ b/service/budgets/api_op_CreateSubscriber.go @@ -5,7 +5,6 @@ package budgets import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/budgets/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateSubscriber(ctx context.Context, params *CreateSubscriberI addawsAwsjson11_serdeOpCreateSubscriberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/budgets/api_op_DeleteBudget.go b/service/budgets/api_op_DeleteBudget.go index 29f6ab57ded..bd34ffe3698 100644 --- a/service/budgets/api_op_DeleteBudget.go +++ b/service/budgets/api_op_DeleteBudget.go @@ -5,7 +5,6 @@ package budgets import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteBudget(ctx context.Context, params *DeleteBudgetInput, op addawsAwsjson11_serdeOpDeleteBudgetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/budgets/api_op_DeleteNotification.go b/service/budgets/api_op_DeleteNotification.go index 659a184c1cb..0c66584b588 100644 --- a/service/budgets/api_op_DeleteNotification.go +++ b/service/budgets/api_op_DeleteNotification.go @@ -5,7 +5,6 @@ package budgets import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/budgets/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteNotification(ctx context.Context, params *DeleteNotificat addawsAwsjson11_serdeOpDeleteNotificationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/budgets/api_op_DeleteSubscriber.go b/service/budgets/api_op_DeleteSubscriber.go index 266050139c7..e0d3e402ca6 100644 --- a/service/budgets/api_op_DeleteSubscriber.go +++ b/service/budgets/api_op_DeleteSubscriber.go @@ -5,7 +5,6 @@ package budgets import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/budgets/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteSubscriber(ctx context.Context, params *DeleteSubscriberI addawsAwsjson11_serdeOpDeleteSubscriberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/budgets/api_op_DescribeBudget.go b/service/budgets/api_op_DescribeBudget.go index 4c82ae9ebe2..50a801bee66 100644 --- a/service/budgets/api_op_DescribeBudget.go +++ b/service/budgets/api_op_DescribeBudget.go @@ -5,7 +5,6 @@ package budgets import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/budgets/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeBudget(ctx context.Context, params *DescribeBudgetInput addawsAwsjson11_serdeOpDescribeBudgetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/budgets/api_op_DescribeBudgetPerformanceHistory.go b/service/budgets/api_op_DescribeBudgetPerformanceHistory.go index 5a923d60399..f652ed8ed4b 100644 --- a/service/budgets/api_op_DescribeBudgetPerformanceHistory.go +++ b/service/budgets/api_op_DescribeBudgetPerformanceHistory.go @@ -5,7 +5,6 @@ package budgets import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/budgets/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeBudgetPerformanceHistory(ctx context.Context, params *D addawsAwsjson11_serdeOpDescribeBudgetPerformanceHistoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/budgets/api_op_DescribeBudgets.go b/service/budgets/api_op_DescribeBudgets.go index 3666025e2b9..8d00369e50f 100644 --- a/service/budgets/api_op_DescribeBudgets.go +++ b/service/budgets/api_op_DescribeBudgets.go @@ -5,7 +5,6 @@ package budgets import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/budgets/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeBudgets(ctx context.Context, params *DescribeBudgetsInp addawsAwsjson11_serdeOpDescribeBudgetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/budgets/api_op_DescribeNotificationsForBudget.go b/service/budgets/api_op_DescribeNotificationsForBudget.go index 8c06fcc2153..1468fc20936 100644 --- a/service/budgets/api_op_DescribeNotificationsForBudget.go +++ b/service/budgets/api_op_DescribeNotificationsForBudget.go @@ -5,7 +5,6 @@ package budgets import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/budgets/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeNotificationsForBudget(ctx context.Context, params *Des addawsAwsjson11_serdeOpDescribeNotificationsForBudgetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/budgets/api_op_DescribeSubscribersForNotification.go b/service/budgets/api_op_DescribeSubscribersForNotification.go index 97146ef43ea..72011ba9b17 100644 --- a/service/budgets/api_op_DescribeSubscribersForNotification.go +++ b/service/budgets/api_op_DescribeSubscribersForNotification.go @@ -5,7 +5,6 @@ package budgets import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/budgets/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeSubscribersForNotification(ctx context.Context, params addawsAwsjson11_serdeOpDescribeSubscribersForNotificationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/budgets/api_op_UpdateBudget.go b/service/budgets/api_op_UpdateBudget.go index 14ebd41606a..27fcdaa01eb 100644 --- a/service/budgets/api_op_UpdateBudget.go +++ b/service/budgets/api_op_UpdateBudget.go @@ -5,7 +5,6 @@ package budgets import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/budgets/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) UpdateBudget(ctx context.Context, params *UpdateBudgetInput, op addawsAwsjson11_serdeOpUpdateBudgetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/budgets/api_op_UpdateNotification.go b/service/budgets/api_op_UpdateNotification.go index 7cb4bc0c6f0..cfd69b07b9b 100644 --- a/service/budgets/api_op_UpdateNotification.go +++ b/service/budgets/api_op_UpdateNotification.go @@ -5,7 +5,6 @@ package budgets import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/budgets/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateNotification(ctx context.Context, params *UpdateNotificat addawsAwsjson11_serdeOpUpdateNotificationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/budgets/api_op_UpdateSubscriber.go b/service/budgets/api_op_UpdateSubscriber.go index bc42b10a8fe..8ef29c75fc2 100644 --- a/service/budgets/api_op_UpdateSubscriber.go +++ b/service/budgets/api_op_UpdateSubscriber.go @@ -5,7 +5,6 @@ package budgets import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/budgets/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateSubscriber(ctx context.Context, params *UpdateSubscriberI addawsAwsjson11_serdeOpUpdateSubscriberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/budgets/endpoints.go b/service/budgets/endpoints.go index 607e3263305..ee105765ff0 100644 --- a/service/budgets/endpoints.go +++ b/service/budgets/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/chime/api_client.go b/service/chime/api_client.go index e563f4f19f1..6648aa389dc 100644 --- a/service/chime/api_client.go +++ b/service/chime/api_client.go @@ -116,34 +116,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -216,6 +188,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/chime/api_op_AssociatePhoneNumberWithUser.go b/service/chime/api_op_AssociatePhoneNumberWithUser.go index 64a5cd35647..86ac0c9b4ed 100644 --- a/service/chime/api_op_AssociatePhoneNumberWithUser.go +++ b/service/chime/api_op_AssociatePhoneNumberWithUser.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AssociatePhoneNumberWithUser(ctx context.Context, params *Assoc addawsRestjson1_serdeOpAssociatePhoneNumberWithUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_AssociatePhoneNumbersWithVoiceConnector.go b/service/chime/api_op_AssociatePhoneNumbersWithVoiceConnector.go index 1fbfdfda3ee..eec2c472ed8 100644 --- a/service/chime/api_op_AssociatePhoneNumbersWithVoiceConnector.go +++ b/service/chime/api_op_AssociatePhoneNumbersWithVoiceConnector.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) AssociatePhoneNumbersWithVoiceConnector(ctx context.Context, pa addawsRestjson1_serdeOpAssociatePhoneNumbersWithVoiceConnectorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_AssociatePhoneNumbersWithVoiceConnectorGroup.go b/service/chime/api_op_AssociatePhoneNumbersWithVoiceConnectorGroup.go index 6d6f0722c3b..b3c9d6b0678 100644 --- a/service/chime/api_op_AssociatePhoneNumbersWithVoiceConnectorGroup.go +++ b/service/chime/api_op_AssociatePhoneNumbersWithVoiceConnectorGroup.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) AssociatePhoneNumbersWithVoiceConnectorGroup(ctx context.Contex addawsRestjson1_serdeOpAssociatePhoneNumbersWithVoiceConnectorGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_AssociateSigninDelegateGroupsWithAccount.go b/service/chime/api_op_AssociateSigninDelegateGroupsWithAccount.go index 6571b598334..15317ad22c7 100644 --- a/service/chime/api_op_AssociateSigninDelegateGroupsWithAccount.go +++ b/service/chime/api_op_AssociateSigninDelegateGroupsWithAccount.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AssociateSigninDelegateGroupsWithAccount(ctx context.Context, p addawsRestjson1_serdeOpAssociateSigninDelegateGroupsWithAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_BatchCreateAttendee.go b/service/chime/api_op_BatchCreateAttendee.go index 12ed735bbe0..62c819b5f7b 100644 --- a/service/chime/api_op_BatchCreateAttendee.go +++ b/service/chime/api_op_BatchCreateAttendee.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) BatchCreateAttendee(ctx context.Context, params *BatchCreateAtt addawsRestjson1_serdeOpBatchCreateAttendeeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_BatchCreateRoomMembership.go b/service/chime/api_op_BatchCreateRoomMembership.go index 42a1ae30557..fc04c2e773d 100644 --- a/service/chime/api_op_BatchCreateRoomMembership.go +++ b/service/chime/api_op_BatchCreateRoomMembership.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) BatchCreateRoomMembership(ctx context.Context, params *BatchCre addawsRestjson1_serdeOpBatchCreateRoomMembershipMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_BatchDeletePhoneNumber.go b/service/chime/api_op_BatchDeletePhoneNumber.go index dbaa5d936ca..af8c96333ec 100644 --- a/service/chime/api_op_BatchDeletePhoneNumber.go +++ b/service/chime/api_op_BatchDeletePhoneNumber.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) BatchDeletePhoneNumber(ctx context.Context, params *BatchDelete addawsRestjson1_serdeOpBatchDeletePhoneNumberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_BatchSuspendUser.go b/service/chime/api_op_BatchSuspendUser.go index 0407980c689..cf69e4303e9 100644 --- a/service/chime/api_op_BatchSuspendUser.go +++ b/service/chime/api_op_BatchSuspendUser.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) BatchSuspendUser(ctx context.Context, params *BatchSuspendUserI addawsRestjson1_serdeOpBatchSuspendUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_BatchUnsuspendUser.go b/service/chime/api_op_BatchUnsuspendUser.go index a2c7e1ea131..40e64470b24 100644 --- a/service/chime/api_op_BatchUnsuspendUser.go +++ b/service/chime/api_op_BatchUnsuspendUser.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) BatchUnsuspendUser(ctx context.Context, params *BatchUnsuspendU addawsRestjson1_serdeOpBatchUnsuspendUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_BatchUpdatePhoneNumber.go b/service/chime/api_op_BatchUpdatePhoneNumber.go index 281b6d6af9d..35234740c3b 100644 --- a/service/chime/api_op_BatchUpdatePhoneNumber.go +++ b/service/chime/api_op_BatchUpdatePhoneNumber.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) BatchUpdatePhoneNumber(ctx context.Context, params *BatchUpdate addawsRestjson1_serdeOpBatchUpdatePhoneNumberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_BatchUpdateUser.go b/service/chime/api_op_BatchUpdateUser.go index adf3ae2c44a..c342dc57909 100644 --- a/service/chime/api_op_BatchUpdateUser.go +++ b/service/chime/api_op_BatchUpdateUser.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) BatchUpdateUser(ctx context.Context, params *BatchUpdateUserInp addawsRestjson1_serdeOpBatchUpdateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_CreateAccount.go b/service/chime/api_op_CreateAccount.go index 95cbffbc589..59eb2c08d2f 100644 --- a/service/chime/api_op_CreateAccount.go +++ b/service/chime/api_op_CreateAccount.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateAccount(ctx context.Context, params *CreateAccountInput, addawsRestjson1_serdeOpCreateAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_CreateAttendee.go b/service/chime/api_op_CreateAttendee.go index dd951cb9dc4..2e745763dd7 100644 --- a/service/chime/api_op_CreateAttendee.go +++ b/service/chime/api_op_CreateAttendee.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateAttendee(ctx context.Context, params *CreateAttendeeInput addawsRestjson1_serdeOpCreateAttendeeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_CreateBot.go b/service/chime/api_op_CreateBot.go index ae63d560b0d..816209f57b0 100644 --- a/service/chime/api_op_CreateBot.go +++ b/service/chime/api_op_CreateBot.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateBot(ctx context.Context, params *CreateBotInput, optFns . addawsRestjson1_serdeOpCreateBotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_CreateMeeting.go b/service/chime/api_op_CreateMeeting.go index ecc628ca064..7c683cdba15 100644 --- a/service/chime/api_op_CreateMeeting.go +++ b/service/chime/api_op_CreateMeeting.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateMeeting(ctx context.Context, params *CreateMeetingInput, addawsRestjson1_serdeOpCreateMeetingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_CreateMeetingWithAttendees.go b/service/chime/api_op_CreateMeetingWithAttendees.go index c20efcec6e8..54ca1970733 100644 --- a/service/chime/api_op_CreateMeetingWithAttendees.go +++ b/service/chime/api_op_CreateMeetingWithAttendees.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateMeetingWithAttendees(ctx context.Context, params *CreateM addawsRestjson1_serdeOpCreateMeetingWithAttendeesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_CreatePhoneNumberOrder.go b/service/chime/api_op_CreatePhoneNumberOrder.go index 820f18010e5..c8a53e1783d 100644 --- a/service/chime/api_op_CreatePhoneNumberOrder.go +++ b/service/chime/api_op_CreatePhoneNumberOrder.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreatePhoneNumberOrder(ctx context.Context, params *CreatePhone addawsRestjson1_serdeOpCreatePhoneNumberOrderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_CreateProxySession.go b/service/chime/api_op_CreateProxySession.go index 598d8e0b031..785ba52f509 100644 --- a/service/chime/api_op_CreateProxySession.go +++ b/service/chime/api_op_CreateProxySession.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateProxySession(ctx context.Context, params *CreateProxySess addawsRestjson1_serdeOpCreateProxySessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_CreateRoom.go b/service/chime/api_op_CreateRoom.go index 54c8629fbb9..5c8234a8771 100644 --- a/service/chime/api_op_CreateRoom.go +++ b/service/chime/api_op_CreateRoom.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateRoom(ctx context.Context, params *CreateRoomInput, optFns addawsRestjson1_serdeOpCreateRoomMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_CreateRoomMembership.go b/service/chime/api_op_CreateRoomMembership.go index 70ebf0e6406..9f7c68ee077 100644 --- a/service/chime/api_op_CreateRoomMembership.go +++ b/service/chime/api_op_CreateRoomMembership.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateRoomMembership(ctx context.Context, params *CreateRoomMem addawsRestjson1_serdeOpCreateRoomMembershipMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_CreateUser.go b/service/chime/api_op_CreateUser.go index 76ed07a354d..256266d8f7c 100644 --- a/service/chime/api_op_CreateUser.go +++ b/service/chime/api_op_CreateUser.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateUser(ctx context.Context, params *CreateUserInput, optFns addawsRestjson1_serdeOpCreateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_CreateVoiceConnector.go b/service/chime/api_op_CreateVoiceConnector.go index 3e91fe70972..157d41354da 100644 --- a/service/chime/api_op_CreateVoiceConnector.go +++ b/service/chime/api_op_CreateVoiceConnector.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateVoiceConnector(ctx context.Context, params *CreateVoiceCo addawsRestjson1_serdeOpCreateVoiceConnectorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_CreateVoiceConnectorGroup.go b/service/chime/api_op_CreateVoiceConnectorGroup.go index 609d83284a4..5076312f44f 100644 --- a/service/chime/api_op_CreateVoiceConnectorGroup.go +++ b/service/chime/api_op_CreateVoiceConnectorGroup.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateVoiceConnectorGroup(ctx context.Context, params *CreateVo addawsRestjson1_serdeOpCreateVoiceConnectorGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DeleteAccount.go b/service/chime/api_op_DeleteAccount.go index 03fc4db310c..e95b1c2f472 100644 --- a/service/chime/api_op_DeleteAccount.go +++ b/service/chime/api_op_DeleteAccount.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DeleteAccount(ctx context.Context, params *DeleteAccountInput, addawsRestjson1_serdeOpDeleteAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DeleteAttendee.go b/service/chime/api_op_DeleteAttendee.go index 5a0089e073c..216b2725033 100644 --- a/service/chime/api_op_DeleteAttendee.go +++ b/service/chime/api_op_DeleteAttendee.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteAttendee(ctx context.Context, params *DeleteAttendeeInput addawsRestjson1_serdeOpDeleteAttendeeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DeleteEventsConfiguration.go b/service/chime/api_op_DeleteEventsConfiguration.go index ece187dd38a..be2c8b1c455 100644 --- a/service/chime/api_op_DeleteEventsConfiguration.go +++ b/service/chime/api_op_DeleteEventsConfiguration.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteEventsConfiguration(ctx context.Context, params *DeleteEv addawsRestjson1_serdeOpDeleteEventsConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DeleteMeeting.go b/service/chime/api_op_DeleteMeeting.go index 502e96862a3..691e4647075 100644 --- a/service/chime/api_op_DeleteMeeting.go +++ b/service/chime/api_op_DeleteMeeting.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteMeeting(ctx context.Context, params *DeleteMeetingInput, addawsRestjson1_serdeOpDeleteMeetingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DeletePhoneNumber.go b/service/chime/api_op_DeletePhoneNumber.go index 3c2a262578b..5ab873dddcb 100644 --- a/service/chime/api_op_DeletePhoneNumber.go +++ b/service/chime/api_op_DeletePhoneNumber.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeletePhoneNumber(ctx context.Context, params *DeletePhoneNumbe addawsRestjson1_serdeOpDeletePhoneNumberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DeleteProxySession.go b/service/chime/api_op_DeleteProxySession.go index 2203f2fe583..8038bd5951e 100644 --- a/service/chime/api_op_DeleteProxySession.go +++ b/service/chime/api_op_DeleteProxySession.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteProxySession(ctx context.Context, params *DeleteProxySess addawsRestjson1_serdeOpDeleteProxySessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DeleteRoom.go b/service/chime/api_op_DeleteRoom.go index d7039bf6c2c..74210a47444 100644 --- a/service/chime/api_op_DeleteRoom.go +++ b/service/chime/api_op_DeleteRoom.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRoom(ctx context.Context, params *DeleteRoomInput, optFns addawsRestjson1_serdeOpDeleteRoomMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DeleteRoomMembership.go b/service/chime/api_op_DeleteRoomMembership.go index 59e667f5120..f1f2a29e0aa 100644 --- a/service/chime/api_op_DeleteRoomMembership.go +++ b/service/chime/api_op_DeleteRoomMembership.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRoomMembership(ctx context.Context, params *DeleteRoomMem addawsRestjson1_serdeOpDeleteRoomMembershipMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DeleteVoiceConnector.go b/service/chime/api_op_DeleteVoiceConnector.go index cf37b806ef0..c087fac1a3d 100644 --- a/service/chime/api_op_DeleteVoiceConnector.go +++ b/service/chime/api_op_DeleteVoiceConnector.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteVoiceConnector(ctx context.Context, params *DeleteVoiceCo addawsRestjson1_serdeOpDeleteVoiceConnectorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DeleteVoiceConnectorEmergencyCallingConfiguration.go b/service/chime/api_op_DeleteVoiceConnectorEmergencyCallingConfiguration.go index 3651b977999..579d069e481 100644 --- a/service/chime/api_op_DeleteVoiceConnectorEmergencyCallingConfiguration.go +++ b/service/chime/api_op_DeleteVoiceConnectorEmergencyCallingConfiguration.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteVoiceConnectorEmergencyCallingConfiguration(ctx context.C addawsRestjson1_serdeOpDeleteVoiceConnectorEmergencyCallingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DeleteVoiceConnectorGroup.go b/service/chime/api_op_DeleteVoiceConnectorGroup.go index 53215b043b7..40589d8bdb5 100644 --- a/service/chime/api_op_DeleteVoiceConnectorGroup.go +++ b/service/chime/api_op_DeleteVoiceConnectorGroup.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteVoiceConnectorGroup(ctx context.Context, params *DeleteVo addawsRestjson1_serdeOpDeleteVoiceConnectorGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DeleteVoiceConnectorOrigination.go b/service/chime/api_op_DeleteVoiceConnectorOrigination.go index 88ba65a2310..e335e621009 100644 --- a/service/chime/api_op_DeleteVoiceConnectorOrigination.go +++ b/service/chime/api_op_DeleteVoiceConnectorOrigination.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteVoiceConnectorOrigination(ctx context.Context, params *De addawsRestjson1_serdeOpDeleteVoiceConnectorOriginationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DeleteVoiceConnectorProxy.go b/service/chime/api_op_DeleteVoiceConnectorProxy.go index e97e407a1a8..6e67524fde1 100644 --- a/service/chime/api_op_DeleteVoiceConnectorProxy.go +++ b/service/chime/api_op_DeleteVoiceConnectorProxy.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteVoiceConnectorProxy(ctx context.Context, params *DeleteVo addawsRestjson1_serdeOpDeleteVoiceConnectorProxyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DeleteVoiceConnectorStreamingConfiguration.go b/service/chime/api_op_DeleteVoiceConnectorStreamingConfiguration.go index 08e0d6ea4e1..cb4508d13f3 100644 --- a/service/chime/api_op_DeleteVoiceConnectorStreamingConfiguration.go +++ b/service/chime/api_op_DeleteVoiceConnectorStreamingConfiguration.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteVoiceConnectorStreamingConfiguration(ctx context.Context, addawsRestjson1_serdeOpDeleteVoiceConnectorStreamingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DeleteVoiceConnectorTermination.go b/service/chime/api_op_DeleteVoiceConnectorTermination.go index 522faa4c165..811c984edee 100644 --- a/service/chime/api_op_DeleteVoiceConnectorTermination.go +++ b/service/chime/api_op_DeleteVoiceConnectorTermination.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteVoiceConnectorTermination(ctx context.Context, params *De addawsRestjson1_serdeOpDeleteVoiceConnectorTerminationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DeleteVoiceConnectorTerminationCredentials.go b/service/chime/api_op_DeleteVoiceConnectorTerminationCredentials.go index cd6026e94f8..a6febcfa1de 100644 --- a/service/chime/api_op_DeleteVoiceConnectorTerminationCredentials.go +++ b/service/chime/api_op_DeleteVoiceConnectorTerminationCredentials.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteVoiceConnectorTerminationCredentials(ctx context.Context, addawsRestjson1_serdeOpDeleteVoiceConnectorTerminationCredentialsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DisassociatePhoneNumberFromUser.go b/service/chime/api_op_DisassociatePhoneNumberFromUser.go index 39602288858..7f42a85d7d3 100644 --- a/service/chime/api_op_DisassociatePhoneNumberFromUser.go +++ b/service/chime/api_op_DisassociatePhoneNumberFromUser.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisassociatePhoneNumberFromUser(ctx context.Context, params *Di addawsRestjson1_serdeOpDisassociatePhoneNumberFromUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DisassociatePhoneNumbersFromVoiceConnector.go b/service/chime/api_op_DisassociatePhoneNumbersFromVoiceConnector.go index 4d3c2aa101e..09045d5ac5c 100644 --- a/service/chime/api_op_DisassociatePhoneNumbersFromVoiceConnector.go +++ b/service/chime/api_op_DisassociatePhoneNumbersFromVoiceConnector.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DisassociatePhoneNumbersFromVoiceConnector(ctx context.Context, addawsRestjson1_serdeOpDisassociatePhoneNumbersFromVoiceConnectorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DisassociatePhoneNumbersFromVoiceConnectorGroup.go b/service/chime/api_op_DisassociatePhoneNumbersFromVoiceConnectorGroup.go index 1a07066e260..5cdf365b1d2 100644 --- a/service/chime/api_op_DisassociatePhoneNumbersFromVoiceConnectorGroup.go +++ b/service/chime/api_op_DisassociatePhoneNumbersFromVoiceConnectorGroup.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DisassociatePhoneNumbersFromVoiceConnectorGroup(ctx context.Con addawsRestjson1_serdeOpDisassociatePhoneNumbersFromVoiceConnectorGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_DisassociateSigninDelegateGroupsFromAccount.go b/service/chime/api_op_DisassociateSigninDelegateGroupsFromAccount.go index 2a4f2458616..d29b945b5f1 100644 --- a/service/chime/api_op_DisassociateSigninDelegateGroupsFromAccount.go +++ b/service/chime/api_op_DisassociateSigninDelegateGroupsFromAccount.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisassociateSigninDelegateGroupsFromAccount(ctx context.Context addawsRestjson1_serdeOpDisassociateSigninDelegateGroupsFromAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetAccount.go b/service/chime/api_op_GetAccount.go index 050ebff1690..2712b0dd703 100644 --- a/service/chime/api_op_GetAccount.go +++ b/service/chime/api_op_GetAccount.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetAccount(ctx context.Context, params *GetAccountInput, optFns addawsRestjson1_serdeOpGetAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetAccountSettings.go b/service/chime/api_op_GetAccountSettings.go index 4e64b9811a5..2da6a890e11 100644 --- a/service/chime/api_op_GetAccountSettings.go +++ b/service/chime/api_op_GetAccountSettings.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetAccountSettings(ctx context.Context, params *GetAccountSetti addawsRestjson1_serdeOpGetAccountSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetAttendee.go b/service/chime/api_op_GetAttendee.go index 2f79cb1754c..408051da40b 100644 --- a/service/chime/api_op_GetAttendee.go +++ b/service/chime/api_op_GetAttendee.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetAttendee(ctx context.Context, params *GetAttendeeInput, optF addawsRestjson1_serdeOpGetAttendeeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetBot.go b/service/chime/api_op_GetBot.go index 02faba17b43..ed359a0d79e 100644 --- a/service/chime/api_op_GetBot.go +++ b/service/chime/api_op_GetBot.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetBot(ctx context.Context, params *GetBotInput, optFns ...func addawsRestjson1_serdeOpGetBotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetEventsConfiguration.go b/service/chime/api_op_GetEventsConfiguration.go index d1ef320ce7a..e932c03a137 100644 --- a/service/chime/api_op_GetEventsConfiguration.go +++ b/service/chime/api_op_GetEventsConfiguration.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetEventsConfiguration(ctx context.Context, params *GetEventsCo addawsRestjson1_serdeOpGetEventsConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetGlobalSettings.go b/service/chime/api_op_GetGlobalSettings.go index 4f78b990baf..17523db2aa5 100644 --- a/service/chime/api_op_GetGlobalSettings.go +++ b/service/chime/api_op_GetGlobalSettings.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetGlobalSettings(ctx context.Context, params *GetGlobalSetting addawsRestjson1_serdeOpGetGlobalSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetMeeting.go b/service/chime/api_op_GetMeeting.go index 3d10aa8116a..58d80a0897e 100644 --- a/service/chime/api_op_GetMeeting.go +++ b/service/chime/api_op_GetMeeting.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetMeeting(ctx context.Context, params *GetMeetingInput, optFns addawsRestjson1_serdeOpGetMeetingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetPhoneNumber.go b/service/chime/api_op_GetPhoneNumber.go index f66b71d462e..972386a12d2 100644 --- a/service/chime/api_op_GetPhoneNumber.go +++ b/service/chime/api_op_GetPhoneNumber.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetPhoneNumber(ctx context.Context, params *GetPhoneNumberInput addawsRestjson1_serdeOpGetPhoneNumberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetPhoneNumberOrder.go b/service/chime/api_op_GetPhoneNumberOrder.go index ec71b663379..f8453cd425f 100644 --- a/service/chime/api_op_GetPhoneNumberOrder.go +++ b/service/chime/api_op_GetPhoneNumberOrder.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetPhoneNumberOrder(ctx context.Context, params *GetPhoneNumber addawsRestjson1_serdeOpGetPhoneNumberOrderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetPhoneNumberSettings.go b/service/chime/api_op_GetPhoneNumberSettings.go index db6943ce73b..b5d5ad4ec1f 100644 --- a/service/chime/api_op_GetPhoneNumberSettings.go +++ b/service/chime/api_op_GetPhoneNumberSettings.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) GetPhoneNumberSettings(ctx context.Context, params *GetPhoneNum addawsRestjson1_serdeOpGetPhoneNumberSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetProxySession.go b/service/chime/api_op_GetProxySession.go index 4f42c68a7b3..6d23346f97f 100644 --- a/service/chime/api_op_GetProxySession.go +++ b/service/chime/api_op_GetProxySession.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetProxySession(ctx context.Context, params *GetProxySessionInp addawsRestjson1_serdeOpGetProxySessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetRetentionSettings.go b/service/chime/api_op_GetRetentionSettings.go index b93b98a881e..574ab728a29 100644 --- a/service/chime/api_op_GetRetentionSettings.go +++ b/service/chime/api_op_GetRetentionSettings.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetRetentionSettings(ctx context.Context, params *GetRetentionS addawsRestjson1_serdeOpGetRetentionSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetRoom.go b/service/chime/api_op_GetRoom.go index 89a060db777..74f3ad8b995 100644 --- a/service/chime/api_op_GetRoom.go +++ b/service/chime/api_op_GetRoom.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetRoom(ctx context.Context, params *GetRoomInput, optFns ...fu addawsRestjson1_serdeOpGetRoomMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetUser.go b/service/chime/api_op_GetUser.go index df2c47d9216..41a3f90091a 100644 --- a/service/chime/api_op_GetUser.go +++ b/service/chime/api_op_GetUser.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetUser(ctx context.Context, params *GetUserInput, optFns ...fu addawsRestjson1_serdeOpGetUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetUserSettings.go b/service/chime/api_op_GetUserSettings.go index 6c275013150..e166d24c39e 100644 --- a/service/chime/api_op_GetUserSettings.go +++ b/service/chime/api_op_GetUserSettings.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetUserSettings(ctx context.Context, params *GetUserSettingsInp addawsRestjson1_serdeOpGetUserSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetVoiceConnector.go b/service/chime/api_op_GetVoiceConnector.go index 50f95ee8df7..b5494b845bf 100644 --- a/service/chime/api_op_GetVoiceConnector.go +++ b/service/chime/api_op_GetVoiceConnector.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetVoiceConnector(ctx context.Context, params *GetVoiceConnecto addawsRestjson1_serdeOpGetVoiceConnectorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetVoiceConnectorEmergencyCallingConfiguration.go b/service/chime/api_op_GetVoiceConnectorEmergencyCallingConfiguration.go index 4034e920b41..2ef7c30d4e0 100644 --- a/service/chime/api_op_GetVoiceConnectorEmergencyCallingConfiguration.go +++ b/service/chime/api_op_GetVoiceConnectorEmergencyCallingConfiguration.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetVoiceConnectorEmergencyCallingConfiguration(ctx context.Cont addawsRestjson1_serdeOpGetVoiceConnectorEmergencyCallingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetVoiceConnectorGroup.go b/service/chime/api_op_GetVoiceConnectorGroup.go index f46d4ff7b75..5fb78671849 100644 --- a/service/chime/api_op_GetVoiceConnectorGroup.go +++ b/service/chime/api_op_GetVoiceConnectorGroup.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetVoiceConnectorGroup(ctx context.Context, params *GetVoiceCon addawsRestjson1_serdeOpGetVoiceConnectorGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetVoiceConnectorLoggingConfiguration.go b/service/chime/api_op_GetVoiceConnectorLoggingConfiguration.go index 46ca8ba78db..598dc028f39 100644 --- a/service/chime/api_op_GetVoiceConnectorLoggingConfiguration.go +++ b/service/chime/api_op_GetVoiceConnectorLoggingConfiguration.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetVoiceConnectorLoggingConfiguration(ctx context.Context, para addawsRestjson1_serdeOpGetVoiceConnectorLoggingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetVoiceConnectorOrigination.go b/service/chime/api_op_GetVoiceConnectorOrigination.go index 6804c75f0f7..576c058f829 100644 --- a/service/chime/api_op_GetVoiceConnectorOrigination.go +++ b/service/chime/api_op_GetVoiceConnectorOrigination.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetVoiceConnectorOrigination(ctx context.Context, params *GetVo addawsRestjson1_serdeOpGetVoiceConnectorOriginationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetVoiceConnectorProxy.go b/service/chime/api_op_GetVoiceConnectorProxy.go index 71b5f46c4de..410790907f8 100644 --- a/service/chime/api_op_GetVoiceConnectorProxy.go +++ b/service/chime/api_op_GetVoiceConnectorProxy.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetVoiceConnectorProxy(ctx context.Context, params *GetVoiceCon addawsRestjson1_serdeOpGetVoiceConnectorProxyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetVoiceConnectorStreamingConfiguration.go b/service/chime/api_op_GetVoiceConnectorStreamingConfiguration.go index 619417266c0..b68970bc623 100644 --- a/service/chime/api_op_GetVoiceConnectorStreamingConfiguration.go +++ b/service/chime/api_op_GetVoiceConnectorStreamingConfiguration.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetVoiceConnectorStreamingConfiguration(ctx context.Context, pa addawsRestjson1_serdeOpGetVoiceConnectorStreamingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetVoiceConnectorTermination.go b/service/chime/api_op_GetVoiceConnectorTermination.go index 023e6e2ecd3..e1c21d0742c 100644 --- a/service/chime/api_op_GetVoiceConnectorTermination.go +++ b/service/chime/api_op_GetVoiceConnectorTermination.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetVoiceConnectorTermination(ctx context.Context, params *GetVo addawsRestjson1_serdeOpGetVoiceConnectorTerminationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_GetVoiceConnectorTerminationHealth.go b/service/chime/api_op_GetVoiceConnectorTerminationHealth.go index f83b24e7cd5..fb10a14602e 100644 --- a/service/chime/api_op_GetVoiceConnectorTerminationHealth.go +++ b/service/chime/api_op_GetVoiceConnectorTerminationHealth.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetVoiceConnectorTerminationHealth(ctx context.Context, params addawsRestjson1_serdeOpGetVoiceConnectorTerminationHealthMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_InviteUsers.go b/service/chime/api_op_InviteUsers.go index 946e01538ea..1362506e19d 100644 --- a/service/chime/api_op_InviteUsers.go +++ b/service/chime/api_op_InviteUsers.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) InviteUsers(ctx context.Context, params *InviteUsersInput, optF addawsRestjson1_serdeOpInviteUsersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_ListAccounts.go b/service/chime/api_op_ListAccounts.go index 3be8fbb141b..d4aff06d902 100644 --- a/service/chime/api_op_ListAccounts.go +++ b/service/chime/api_op_ListAccounts.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListAccounts(ctx context.Context, params *ListAccountsInput, op addawsRestjson1_serdeOpListAccountsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_ListAttendeeTags.go b/service/chime/api_op_ListAttendeeTags.go index 7620f2e7715..42faeb55de2 100644 --- a/service/chime/api_op_ListAttendeeTags.go +++ b/service/chime/api_op_ListAttendeeTags.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListAttendeeTags(ctx context.Context, params *ListAttendeeTagsI addawsRestjson1_serdeOpListAttendeeTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_ListAttendees.go b/service/chime/api_op_ListAttendees.go index 687a10076cf..dad85a090d3 100644 --- a/service/chime/api_op_ListAttendees.go +++ b/service/chime/api_op_ListAttendees.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListAttendees(ctx context.Context, params *ListAttendeesInput, addawsRestjson1_serdeOpListAttendeesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_ListBots.go b/service/chime/api_op_ListBots.go index 67ced600926..42bc044447c 100644 --- a/service/chime/api_op_ListBots.go +++ b/service/chime/api_op_ListBots.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListBots(ctx context.Context, params *ListBotsInput, optFns ... addawsRestjson1_serdeOpListBotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_ListMeetingTags.go b/service/chime/api_op_ListMeetingTags.go index d87fd08d75b..18f1b036261 100644 --- a/service/chime/api_op_ListMeetingTags.go +++ b/service/chime/api_op_ListMeetingTags.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListMeetingTags(ctx context.Context, params *ListMeetingTagsInp addawsRestjson1_serdeOpListMeetingTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_ListMeetings.go b/service/chime/api_op_ListMeetings.go index a42d3ddb4fd..c096de7982f 100644 --- a/service/chime/api_op_ListMeetings.go +++ b/service/chime/api_op_ListMeetings.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListMeetings(ctx context.Context, params *ListMeetingsInput, op addawsRestjson1_serdeOpListMeetingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_ListPhoneNumberOrders.go b/service/chime/api_op_ListPhoneNumberOrders.go index 1e6619d2a65..5fe67e6fa89 100644 --- a/service/chime/api_op_ListPhoneNumberOrders.go +++ b/service/chime/api_op_ListPhoneNumberOrders.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListPhoneNumberOrders(ctx context.Context, params *ListPhoneNum addawsRestjson1_serdeOpListPhoneNumberOrdersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_ListPhoneNumbers.go b/service/chime/api_op_ListPhoneNumbers.go index 6f33ec946ad..569b9c1eada 100644 --- a/service/chime/api_op_ListPhoneNumbers.go +++ b/service/chime/api_op_ListPhoneNumbers.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListPhoneNumbers(ctx context.Context, params *ListPhoneNumbersI addawsRestjson1_serdeOpListPhoneNumbersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_ListProxySessions.go b/service/chime/api_op_ListProxySessions.go index c11d5866e39..2a1e9b8990e 100644 --- a/service/chime/api_op_ListProxySessions.go +++ b/service/chime/api_op_ListProxySessions.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListProxySessions(ctx context.Context, params *ListProxySession addawsRestjson1_serdeOpListProxySessionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_ListRoomMemberships.go b/service/chime/api_op_ListRoomMemberships.go index 1ee2290d5e1..8b8e4c5cb7f 100644 --- a/service/chime/api_op_ListRoomMemberships.go +++ b/service/chime/api_op_ListRoomMemberships.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListRoomMemberships(ctx context.Context, params *ListRoomMember addawsRestjson1_serdeOpListRoomMembershipsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_ListRooms.go b/service/chime/api_op_ListRooms.go index a51ecdb67c6..7c68b004b21 100644 --- a/service/chime/api_op_ListRooms.go +++ b/service/chime/api_op_ListRooms.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListRooms(ctx context.Context, params *ListRoomsInput, optFns . addawsRestjson1_serdeOpListRoomsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_ListTagsForResource.go b/service/chime/api_op_ListTagsForResource.go index 351f83bc6c8..84cfd686bf4 100644 --- a/service/chime/api_op_ListTagsForResource.go +++ b/service/chime/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_ListUsers.go b/service/chime/api_op_ListUsers.go index 658b55ff190..68dc1794f06 100644 --- a/service/chime/api_op_ListUsers.go +++ b/service/chime/api_op_ListUsers.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListUsers(ctx context.Context, params *ListUsersInput, optFns . addawsRestjson1_serdeOpListUsersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_ListVoiceConnectorGroups.go b/service/chime/api_op_ListVoiceConnectorGroups.go index 9a1d97475f4..99eaec60750 100644 --- a/service/chime/api_op_ListVoiceConnectorGroups.go +++ b/service/chime/api_op_ListVoiceConnectorGroups.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListVoiceConnectorGroups(ctx context.Context, params *ListVoice addawsRestjson1_serdeOpListVoiceConnectorGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_ListVoiceConnectorTerminationCredentials.go b/service/chime/api_op_ListVoiceConnectorTerminationCredentials.go index 7f3d3c47359..71285224468 100644 --- a/service/chime/api_op_ListVoiceConnectorTerminationCredentials.go +++ b/service/chime/api_op_ListVoiceConnectorTerminationCredentials.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListVoiceConnectorTerminationCredentials(ctx context.Context, p addawsRestjson1_serdeOpListVoiceConnectorTerminationCredentialsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_ListVoiceConnectors.go b/service/chime/api_op_ListVoiceConnectors.go index 9187bac350f..52e7e1bd235 100644 --- a/service/chime/api_op_ListVoiceConnectors.go +++ b/service/chime/api_op_ListVoiceConnectors.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListVoiceConnectors(ctx context.Context, params *ListVoiceConne addawsRestjson1_serdeOpListVoiceConnectorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_LogoutUser.go b/service/chime/api_op_LogoutUser.go index ea321d55eaa..cd2ef8101db 100644 --- a/service/chime/api_op_LogoutUser.go +++ b/service/chime/api_op_LogoutUser.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) LogoutUser(ctx context.Context, params *LogoutUserInput, optFns addawsRestjson1_serdeOpLogoutUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_PutEventsConfiguration.go b/service/chime/api_op_PutEventsConfiguration.go index 7360561d6c5..554aa970c74 100644 --- a/service/chime/api_op_PutEventsConfiguration.go +++ b/service/chime/api_op_PutEventsConfiguration.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) PutEventsConfiguration(ctx context.Context, params *PutEventsCo addawsRestjson1_serdeOpPutEventsConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_PutRetentionSettings.go b/service/chime/api_op_PutRetentionSettings.go index f0f91a950a9..3f0d33cfbc4 100644 --- a/service/chime/api_op_PutRetentionSettings.go +++ b/service/chime/api_op_PutRetentionSettings.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) PutRetentionSettings(ctx context.Context, params *PutRetentionS addawsRestjson1_serdeOpPutRetentionSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_PutVoiceConnectorEmergencyCallingConfiguration.go b/service/chime/api_op_PutVoiceConnectorEmergencyCallingConfiguration.go index 5215b132797..f860a6da77a 100644 --- a/service/chime/api_op_PutVoiceConnectorEmergencyCallingConfiguration.go +++ b/service/chime/api_op_PutVoiceConnectorEmergencyCallingConfiguration.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) PutVoiceConnectorEmergencyCallingConfiguration(ctx context.Cont addawsRestjson1_serdeOpPutVoiceConnectorEmergencyCallingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_PutVoiceConnectorLoggingConfiguration.go b/service/chime/api_op_PutVoiceConnectorLoggingConfiguration.go index 226b79b69ee..a69e1ae0da8 100644 --- a/service/chime/api_op_PutVoiceConnectorLoggingConfiguration.go +++ b/service/chime/api_op_PutVoiceConnectorLoggingConfiguration.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) PutVoiceConnectorLoggingConfiguration(ctx context.Context, para addawsRestjson1_serdeOpPutVoiceConnectorLoggingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_PutVoiceConnectorOrigination.go b/service/chime/api_op_PutVoiceConnectorOrigination.go index 7aa9a17eb49..1734b171bed 100644 --- a/service/chime/api_op_PutVoiceConnectorOrigination.go +++ b/service/chime/api_op_PutVoiceConnectorOrigination.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) PutVoiceConnectorOrigination(ctx context.Context, params *PutVo addawsRestjson1_serdeOpPutVoiceConnectorOriginationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_PutVoiceConnectorProxy.go b/service/chime/api_op_PutVoiceConnectorProxy.go index 82a64845295..3b721ce093c 100644 --- a/service/chime/api_op_PutVoiceConnectorProxy.go +++ b/service/chime/api_op_PutVoiceConnectorProxy.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutVoiceConnectorProxy(ctx context.Context, params *PutVoiceCon addawsRestjson1_serdeOpPutVoiceConnectorProxyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_PutVoiceConnectorStreamingConfiguration.go b/service/chime/api_op_PutVoiceConnectorStreamingConfiguration.go index 6f6e961d91d..019774b345e 100644 --- a/service/chime/api_op_PutVoiceConnectorStreamingConfiguration.go +++ b/service/chime/api_op_PutVoiceConnectorStreamingConfiguration.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) PutVoiceConnectorStreamingConfiguration(ctx context.Context, pa addawsRestjson1_serdeOpPutVoiceConnectorStreamingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_PutVoiceConnectorTermination.go b/service/chime/api_op_PutVoiceConnectorTermination.go index c832a9a79c3..56be9d6afe5 100644 --- a/service/chime/api_op_PutVoiceConnectorTermination.go +++ b/service/chime/api_op_PutVoiceConnectorTermination.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) PutVoiceConnectorTermination(ctx context.Context, params *PutVo addawsRestjson1_serdeOpPutVoiceConnectorTerminationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_PutVoiceConnectorTerminationCredentials.go b/service/chime/api_op_PutVoiceConnectorTerminationCredentials.go index 1fba0498dba..03d8371e29b 100644 --- a/service/chime/api_op_PutVoiceConnectorTerminationCredentials.go +++ b/service/chime/api_op_PutVoiceConnectorTerminationCredentials.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutVoiceConnectorTerminationCredentials(ctx context.Context, pa addawsRestjson1_serdeOpPutVoiceConnectorTerminationCredentialsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_RedactConversationMessage.go b/service/chime/api_op_RedactConversationMessage.go index 97f9d97a925..92bd3ef3c6a 100644 --- a/service/chime/api_op_RedactConversationMessage.go +++ b/service/chime/api_op_RedactConversationMessage.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RedactConversationMessage(ctx context.Context, params *RedactCo addawsRestjson1_serdeOpRedactConversationMessageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_RedactRoomMessage.go b/service/chime/api_op_RedactRoomMessage.go index ddced83044e..f85a0581064 100644 --- a/service/chime/api_op_RedactRoomMessage.go +++ b/service/chime/api_op_RedactRoomMessage.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RedactRoomMessage(ctx context.Context, params *RedactRoomMessag addawsRestjson1_serdeOpRedactRoomMessageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_RegenerateSecurityToken.go b/service/chime/api_op_RegenerateSecurityToken.go index 66aa6fd79e9..197bab3f705 100644 --- a/service/chime/api_op_RegenerateSecurityToken.go +++ b/service/chime/api_op_RegenerateSecurityToken.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RegenerateSecurityToken(ctx context.Context, params *Regenerate addawsRestjson1_serdeOpRegenerateSecurityTokenMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_ResetPersonalPIN.go b/service/chime/api_op_ResetPersonalPIN.go index 8fb1ac2b32f..aca214b4933 100644 --- a/service/chime/api_op_ResetPersonalPIN.go +++ b/service/chime/api_op_ResetPersonalPIN.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ResetPersonalPIN(ctx context.Context, params *ResetPersonalPINI addawsRestjson1_serdeOpResetPersonalPINMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_RestorePhoneNumber.go b/service/chime/api_op_RestorePhoneNumber.go index 06aa2284242..3e24a1c6204 100644 --- a/service/chime/api_op_RestorePhoneNumber.go +++ b/service/chime/api_op_RestorePhoneNumber.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) RestorePhoneNumber(ctx context.Context, params *RestorePhoneNum addawsRestjson1_serdeOpRestorePhoneNumberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_SearchAvailablePhoneNumbers.go b/service/chime/api_op_SearchAvailablePhoneNumbers.go index b62d688cf1b..349c1b9dc09 100644 --- a/service/chime/api_op_SearchAvailablePhoneNumbers.go +++ b/service/chime/api_op_SearchAvailablePhoneNumbers.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) SearchAvailablePhoneNumbers(ctx context.Context, params *Search addawsRestjson1_serdeOpSearchAvailablePhoneNumbersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_TagAttendee.go b/service/chime/api_op_TagAttendee.go index f8e6e0c05ab..81fce2dfb09 100644 --- a/service/chime/api_op_TagAttendee.go +++ b/service/chime/api_op_TagAttendee.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TagAttendee(ctx context.Context, params *TagAttendeeInput, optF addawsRestjson1_serdeOpTagAttendeeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_TagMeeting.go b/service/chime/api_op_TagMeeting.go index 89b3a51edde..2edfb13ad73 100644 --- a/service/chime/api_op_TagMeeting.go +++ b/service/chime/api_op_TagMeeting.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TagMeeting(ctx context.Context, params *TagMeetingInput, optFns addawsRestjson1_serdeOpTagMeetingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_TagResource.go b/service/chime/api_op_TagResource.go index a6365e9c892..afeefb5072a 100644 --- a/service/chime/api_op_TagResource.go +++ b/service/chime/api_op_TagResource.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_UntagAttendee.go b/service/chime/api_op_UntagAttendee.go index 18914f1af81..4bf55532b8a 100644 --- a/service/chime/api_op_UntagAttendee.go +++ b/service/chime/api_op_UntagAttendee.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagAttendee(ctx context.Context, params *UntagAttendeeInput, addawsRestjson1_serdeOpUntagAttendeeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_UntagMeeting.go b/service/chime/api_op_UntagMeeting.go index 7f0d81d65b1..5b40c4e649a 100644 --- a/service/chime/api_op_UntagMeeting.go +++ b/service/chime/api_op_UntagMeeting.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagMeeting(ctx context.Context, params *UntagMeetingInput, op addawsRestjson1_serdeOpUntagMeetingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_UntagResource.go b/service/chime/api_op_UntagResource.go index 2d11a41e00f..70dd6108bd3 100644 --- a/service/chime/api_op_UntagResource.go +++ b/service/chime/api_op_UntagResource.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_UpdateAccount.go b/service/chime/api_op_UpdateAccount.go index 6c8e96b6dca..84f74edd54a 100644 --- a/service/chime/api_op_UpdateAccount.go +++ b/service/chime/api_op_UpdateAccount.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateAccount(ctx context.Context, params *UpdateAccountInput, addawsRestjson1_serdeOpUpdateAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_UpdateAccountSettings.go b/service/chime/api_op_UpdateAccountSettings.go index bc7e6ff8fdb..cf019db4846 100644 --- a/service/chime/api_op_UpdateAccountSettings.go +++ b/service/chime/api_op_UpdateAccountSettings.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateAccountSettings(ctx context.Context, params *UpdateAccoun addawsRestjson1_serdeOpUpdateAccountSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_UpdateBot.go b/service/chime/api_op_UpdateBot.go index 4d319329f5d..cb1838bb1b4 100644 --- a/service/chime/api_op_UpdateBot.go +++ b/service/chime/api_op_UpdateBot.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateBot(ctx context.Context, params *UpdateBotInput, optFns . addawsRestjson1_serdeOpUpdateBotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_UpdateGlobalSettings.go b/service/chime/api_op_UpdateGlobalSettings.go index 2ac2e661490..4f93ca53836 100644 --- a/service/chime/api_op_UpdateGlobalSettings.go +++ b/service/chime/api_op_UpdateGlobalSettings.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateGlobalSettings(ctx context.Context, params *UpdateGlobalS addawsRestjson1_serdeOpUpdateGlobalSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_UpdatePhoneNumber.go b/service/chime/api_op_UpdatePhoneNumber.go index 80facfc436f..aaf630faf7b 100644 --- a/service/chime/api_op_UpdatePhoneNumber.go +++ b/service/chime/api_op_UpdatePhoneNumber.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) UpdatePhoneNumber(ctx context.Context, params *UpdatePhoneNumbe addawsRestjson1_serdeOpUpdatePhoneNumberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_UpdatePhoneNumberSettings.go b/service/chime/api_op_UpdatePhoneNumberSettings.go index d24f5c3d873..523a0cdf85c 100644 --- a/service/chime/api_op_UpdatePhoneNumberSettings.go +++ b/service/chime/api_op_UpdatePhoneNumberSettings.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) UpdatePhoneNumberSettings(ctx context.Context, params *UpdatePh addawsRestjson1_serdeOpUpdatePhoneNumberSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_UpdateProxySession.go b/service/chime/api_op_UpdateProxySession.go index ae1b9dee557..48f9ca31719 100644 --- a/service/chime/api_op_UpdateProxySession.go +++ b/service/chime/api_op_UpdateProxySession.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateProxySession(ctx context.Context, params *UpdateProxySess addawsRestjson1_serdeOpUpdateProxySessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_UpdateRoom.go b/service/chime/api_op_UpdateRoom.go index 74eac509ef4..ed047d45e9e 100644 --- a/service/chime/api_op_UpdateRoom.go +++ b/service/chime/api_op_UpdateRoom.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateRoom(ctx context.Context, params *UpdateRoomInput, optFns addawsRestjson1_serdeOpUpdateRoomMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_UpdateRoomMembership.go b/service/chime/api_op_UpdateRoomMembership.go index 2511ac97e99..740607a0ac1 100644 --- a/service/chime/api_op_UpdateRoomMembership.go +++ b/service/chime/api_op_UpdateRoomMembership.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateRoomMembership(ctx context.Context, params *UpdateRoomMem addawsRestjson1_serdeOpUpdateRoomMembershipMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_UpdateUser.go b/service/chime/api_op_UpdateUser.go index f381bf64015..279750f44c9 100644 --- a/service/chime/api_op_UpdateUser.go +++ b/service/chime/api_op_UpdateUser.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateUser(ctx context.Context, params *UpdateUserInput, optFns addawsRestjson1_serdeOpUpdateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_UpdateUserSettings.go b/service/chime/api_op_UpdateUserSettings.go index eb6fa0212dc..ec5d1887e4c 100644 --- a/service/chime/api_op_UpdateUserSettings.go +++ b/service/chime/api_op_UpdateUserSettings.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateUserSettings(ctx context.Context, params *UpdateUserSetti addawsRestjson1_serdeOpUpdateUserSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_UpdateVoiceConnector.go b/service/chime/api_op_UpdateVoiceConnector.go index 3d5e7a6a3df..f6d53d970bb 100644 --- a/service/chime/api_op_UpdateVoiceConnector.go +++ b/service/chime/api_op_UpdateVoiceConnector.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateVoiceConnector(ctx context.Context, params *UpdateVoiceCo addawsRestjson1_serdeOpUpdateVoiceConnectorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/api_op_UpdateVoiceConnectorGroup.go b/service/chime/api_op_UpdateVoiceConnectorGroup.go index 1b9249f82b6..b819c5bfe5c 100644 --- a/service/chime/api_op_UpdateVoiceConnectorGroup.go +++ b/service/chime/api_op_UpdateVoiceConnectorGroup.go @@ -5,7 +5,6 @@ package chime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/chime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateVoiceConnectorGroup(ctx context.Context, params *UpdateVo addawsRestjson1_serdeOpUpdateVoiceConnectorGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/chime/endpoints.go b/service/chime/endpoints.go index 6b5f8dfebeb..4bcc7cf6375 100644 --- a/service/chime/endpoints.go +++ b/service/chime/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/cloud9/api_client.go b/service/cloud9/api_client.go index d4cdc4df96d..6bf0600efa6 100644 --- a/service/cloud9/api_client.go +++ b/service/cloud9/api_client.go @@ -122,30 +122,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -211,6 +187,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/cloud9/api_op_CreateEnvironmentEC2.go b/service/cloud9/api_op_CreateEnvironmentEC2.go index 9c69f900e53..a6d4c29fcb5 100644 --- a/service/cloud9/api_op_CreateEnvironmentEC2.go +++ b/service/cloud9/api_op_CreateEnvironmentEC2.go @@ -5,7 +5,6 @@ package cloud9 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloud9/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateEnvironmentEC2(ctx context.Context, params *CreateEnviron addawsAwsjson11_serdeOpCreateEnvironmentEC2Middlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloud9/api_op_CreateEnvironmentMembership.go b/service/cloud9/api_op_CreateEnvironmentMembership.go index 78e62cde7b9..800a93c3757 100644 --- a/service/cloud9/api_op_CreateEnvironmentMembership.go +++ b/service/cloud9/api_op_CreateEnvironmentMembership.go @@ -5,7 +5,6 @@ package cloud9 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloud9/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateEnvironmentMembership(ctx context.Context, params *Create addawsAwsjson11_serdeOpCreateEnvironmentMembershipMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloud9/api_op_DeleteEnvironment.go b/service/cloud9/api_op_DeleteEnvironment.go index 1f162dd65bc..25d9558fe3d 100644 --- a/service/cloud9/api_op_DeleteEnvironment.go +++ b/service/cloud9/api_op_DeleteEnvironment.go @@ -5,7 +5,6 @@ package cloud9 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteEnvironment(ctx context.Context, params *DeleteEnvironmen addawsAwsjson11_serdeOpDeleteEnvironmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloud9/api_op_DeleteEnvironmentMembership.go b/service/cloud9/api_op_DeleteEnvironmentMembership.go index af64ab4cd97..23ba9955781 100644 --- a/service/cloud9/api_op_DeleteEnvironmentMembership.go +++ b/service/cloud9/api_op_DeleteEnvironmentMembership.go @@ -5,7 +5,6 @@ package cloud9 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteEnvironmentMembership(ctx context.Context, params *Delete addawsAwsjson11_serdeOpDeleteEnvironmentMembershipMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloud9/api_op_DescribeEnvironmentMemberships.go b/service/cloud9/api_op_DescribeEnvironmentMemberships.go index e237a12842a..011b1f95bf5 100644 --- a/service/cloud9/api_op_DescribeEnvironmentMemberships.go +++ b/service/cloud9/api_op_DescribeEnvironmentMemberships.go @@ -5,7 +5,6 @@ package cloud9 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloud9/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEnvironmentMemberships(ctx context.Context, params *Des addawsAwsjson11_serdeOpDescribeEnvironmentMembershipsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloud9/api_op_DescribeEnvironmentStatus.go b/service/cloud9/api_op_DescribeEnvironmentStatus.go index f1c266c72f6..9f66647381c 100644 --- a/service/cloud9/api_op_DescribeEnvironmentStatus.go +++ b/service/cloud9/api_op_DescribeEnvironmentStatus.go @@ -5,7 +5,6 @@ package cloud9 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloud9/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeEnvironmentStatus(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeEnvironmentStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloud9/api_op_DescribeEnvironments.go b/service/cloud9/api_op_DescribeEnvironments.go index 5fe03618c2f..f83c1cfcc48 100644 --- a/service/cloud9/api_op_DescribeEnvironments.go +++ b/service/cloud9/api_op_DescribeEnvironments.go @@ -5,7 +5,6 @@ package cloud9 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloud9/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeEnvironments(ctx context.Context, params *DescribeEnvir addawsAwsjson11_serdeOpDescribeEnvironmentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloud9/api_op_ListEnvironments.go b/service/cloud9/api_op_ListEnvironments.go index a2782d72420..2c2cbcb48b5 100644 --- a/service/cloud9/api_op_ListEnvironments.go +++ b/service/cloud9/api_op_ListEnvironments.go @@ -5,7 +5,6 @@ package cloud9 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListEnvironments(ctx context.Context, params *ListEnvironmentsI addawsAwsjson11_serdeOpListEnvironmentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloud9/api_op_ListTagsForResource.go b/service/cloud9/api_op_ListTagsForResource.go index e494ca66e18..087cdbef91a 100644 --- a/service/cloud9/api_op_ListTagsForResource.go +++ b/service/cloud9/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package cloud9 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloud9/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloud9/api_op_TagResource.go b/service/cloud9/api_op_TagResource.go index 15bcda96fe7..31dac6af19f 100644 --- a/service/cloud9/api_op_TagResource.go +++ b/service/cloud9/api_op_TagResource.go @@ -5,7 +5,6 @@ package cloud9 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloud9/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloud9/api_op_UntagResource.go b/service/cloud9/api_op_UntagResource.go index 75e6552fd02..fd862bd1ab6 100644 --- a/service/cloud9/api_op_UntagResource.go +++ b/service/cloud9/api_op_UntagResource.go @@ -5,7 +5,6 @@ package cloud9 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloud9/api_op_UpdateEnvironment.go b/service/cloud9/api_op_UpdateEnvironment.go index ef4b37e4055..dca04851327 100644 --- a/service/cloud9/api_op_UpdateEnvironment.go +++ b/service/cloud9/api_op_UpdateEnvironment.go @@ -5,7 +5,6 @@ package cloud9 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateEnvironment(ctx context.Context, params *UpdateEnvironmen addawsAwsjson11_serdeOpUpdateEnvironmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloud9/api_op_UpdateEnvironmentMembership.go b/service/cloud9/api_op_UpdateEnvironmentMembership.go index 7e4fa533aff..7bdd0cd8a61 100644 --- a/service/cloud9/api_op_UpdateEnvironmentMembership.go +++ b/service/cloud9/api_op_UpdateEnvironmentMembership.go @@ -5,7 +5,6 @@ package cloud9 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloud9/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateEnvironmentMembership(ctx context.Context, params *Update addawsAwsjson11_serdeOpUpdateEnvironmentMembershipMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloud9/endpoints.go b/service/cloud9/endpoints.go index 2cf9841233c..a072d13a994 100644 --- a/service/cloud9/endpoints.go +++ b/service/cloud9/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/clouddirectory/api_client.go b/service/clouddirectory/api_client.go index 195ed1cdfa3..4a12d40aca6 100644 --- a/service/clouddirectory/api_client.go +++ b/service/clouddirectory/api_client.go @@ -84,30 +84,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -173,6 +149,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/clouddirectory/api_op_AddFacetToObject.go b/service/clouddirectory/api_op_AddFacetToObject.go index 747c81a690a..34837adb9ad 100644 --- a/service/clouddirectory/api_op_AddFacetToObject.go +++ b/service/clouddirectory/api_op_AddFacetToObject.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AddFacetToObject(ctx context.Context, params *AddFacetToObjectI addawsRestjson1_serdeOpAddFacetToObjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ApplySchema.go b/service/clouddirectory/api_op_ApplySchema.go index 42cf9a95997..051ae32e8e9 100644 --- a/service/clouddirectory/api_op_ApplySchema.go +++ b/service/clouddirectory/api_op_ApplySchema.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ApplySchema(ctx context.Context, params *ApplySchemaInput, optF addawsRestjson1_serdeOpApplySchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_AttachObject.go b/service/clouddirectory/api_op_AttachObject.go index 342fc6b0b80..812bd6e9258 100644 --- a/service/clouddirectory/api_op_AttachObject.go +++ b/service/clouddirectory/api_op_AttachObject.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) AttachObject(ctx context.Context, params *AttachObjectInput, op addawsRestjson1_serdeOpAttachObjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_AttachPolicy.go b/service/clouddirectory/api_op_AttachPolicy.go index 012675b47bf..dd24d63fe68 100644 --- a/service/clouddirectory/api_op_AttachPolicy.go +++ b/service/clouddirectory/api_op_AttachPolicy.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AttachPolicy(ctx context.Context, params *AttachPolicyInput, op addawsRestjson1_serdeOpAttachPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_AttachToIndex.go b/service/clouddirectory/api_op_AttachToIndex.go index 5bc7511f1b1..b40b37f16ba 100644 --- a/service/clouddirectory/api_op_AttachToIndex.go +++ b/service/clouddirectory/api_op_AttachToIndex.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) AttachToIndex(ctx context.Context, params *AttachToIndexInput, addawsRestjson1_serdeOpAttachToIndexMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_AttachTypedLink.go b/service/clouddirectory/api_op_AttachTypedLink.go index 94b5ca155eb..cdd9b631c9d 100644 --- a/service/clouddirectory/api_op_AttachTypedLink.go +++ b/service/clouddirectory/api_op_AttachTypedLink.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) AttachTypedLink(ctx context.Context, params *AttachTypedLinkInp addawsRestjson1_serdeOpAttachTypedLinkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_BatchRead.go b/service/clouddirectory/api_op_BatchRead.go index 83749a5aa97..6666b2d9e9c 100644 --- a/service/clouddirectory/api_op_BatchRead.go +++ b/service/clouddirectory/api_op_BatchRead.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchRead(ctx context.Context, params *BatchReadInput, optFns . addawsRestjson1_serdeOpBatchReadMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_BatchWrite.go b/service/clouddirectory/api_op_BatchWrite.go index a90a2fa9dce..8a1baa5f0e4 100644 --- a/service/clouddirectory/api_op_BatchWrite.go +++ b/service/clouddirectory/api_op_BatchWrite.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) BatchWrite(ctx context.Context, params *BatchWriteInput, optFns addawsRestjson1_serdeOpBatchWriteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_CreateDirectory.go b/service/clouddirectory/api_op_CreateDirectory.go index cec8d9a56c7..1b4e42b8492 100644 --- a/service/clouddirectory/api_op_CreateDirectory.go +++ b/service/clouddirectory/api_op_CreateDirectory.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) CreateDirectory(ctx context.Context, params *CreateDirectoryInp addawsRestjson1_serdeOpCreateDirectoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_CreateFacet.go b/service/clouddirectory/api_op_CreateFacet.go index b13a22fc0a1..3d83be7c45e 100644 --- a/service/clouddirectory/api_op_CreateFacet.go +++ b/service/clouddirectory/api_op_CreateFacet.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateFacet(ctx context.Context, params *CreateFacetInput, optF addawsRestjson1_serdeOpCreateFacetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_CreateIndex.go b/service/clouddirectory/api_op_CreateIndex.go index de14f904f05..6738a0916ce 100644 --- a/service/clouddirectory/api_op_CreateIndex.go +++ b/service/clouddirectory/api_op_CreateIndex.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateIndex(ctx context.Context, params *CreateIndexInput, optF addawsRestjson1_serdeOpCreateIndexMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_CreateObject.go b/service/clouddirectory/api_op_CreateObject.go index 44abc11a133..c925a7ce886 100644 --- a/service/clouddirectory/api_op_CreateObject.go +++ b/service/clouddirectory/api_op_CreateObject.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateObject(ctx context.Context, params *CreateObjectInput, op addawsRestjson1_serdeOpCreateObjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_CreateSchema.go b/service/clouddirectory/api_op_CreateSchema.go index 082f8703bd8..cab75aee588 100644 --- a/service/clouddirectory/api_op_CreateSchema.go +++ b/service/clouddirectory/api_op_CreateSchema.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) CreateSchema(ctx context.Context, params *CreateSchemaInput, op addawsRestjson1_serdeOpCreateSchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_CreateTypedLinkFacet.go b/service/clouddirectory/api_op_CreateTypedLinkFacet.go index 521c474bbab..b8f43cc2afb 100644 --- a/service/clouddirectory/api_op_CreateTypedLinkFacet.go +++ b/service/clouddirectory/api_op_CreateTypedLinkFacet.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateTypedLinkFacet(ctx context.Context, params *CreateTypedLi addawsRestjson1_serdeOpCreateTypedLinkFacetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_DeleteDirectory.go b/service/clouddirectory/api_op_DeleteDirectory.go index 986222c4027..74cf75a8e2d 100644 --- a/service/clouddirectory/api_op_DeleteDirectory.go +++ b/service/clouddirectory/api_op_DeleteDirectory.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDirectory(ctx context.Context, params *DeleteDirectoryInp addawsRestjson1_serdeOpDeleteDirectoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_DeleteFacet.go b/service/clouddirectory/api_op_DeleteFacet.go index 1e16bf81185..40f388e2a1d 100644 --- a/service/clouddirectory/api_op_DeleteFacet.go +++ b/service/clouddirectory/api_op_DeleteFacet.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteFacet(ctx context.Context, params *DeleteFacetInput, optF addawsRestjson1_serdeOpDeleteFacetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_DeleteObject.go b/service/clouddirectory/api_op_DeleteObject.go index e31e30b6a35..7611517fe44 100644 --- a/service/clouddirectory/api_op_DeleteObject.go +++ b/service/clouddirectory/api_op_DeleteObject.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeleteObject(ctx context.Context, params *DeleteObjectInput, op addawsRestjson1_serdeOpDeleteObjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_DeleteSchema.go b/service/clouddirectory/api_op_DeleteSchema.go index 0d19521d07d..1138e353482 100644 --- a/service/clouddirectory/api_op_DeleteSchema.go +++ b/service/clouddirectory/api_op_DeleteSchema.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteSchema(ctx context.Context, params *DeleteSchemaInput, op addawsRestjson1_serdeOpDeleteSchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_DeleteTypedLinkFacet.go b/service/clouddirectory/api_op_DeleteTypedLinkFacet.go index 8bbb33f8e56..d31516f4e70 100644 --- a/service/clouddirectory/api_op_DeleteTypedLinkFacet.go +++ b/service/clouddirectory/api_op_DeleteTypedLinkFacet.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteTypedLinkFacet(ctx context.Context, params *DeleteTypedLi addawsRestjson1_serdeOpDeleteTypedLinkFacetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_DetachFromIndex.go b/service/clouddirectory/api_op_DetachFromIndex.go index 8646d9ff2da..43eaeb84e05 100644 --- a/service/clouddirectory/api_op_DetachFromIndex.go +++ b/service/clouddirectory/api_op_DetachFromIndex.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DetachFromIndex(ctx context.Context, params *DetachFromIndexInp addawsRestjson1_serdeOpDetachFromIndexMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_DetachObject.go b/service/clouddirectory/api_op_DetachObject.go index cbcbf1532a5..8aad0aa8a5f 100644 --- a/service/clouddirectory/api_op_DetachObject.go +++ b/service/clouddirectory/api_op_DetachObject.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DetachObject(ctx context.Context, params *DetachObjectInput, op addawsRestjson1_serdeOpDetachObjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_DetachPolicy.go b/service/clouddirectory/api_op_DetachPolicy.go index 2a182dbc7df..db632f72b6e 100644 --- a/service/clouddirectory/api_op_DetachPolicy.go +++ b/service/clouddirectory/api_op_DetachPolicy.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DetachPolicy(ctx context.Context, params *DetachPolicyInput, op addawsRestjson1_serdeOpDetachPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_DetachTypedLink.go b/service/clouddirectory/api_op_DetachTypedLink.go index 9c418ba1e7f..75fd40420ec 100644 --- a/service/clouddirectory/api_op_DetachTypedLink.go +++ b/service/clouddirectory/api_op_DetachTypedLink.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DetachTypedLink(ctx context.Context, params *DetachTypedLinkInp addawsRestjson1_serdeOpDetachTypedLinkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_DisableDirectory.go b/service/clouddirectory/api_op_DisableDirectory.go index 77490fd0127..98ab9f77288 100644 --- a/service/clouddirectory/api_op_DisableDirectory.go +++ b/service/clouddirectory/api_op_DisableDirectory.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DisableDirectory(ctx context.Context, params *DisableDirectoryI addawsRestjson1_serdeOpDisableDirectoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_EnableDirectory.go b/service/clouddirectory/api_op_EnableDirectory.go index d491b15b4ac..9f3be929faa 100644 --- a/service/clouddirectory/api_op_EnableDirectory.go +++ b/service/clouddirectory/api_op_EnableDirectory.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) EnableDirectory(ctx context.Context, params *EnableDirectoryInp addawsRestjson1_serdeOpEnableDirectoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_GetAppliedSchemaVersion.go b/service/clouddirectory/api_op_GetAppliedSchemaVersion.go index 6560cad0223..3218d1c8db8 100644 --- a/service/clouddirectory/api_op_GetAppliedSchemaVersion.go +++ b/service/clouddirectory/api_op_GetAppliedSchemaVersion.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetAppliedSchemaVersion(ctx context.Context, params *GetApplied addawsRestjson1_serdeOpGetAppliedSchemaVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_GetDirectory.go b/service/clouddirectory/api_op_GetDirectory.go index a1ec5036ffe..091728a0fae 100644 --- a/service/clouddirectory/api_op_GetDirectory.go +++ b/service/clouddirectory/api_op_GetDirectory.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDirectory(ctx context.Context, params *GetDirectoryInput, op addawsRestjson1_serdeOpGetDirectoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_GetFacet.go b/service/clouddirectory/api_op_GetFacet.go index cec01b28cbc..1fc174877f1 100644 --- a/service/clouddirectory/api_op_GetFacet.go +++ b/service/clouddirectory/api_op_GetFacet.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetFacet(ctx context.Context, params *GetFacetInput, optFns ... addawsRestjson1_serdeOpGetFacetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_GetLinkAttributes.go b/service/clouddirectory/api_op_GetLinkAttributes.go index dc0de91861a..c36fce6f187 100644 --- a/service/clouddirectory/api_op_GetLinkAttributes.go +++ b/service/clouddirectory/api_op_GetLinkAttributes.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetLinkAttributes(ctx context.Context, params *GetLinkAttribute addawsRestjson1_serdeOpGetLinkAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_GetObjectAttributes.go b/service/clouddirectory/api_op_GetObjectAttributes.go index ca1708c48e8..9dcb0ae3285 100644 --- a/service/clouddirectory/api_op_GetObjectAttributes.go +++ b/service/clouddirectory/api_op_GetObjectAttributes.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetObjectAttributes(ctx context.Context, params *GetObjectAttri addawsRestjson1_serdeOpGetObjectAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_GetObjectInformation.go b/service/clouddirectory/api_op_GetObjectInformation.go index 784c799e8d7..51b5df71780 100644 --- a/service/clouddirectory/api_op_GetObjectInformation.go +++ b/service/clouddirectory/api_op_GetObjectInformation.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetObjectInformation(ctx context.Context, params *GetObjectInfo addawsRestjson1_serdeOpGetObjectInformationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_GetSchemaAsJson.go b/service/clouddirectory/api_op_GetSchemaAsJson.go index a299de81855..90093fc93c9 100644 --- a/service/clouddirectory/api_op_GetSchemaAsJson.go +++ b/service/clouddirectory/api_op_GetSchemaAsJson.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) GetSchemaAsJson(ctx context.Context, params *GetSchemaAsJsonInp addawsRestjson1_serdeOpGetSchemaAsJsonMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_GetTypedLinkFacetInformation.go b/service/clouddirectory/api_op_GetTypedLinkFacetInformation.go index 90908dacc81..6d54ed7f7b7 100644 --- a/service/clouddirectory/api_op_GetTypedLinkFacetInformation.go +++ b/service/clouddirectory/api_op_GetTypedLinkFacetInformation.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) GetTypedLinkFacetInformation(ctx context.Context, params *GetTy addawsRestjson1_serdeOpGetTypedLinkFacetInformationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListAppliedSchemaArns.go b/service/clouddirectory/api_op_ListAppliedSchemaArns.go index 652898a9449..786edfe871e 100644 --- a/service/clouddirectory/api_op_ListAppliedSchemaArns.go +++ b/service/clouddirectory/api_op_ListAppliedSchemaArns.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ListAppliedSchemaArns(ctx context.Context, params *ListAppliedS addawsRestjson1_serdeOpListAppliedSchemaArnsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListAttachedIndices.go b/service/clouddirectory/api_op_ListAttachedIndices.go index 3c6303616a2..f672c287b88 100644 --- a/service/clouddirectory/api_op_ListAttachedIndices.go +++ b/service/clouddirectory/api_op_ListAttachedIndices.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListAttachedIndices(ctx context.Context, params *ListAttachedIn addawsRestjson1_serdeOpListAttachedIndicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListDevelopmentSchemaArns.go b/service/clouddirectory/api_op_ListDevelopmentSchemaArns.go index d65d90deb8d..91b7d604e9e 100644 --- a/service/clouddirectory/api_op_ListDevelopmentSchemaArns.go +++ b/service/clouddirectory/api_op_ListDevelopmentSchemaArns.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListDevelopmentSchemaArns(ctx context.Context, params *ListDeve addawsRestjson1_serdeOpListDevelopmentSchemaArnsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListDirectories.go b/service/clouddirectory/api_op_ListDirectories.go index cec1d32aeda..65ede57f5b1 100644 --- a/service/clouddirectory/api_op_ListDirectories.go +++ b/service/clouddirectory/api_op_ListDirectories.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDirectories(ctx context.Context, params *ListDirectoriesInp addawsRestjson1_serdeOpListDirectoriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListFacetAttributes.go b/service/clouddirectory/api_op_ListFacetAttributes.go index b883ea621fb..3d4aa28b98d 100644 --- a/service/clouddirectory/api_op_ListFacetAttributes.go +++ b/service/clouddirectory/api_op_ListFacetAttributes.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListFacetAttributes(ctx context.Context, params *ListFacetAttri addawsRestjson1_serdeOpListFacetAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListFacetNames.go b/service/clouddirectory/api_op_ListFacetNames.go index 96c09c86837..60a380a23bc 100644 --- a/service/clouddirectory/api_op_ListFacetNames.go +++ b/service/clouddirectory/api_op_ListFacetNames.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListFacetNames(ctx context.Context, params *ListFacetNamesInput addawsRestjson1_serdeOpListFacetNamesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListIncomingTypedLinks.go b/service/clouddirectory/api_op_ListIncomingTypedLinks.go index 09ce1845221..2162eaa01f5 100644 --- a/service/clouddirectory/api_op_ListIncomingTypedLinks.go +++ b/service/clouddirectory/api_op_ListIncomingTypedLinks.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListIncomingTypedLinks(ctx context.Context, params *ListIncomin addawsRestjson1_serdeOpListIncomingTypedLinksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListIndex.go b/service/clouddirectory/api_op_ListIndex.go index 087d155d765..7b8ac68fb51 100644 --- a/service/clouddirectory/api_op_ListIndex.go +++ b/service/clouddirectory/api_op_ListIndex.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListIndex(ctx context.Context, params *ListIndexInput, optFns . addawsRestjson1_serdeOpListIndexMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListManagedSchemaArns.go b/service/clouddirectory/api_op_ListManagedSchemaArns.go index 0a5c909af78..011ff32105c 100644 --- a/service/clouddirectory/api_op_ListManagedSchemaArns.go +++ b/service/clouddirectory/api_op_ListManagedSchemaArns.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ListManagedSchemaArns(ctx context.Context, params *ListManagedS addawsRestjson1_serdeOpListManagedSchemaArnsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListObjectAttributes.go b/service/clouddirectory/api_op_ListObjectAttributes.go index 26279fc97d5..5443e1a3f31 100644 --- a/service/clouddirectory/api_op_ListObjectAttributes.go +++ b/service/clouddirectory/api_op_ListObjectAttributes.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListObjectAttributes(ctx context.Context, params *ListObjectAtt addawsRestjson1_serdeOpListObjectAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListObjectChildren.go b/service/clouddirectory/api_op_ListObjectChildren.go index 72113ad4077..63afee72694 100644 --- a/service/clouddirectory/api_op_ListObjectChildren.go +++ b/service/clouddirectory/api_op_ListObjectChildren.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListObjectChildren(ctx context.Context, params *ListObjectChild addawsRestjson1_serdeOpListObjectChildrenMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListObjectParentPaths.go b/service/clouddirectory/api_op_ListObjectParentPaths.go index 96a62393a01..7ea43f990d2 100644 --- a/service/clouddirectory/api_op_ListObjectParentPaths.go +++ b/service/clouddirectory/api_op_ListObjectParentPaths.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) ListObjectParentPaths(ctx context.Context, params *ListObjectPa addawsRestjson1_serdeOpListObjectParentPathsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListObjectParents.go b/service/clouddirectory/api_op_ListObjectParents.go index dbcd9e9234f..49050a2ef69 100644 --- a/service/clouddirectory/api_op_ListObjectParents.go +++ b/service/clouddirectory/api_op_ListObjectParents.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListObjectParents(ctx context.Context, params *ListObjectParent addawsRestjson1_serdeOpListObjectParentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListObjectPolicies.go b/service/clouddirectory/api_op_ListObjectPolicies.go index dbc7940d5d9..6cc9e4c1fb8 100644 --- a/service/clouddirectory/api_op_ListObjectPolicies.go +++ b/service/clouddirectory/api_op_ListObjectPolicies.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListObjectPolicies(ctx context.Context, params *ListObjectPolic addawsRestjson1_serdeOpListObjectPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListOutgoingTypedLinks.go b/service/clouddirectory/api_op_ListOutgoingTypedLinks.go index 25fbf643cf1..6cdab4525f2 100644 --- a/service/clouddirectory/api_op_ListOutgoingTypedLinks.go +++ b/service/clouddirectory/api_op_ListOutgoingTypedLinks.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListOutgoingTypedLinks(ctx context.Context, params *ListOutgoin addawsRestjson1_serdeOpListOutgoingTypedLinksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListPolicyAttachments.go b/service/clouddirectory/api_op_ListPolicyAttachments.go index d24473f8715..2cfe20250b2 100644 --- a/service/clouddirectory/api_op_ListPolicyAttachments.go +++ b/service/clouddirectory/api_op_ListPolicyAttachments.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListPolicyAttachments(ctx context.Context, params *ListPolicyAt addawsRestjson1_serdeOpListPolicyAttachmentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListPublishedSchemaArns.go b/service/clouddirectory/api_op_ListPublishedSchemaArns.go index 75df0d97b8e..627cb0f752f 100644 --- a/service/clouddirectory/api_op_ListPublishedSchemaArns.go +++ b/service/clouddirectory/api_op_ListPublishedSchemaArns.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ListPublishedSchemaArns(ctx context.Context, params *ListPublis addawsRestjson1_serdeOpListPublishedSchemaArnsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListTagsForResource.go b/service/clouddirectory/api_op_ListTagsForResource.go index 1ecdeef2ba7..5ea593a1867 100644 --- a/service/clouddirectory/api_op_ListTagsForResource.go +++ b/service/clouddirectory/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListTypedLinkFacetAttributes.go b/service/clouddirectory/api_op_ListTypedLinkFacetAttributes.go index 6387c2c88d0..e7e4d5f2141 100644 --- a/service/clouddirectory/api_op_ListTypedLinkFacetAttributes.go +++ b/service/clouddirectory/api_op_ListTypedLinkFacetAttributes.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListTypedLinkFacetAttributes(ctx context.Context, params *ListT addawsRestjson1_serdeOpListTypedLinkFacetAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_ListTypedLinkFacetNames.go b/service/clouddirectory/api_op_ListTypedLinkFacetNames.go index 182a7161fe9..faa5264ace1 100644 --- a/service/clouddirectory/api_op_ListTypedLinkFacetNames.go +++ b/service/clouddirectory/api_op_ListTypedLinkFacetNames.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ListTypedLinkFacetNames(ctx context.Context, params *ListTypedL addawsRestjson1_serdeOpListTypedLinkFacetNamesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_LookupPolicy.go b/service/clouddirectory/api_op_LookupPolicy.go index 928477c6168..103317c38b0 100644 --- a/service/clouddirectory/api_op_LookupPolicy.go +++ b/service/clouddirectory/api_op_LookupPolicy.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) LookupPolicy(ctx context.Context, params *LookupPolicyInput, op addawsRestjson1_serdeOpLookupPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_PublishSchema.go b/service/clouddirectory/api_op_PublishSchema.go index aa44fcba9f2..998535d1f74 100644 --- a/service/clouddirectory/api_op_PublishSchema.go +++ b/service/clouddirectory/api_op_PublishSchema.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) PublishSchema(ctx context.Context, params *PublishSchemaInput, addawsRestjson1_serdeOpPublishSchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_PutSchemaFromJson.go b/service/clouddirectory/api_op_PutSchemaFromJson.go index d81a91e8edd..adc5517d812 100644 --- a/service/clouddirectory/api_op_PutSchemaFromJson.go +++ b/service/clouddirectory/api_op_PutSchemaFromJson.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) PutSchemaFromJson(ctx context.Context, params *PutSchemaFromJso addawsRestjson1_serdeOpPutSchemaFromJsonMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_RemoveFacetFromObject.go b/service/clouddirectory/api_op_RemoveFacetFromObject.go index f1747304b54..a786ceb858a 100644 --- a/service/clouddirectory/api_op_RemoveFacetFromObject.go +++ b/service/clouddirectory/api_op_RemoveFacetFromObject.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RemoveFacetFromObject(ctx context.Context, params *RemoveFacetF addawsRestjson1_serdeOpRemoveFacetFromObjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_TagResource.go b/service/clouddirectory/api_op_TagResource.go index 6c6faea4658..325310dc6b7 100644 --- a/service/clouddirectory/api_op_TagResource.go +++ b/service/clouddirectory/api_op_TagResource.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_UntagResource.go b/service/clouddirectory/api_op_UntagResource.go index a9d38681d41..a59cb79a706 100644 --- a/service/clouddirectory/api_op_UntagResource.go +++ b/service/clouddirectory/api_op_UntagResource.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_UpdateFacet.go b/service/clouddirectory/api_op_UpdateFacet.go index 169066feb8d..550fa7dcd98 100644 --- a/service/clouddirectory/api_op_UpdateFacet.go +++ b/service/clouddirectory/api_op_UpdateFacet.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) UpdateFacet(ctx context.Context, params *UpdateFacetInput, optF addawsRestjson1_serdeOpUpdateFacetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_UpdateLinkAttributes.go b/service/clouddirectory/api_op_UpdateLinkAttributes.go index 0a742d39652..70c194925ba 100644 --- a/service/clouddirectory/api_op_UpdateLinkAttributes.go +++ b/service/clouddirectory/api_op_UpdateLinkAttributes.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateLinkAttributes(ctx context.Context, params *UpdateLinkAtt addawsRestjson1_serdeOpUpdateLinkAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_UpdateObjectAttributes.go b/service/clouddirectory/api_op_UpdateObjectAttributes.go index b2e60d31927..7eee104fa1b 100644 --- a/service/clouddirectory/api_op_UpdateObjectAttributes.go +++ b/service/clouddirectory/api_op_UpdateObjectAttributes.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateObjectAttributes(ctx context.Context, params *UpdateObjec addawsRestjson1_serdeOpUpdateObjectAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_UpdateSchema.go b/service/clouddirectory/api_op_UpdateSchema.go index 5286976b6a9..4cd171f4551 100644 --- a/service/clouddirectory/api_op_UpdateSchema.go +++ b/service/clouddirectory/api_op_UpdateSchema.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpdateSchema(ctx context.Context, params *UpdateSchemaInput, op addawsRestjson1_serdeOpUpdateSchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_UpdateTypedLinkFacet.go b/service/clouddirectory/api_op_UpdateTypedLinkFacet.go index d2123e68086..03951b45d73 100644 --- a/service/clouddirectory/api_op_UpdateTypedLinkFacet.go +++ b/service/clouddirectory/api_op_UpdateTypedLinkFacet.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/clouddirectory/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateTypedLinkFacet(ctx context.Context, params *UpdateTypedLi addawsRestjson1_serdeOpUpdateTypedLinkFacetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_UpgradeAppliedSchema.go b/service/clouddirectory/api_op_UpgradeAppliedSchema.go index f374f1345e0..b34bb0dc46b 100644 --- a/service/clouddirectory/api_op_UpgradeAppliedSchema.go +++ b/service/clouddirectory/api_op_UpgradeAppliedSchema.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) UpgradeAppliedSchema(ctx context.Context, params *UpgradeApplie addawsRestjson1_serdeOpUpgradeAppliedSchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/api_op_UpgradePublishedSchema.go b/service/clouddirectory/api_op_UpgradePublishedSchema.go index 5750da42052..7663658e78b 100644 --- a/service/clouddirectory/api_op_UpgradePublishedSchema.go +++ b/service/clouddirectory/api_op_UpgradePublishedSchema.go @@ -5,7 +5,6 @@ package clouddirectory import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpgradePublishedSchema(ctx context.Context, params *UpgradePubl addawsRestjson1_serdeOpUpgradePublishedSchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/clouddirectory/endpoints.go b/service/clouddirectory/endpoints.go index e19068e7788..029ffa9dc52 100644 --- a/service/clouddirectory/endpoints.go +++ b/service/clouddirectory/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/cloudformation/api_client.go b/service/cloudformation/api_client.go index 3042e06e769..8e0cb7b8750 100644 --- a/service/cloudformation/api_client.go +++ b/service/cloudformation/api_client.go @@ -99,34 +99,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -199,6 +171,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/cloudformation/api_op_CancelUpdateStack.go b/service/cloudformation/api_op_CancelUpdateStack.go index 4b6475e05ec..79b3727c874 100644 --- a/service/cloudformation/api_op_CancelUpdateStack.go +++ b/service/cloudformation/api_op_CancelUpdateStack.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CancelUpdateStack(ctx context.Context, params *CancelUpdateStac addawsAwsquery_serdeOpCancelUpdateStackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_ContinueUpdateRollback.go b/service/cloudformation/api_op_ContinueUpdateRollback.go index 39628bf0289..ac03cff7951 100644 --- a/service/cloudformation/api_op_ContinueUpdateRollback.go +++ b/service/cloudformation/api_op_ContinueUpdateRollback.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -34,9 +33,9 @@ func (c *Client) ContinueUpdateRollback(ctx context.Context, params *ContinueUpd addawsAwsquery_serdeOpContinueUpdateRollbackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_CreateChangeSet.go b/service/cloudformation/api_op_CreateChangeSet.go index 4d9f10353b4..24a2657bd9e 100644 --- a/service/cloudformation/api_op_CreateChangeSet.go +++ b/service/cloudformation/api_op_CreateChangeSet.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) CreateChangeSet(ctx context.Context, params *CreateChangeSetInp addawsAwsquery_serdeOpCreateChangeSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_CreateStack.go b/service/cloudformation/api_op_CreateStack.go index 45852ffe45d..09241146f1a 100644 --- a/service/cloudformation/api_op_CreateStack.go +++ b/service/cloudformation/api_op_CreateStack.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateStack(ctx context.Context, params *CreateStackInput, optF addawsAwsquery_serdeOpCreateStackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_CreateStackInstances.go b/service/cloudformation/api_op_CreateStackInstances.go index 9423670d81e..428925556da 100644 --- a/service/cloudformation/api_op_CreateStackInstances.go +++ b/service/cloudformation/api_op_CreateStackInstances.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateStackInstances(ctx context.Context, params *CreateStackIn addawsAwsquery_serdeOpCreateStackInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_CreateStackSet.go b/service/cloudformation/api_op_CreateStackSet.go index 5fbf310f1c7..c918d19287e 100644 --- a/service/cloudformation/api_op_CreateStackSet.go +++ b/service/cloudformation/api_op_CreateStackSet.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateStackSet(ctx context.Context, params *CreateStackSetInput addawsAwsquery_serdeOpCreateStackSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DeleteChangeSet.go b/service/cloudformation/api_op_DeleteChangeSet.go index 62f80480a39..886f575aa14 100644 --- a/service/cloudformation/api_op_DeleteChangeSet.go +++ b/service/cloudformation/api_op_DeleteChangeSet.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteChangeSet(ctx context.Context, params *DeleteChangeSetInp addawsAwsquery_serdeOpDeleteChangeSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DeleteStack.go b/service/cloudformation/api_op_DeleteStack.go index acbec348cbf..e82b275c229 100644 --- a/service/cloudformation/api_op_DeleteStack.go +++ b/service/cloudformation/api_op_DeleteStack.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteStack(ctx context.Context, params *DeleteStackInput, optF addawsAwsquery_serdeOpDeleteStackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DeleteStackInstances.go b/service/cloudformation/api_op_DeleteStackInstances.go index 1ff30e9e1d2..c80caf788dd 100644 --- a/service/cloudformation/api_op_DeleteStackInstances.go +++ b/service/cloudformation/api_op_DeleteStackInstances.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteStackInstances(ctx context.Context, params *DeleteStackIn addawsAwsquery_serdeOpDeleteStackInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DeleteStackSet.go b/service/cloudformation/api_op_DeleteStackSet.go index 9021fb478a6..a7d8e0b9369 100644 --- a/service/cloudformation/api_op_DeleteStackSet.go +++ b/service/cloudformation/api_op_DeleteStackSet.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteStackSet(ctx context.Context, params *DeleteStackSetInput addawsAwsquery_serdeOpDeleteStackSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DeregisterType.go b/service/cloudformation/api_op_DeregisterType.go index cb398b65050..cafe033aed7 100644 --- a/service/cloudformation/api_op_DeregisterType.go +++ b/service/cloudformation/api_op_DeregisterType.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DeregisterType(ctx context.Context, params *DeregisterTypeInput addawsAwsquery_serdeOpDeregisterTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DescribeAccountLimits.go b/service/cloudformation/api_op_DescribeAccountLimits.go index 31a84b0d354..227fc38d666 100644 --- a/service/cloudformation/api_op_DescribeAccountLimits.go +++ b/service/cloudformation/api_op_DescribeAccountLimits.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeAccountLimits(ctx context.Context, params *DescribeAcco addawsAwsquery_serdeOpDescribeAccountLimitsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DescribeChangeSet.go b/service/cloudformation/api_op_DescribeChangeSet.go index 347501a0c52..4b8f738488c 100644 --- a/service/cloudformation/api_op_DescribeChangeSet.go +++ b/service/cloudformation/api_op_DescribeChangeSet.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeChangeSet(ctx context.Context, params *DescribeChangeSe addawsAwsquery_serdeOpDescribeChangeSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DescribeStackDriftDetectionStatus.go b/service/cloudformation/api_op_DescribeStackDriftDetectionStatus.go index 73fae936c92..e82e5b22ff8 100644 --- a/service/cloudformation/api_op_DescribeStackDriftDetectionStatus.go +++ b/service/cloudformation/api_op_DescribeStackDriftDetectionStatus.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) DescribeStackDriftDetectionStatus(ctx context.Context, params * addawsAwsquery_serdeOpDescribeStackDriftDetectionStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DescribeStackEvents.go b/service/cloudformation/api_op_DescribeStackEvents.go index 4c3f3485051..6e23c5b4f1c 100644 --- a/service/cloudformation/api_op_DescribeStackEvents.go +++ b/service/cloudformation/api_op_DescribeStackEvents.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeStackEvents(ctx context.Context, params *DescribeStackE addawsAwsquery_serdeOpDescribeStackEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DescribeStackInstance.go b/service/cloudformation/api_op_DescribeStackInstance.go index 89237ad17c8..d61782a9af1 100644 --- a/service/cloudformation/api_op_DescribeStackInstance.go +++ b/service/cloudformation/api_op_DescribeStackInstance.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeStackInstance(ctx context.Context, params *DescribeStac addawsAwsquery_serdeOpDescribeStackInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DescribeStackResource.go b/service/cloudformation/api_op_DescribeStackResource.go index 6409156cc5a..08077900bff 100644 --- a/service/cloudformation/api_op_DescribeStackResource.go +++ b/service/cloudformation/api_op_DescribeStackResource.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeStackResource(ctx context.Context, params *DescribeStac addawsAwsquery_serdeOpDescribeStackResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DescribeStackResourceDrifts.go b/service/cloudformation/api_op_DescribeStackResourceDrifts.go index 0ae0cb46cdc..c5289350773 100644 --- a/service/cloudformation/api_op_DescribeStackResourceDrifts.go +++ b/service/cloudformation/api_op_DescribeStackResourceDrifts.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) DescribeStackResourceDrifts(ctx context.Context, params *Descri addawsAwsquery_serdeOpDescribeStackResourceDriftsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DescribeStackResources.go b/service/cloudformation/api_op_DescribeStackResources.go index 2bcf97fa293..53822b56d98 100644 --- a/service/cloudformation/api_op_DescribeStackResources.go +++ b/service/cloudformation/api_op_DescribeStackResources.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) DescribeStackResources(ctx context.Context, params *DescribeSta addawsAwsquery_serdeOpDescribeStackResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DescribeStackSet.go b/service/cloudformation/api_op_DescribeStackSet.go index 312fbea5d19..19c57414bb1 100644 --- a/service/cloudformation/api_op_DescribeStackSet.go +++ b/service/cloudformation/api_op_DescribeStackSet.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeStackSet(ctx context.Context, params *DescribeStackSetI addawsAwsquery_serdeOpDescribeStackSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DescribeStackSetOperation.go b/service/cloudformation/api_op_DescribeStackSetOperation.go index 5f45b0b0cff..6943cee47f0 100644 --- a/service/cloudformation/api_op_DescribeStackSetOperation.go +++ b/service/cloudformation/api_op_DescribeStackSetOperation.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeStackSetOperation(ctx context.Context, params *Describe addawsAwsquery_serdeOpDescribeStackSetOperationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DescribeStacks.go b/service/cloudformation/api_op_DescribeStacks.go index c4deaf5ecfe..d560315b2bb 100644 --- a/service/cloudformation/api_op_DescribeStacks.go +++ b/service/cloudformation/api_op_DescribeStacks.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeStacks(ctx context.Context, params *DescribeStacksInput addawsAwsquery_serdeOpDescribeStacksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DescribeType.go b/service/cloudformation/api_op_DescribeType.go index 1af8b33017b..be3a0954233 100644 --- a/service/cloudformation/api_op_DescribeType.go +++ b/service/cloudformation/api_op_DescribeType.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeType(ctx context.Context, params *DescribeTypeInput, op addawsAwsquery_serdeOpDescribeTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DescribeTypeRegistration.go b/service/cloudformation/api_op_DescribeTypeRegistration.go index e907c5ce1b9..b1872546f73 100644 --- a/service/cloudformation/api_op_DescribeTypeRegistration.go +++ b/service/cloudformation/api_op_DescribeTypeRegistration.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeTypeRegistration(ctx context.Context, params *DescribeT addawsAwsquery_serdeOpDescribeTypeRegistrationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DetectStackDrift.go b/service/cloudformation/api_op_DetectStackDrift.go index 5d6e0830e1c..aab8570346e 100644 --- a/service/cloudformation/api_op_DetectStackDrift.go +++ b/service/cloudformation/api_op_DetectStackDrift.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -43,9 +42,9 @@ func (c *Client) DetectStackDrift(ctx context.Context, params *DetectStackDriftI addawsAwsquery_serdeOpDetectStackDriftMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DetectStackResourceDrift.go b/service/cloudformation/api_op_DetectStackResourceDrift.go index c8a3de13917..df038040b54 100644 --- a/service/cloudformation/api_op_DetectStackResourceDrift.go +++ b/service/cloudformation/api_op_DetectStackResourceDrift.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) DetectStackResourceDrift(ctx context.Context, params *DetectSta addawsAwsquery_serdeOpDetectStackResourceDriftMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_DetectStackSetDrift.go b/service/cloudformation/api_op_DetectStackSetDrift.go index b5ba1f63c37..f50e4c3ca84 100644 --- a/service/cloudformation/api_op_DetectStackSetDrift.go +++ b/service/cloudformation/api_op_DetectStackSetDrift.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -56,9 +55,9 @@ func (c *Client) DetectStackSetDrift(ctx context.Context, params *DetectStackSet addawsAwsquery_serdeOpDetectStackSetDriftMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_EstimateTemplateCost.go b/service/cloudformation/api_op_EstimateTemplateCost.go index c701e2e3da7..f0d44d7bfad 100644 --- a/service/cloudformation/api_op_EstimateTemplateCost.go +++ b/service/cloudformation/api_op_EstimateTemplateCost.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) EstimateTemplateCost(ctx context.Context, params *EstimateTempl addawsAwsquery_serdeOpEstimateTemplateCostMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_ExecuteChangeSet.go b/service/cloudformation/api_op_ExecuteChangeSet.go index 5188dad5d26..151e1e537f0 100644 --- a/service/cloudformation/api_op_ExecuteChangeSet.go +++ b/service/cloudformation/api_op_ExecuteChangeSet.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) ExecuteChangeSet(ctx context.Context, params *ExecuteChangeSetI addawsAwsquery_serdeOpExecuteChangeSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_GetStackPolicy.go b/service/cloudformation/api_op_GetStackPolicy.go index 959bdb2a4e5..093bd31dae1 100644 --- a/service/cloudformation/api_op_GetStackPolicy.go +++ b/service/cloudformation/api_op_GetStackPolicy.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetStackPolicy(ctx context.Context, params *GetStackPolicyInput addawsAwsquery_serdeOpGetStackPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_GetTemplate.go b/service/cloudformation/api_op_GetTemplate.go index 648f6e1a821..0914c5cce52 100644 --- a/service/cloudformation/api_op_GetTemplate.go +++ b/service/cloudformation/api_op_GetTemplate.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetTemplate(ctx context.Context, params *GetTemplateInput, optF addawsAwsquery_serdeOpGetTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_GetTemplateSummary.go b/service/cloudformation/api_op_GetTemplateSummary.go index 7a0d2a862b7..74991b48eb7 100644 --- a/service/cloudformation/api_op_GetTemplateSummary.go +++ b/service/cloudformation/api_op_GetTemplateSummary.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetTemplateSummary(ctx context.Context, params *GetTemplateSumm addawsAwsquery_serdeOpGetTemplateSummaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_ListChangeSets.go b/service/cloudformation/api_op_ListChangeSets.go index 93aea30eb5d..20695df1218 100644 --- a/service/cloudformation/api_op_ListChangeSets.go +++ b/service/cloudformation/api_op_ListChangeSets.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListChangeSets(ctx context.Context, params *ListChangeSetsInput addawsAwsquery_serdeOpListChangeSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_ListExports.go b/service/cloudformation/api_op_ListExports.go index c53b1eb050b..eb35a398897 100644 --- a/service/cloudformation/api_op_ListExports.go +++ b/service/cloudformation/api_op_ListExports.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListExports(ctx context.Context, params *ListExportsInput, optF addawsAwsquery_serdeOpListExportsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_ListImports.go b/service/cloudformation/api_op_ListImports.go index 820fc1a70e5..f49c12bc294 100644 --- a/service/cloudformation/api_op_ListImports.go +++ b/service/cloudformation/api_op_ListImports.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) ListImports(ctx context.Context, params *ListImportsInput, optF addawsAwsquery_serdeOpListImportsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_ListStackInstances.go b/service/cloudformation/api_op_ListStackInstances.go index 09353e60396..ad61fcdb6b7 100644 --- a/service/cloudformation/api_op_ListStackInstances.go +++ b/service/cloudformation/api_op_ListStackInstances.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListStackInstances(ctx context.Context, params *ListStackInstan addawsAwsquery_serdeOpListStackInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_ListStackResources.go b/service/cloudformation/api_op_ListStackResources.go index 07b0f08e097..4d36b19d2a1 100644 --- a/service/cloudformation/api_op_ListStackResources.go +++ b/service/cloudformation/api_op_ListStackResources.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListStackResources(ctx context.Context, params *ListStackResour addawsAwsquery_serdeOpListStackResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_ListStackSetOperationResults.go b/service/cloudformation/api_op_ListStackSetOperationResults.go index 08d48ac1ae3..4671658f22d 100644 --- a/service/cloudformation/api_op_ListStackSetOperationResults.go +++ b/service/cloudformation/api_op_ListStackSetOperationResults.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListStackSetOperationResults(ctx context.Context, params *ListS addawsAwsquery_serdeOpListStackSetOperationResultsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_ListStackSetOperations.go b/service/cloudformation/api_op_ListStackSetOperations.go index b12f8872e52..52d7bc77637 100644 --- a/service/cloudformation/api_op_ListStackSetOperations.go +++ b/service/cloudformation/api_op_ListStackSetOperations.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListStackSetOperations(ctx context.Context, params *ListStackSe addawsAwsquery_serdeOpListStackSetOperationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_ListStackSets.go b/service/cloudformation/api_op_ListStackSets.go index 8c5c7f7616c..17c9eb39ce5 100644 --- a/service/cloudformation/api_op_ListStackSets.go +++ b/service/cloudformation/api_op_ListStackSets.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListStackSets(ctx context.Context, params *ListStackSetsInput, addawsAwsquery_serdeOpListStackSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_ListStacks.go b/service/cloudformation/api_op_ListStacks.go index c1fc7b5cf7e..b2397d8dabe 100644 --- a/service/cloudformation/api_op_ListStacks.go +++ b/service/cloudformation/api_op_ListStacks.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListStacks(ctx context.Context, params *ListStacksInput, optFns addawsAwsquery_serdeOpListStacksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_ListTypeRegistrations.go b/service/cloudformation/api_op_ListTypeRegistrations.go index 2af1c28a49a..4bcefd8a5ee 100644 --- a/service/cloudformation/api_op_ListTypeRegistrations.go +++ b/service/cloudformation/api_op_ListTypeRegistrations.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTypeRegistrations(ctx context.Context, params *ListTypeRegi addawsAwsquery_serdeOpListTypeRegistrationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_ListTypeVersions.go b/service/cloudformation/api_op_ListTypeVersions.go index 3b4e7ecd6dd..1b5a8519fbf 100644 --- a/service/cloudformation/api_op_ListTypeVersions.go +++ b/service/cloudformation/api_op_ListTypeVersions.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTypeVersions(ctx context.Context, params *ListTypeVersionsI addawsAwsquery_serdeOpListTypeVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_ListTypes.go b/service/cloudformation/api_op_ListTypes.go index 6b1637d4f37..e41071dc04e 100644 --- a/service/cloudformation/api_op_ListTypes.go +++ b/service/cloudformation/api_op_ListTypes.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTypes(ctx context.Context, params *ListTypesInput, optFns . addawsAwsquery_serdeOpListTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_RecordHandlerProgress.go b/service/cloudformation/api_op_RecordHandlerProgress.go index b2a84152cf1..b9d6b79cba1 100644 --- a/service/cloudformation/api_op_RecordHandlerProgress.go +++ b/service/cloudformation/api_op_RecordHandlerProgress.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) RecordHandlerProgress(ctx context.Context, params *RecordHandle addawsAwsquery_serdeOpRecordHandlerProgressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_RegisterType.go b/service/cloudformation/api_op_RegisterType.go index 99a2a6b90e2..190ff7fe8a5 100644 --- a/service/cloudformation/api_op_RegisterType.go +++ b/service/cloudformation/api_op_RegisterType.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) RegisterType(ctx context.Context, params *RegisterTypeInput, op addawsAwsquery_serdeOpRegisterTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_SetStackPolicy.go b/service/cloudformation/api_op_SetStackPolicy.go index 72ff7d7f7dd..f1b4dabea45 100644 --- a/service/cloudformation/api_op_SetStackPolicy.go +++ b/service/cloudformation/api_op_SetStackPolicy.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) SetStackPolicy(ctx context.Context, params *SetStackPolicyInput addawsAwsquery_serdeOpSetStackPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_SetTypeDefaultVersion.go b/service/cloudformation/api_op_SetTypeDefaultVersion.go index 73b1a45a535..635556e112d 100644 --- a/service/cloudformation/api_op_SetTypeDefaultVersion.go +++ b/service/cloudformation/api_op_SetTypeDefaultVersion.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) SetTypeDefaultVersion(ctx context.Context, params *SetTypeDefau addawsAwsquery_serdeOpSetTypeDefaultVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_SignalResource.go b/service/cloudformation/api_op_SignalResource.go index 369916fb622..03707ebf05c 100644 --- a/service/cloudformation/api_op_SignalResource.go +++ b/service/cloudformation/api_op_SignalResource.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) SignalResource(ctx context.Context, params *SignalResourceInput addawsAwsquery_serdeOpSignalResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_StopStackSetOperation.go b/service/cloudformation/api_op_StopStackSetOperation.go index 985c65774dc..8baaef70c90 100644 --- a/service/cloudformation/api_op_StopStackSetOperation.go +++ b/service/cloudformation/api_op_StopStackSetOperation.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) StopStackSetOperation(ctx context.Context, params *StopStackSet addawsAwsquery_serdeOpStopStackSetOperationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_UpdateStack.go b/service/cloudformation/api_op_UpdateStack.go index 2c2ac1fb14e..ffbd03a575b 100644 --- a/service/cloudformation/api_op_UpdateStack.go +++ b/service/cloudformation/api_op_UpdateStack.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) UpdateStack(ctx context.Context, params *UpdateStackInput, optF addawsAwsquery_serdeOpUpdateStackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_UpdateStackInstances.go b/service/cloudformation/api_op_UpdateStackInstances.go index 8bda4009742..a4f678dd3a7 100644 --- a/service/cloudformation/api_op_UpdateStackInstances.go +++ b/service/cloudformation/api_op_UpdateStackInstances.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) UpdateStackInstances(ctx context.Context, params *UpdateStackIn addawsAwsquery_serdeOpUpdateStackInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_UpdateStackSet.go b/service/cloudformation/api_op_UpdateStackSet.go index 4cc4f50f885..abd87c4fbcb 100644 --- a/service/cloudformation/api_op_UpdateStackSet.go +++ b/service/cloudformation/api_op_UpdateStackSet.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) UpdateStackSet(ctx context.Context, params *UpdateStackSetInput addawsAwsquery_serdeOpUpdateStackSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_UpdateTerminationProtection.go b/service/cloudformation/api_op_UpdateTerminationProtection.go index 309534d9329..8f941ed3ea1 100644 --- a/service/cloudformation/api_op_UpdateTerminationProtection.go +++ b/service/cloudformation/api_op_UpdateTerminationProtection.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) UpdateTerminationProtection(ctx context.Context, params *Update addawsAwsquery_serdeOpUpdateTerminationProtectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/api_op_ValidateTemplate.go b/service/cloudformation/api_op_ValidateTemplate.go index d7cf13eed1e..1e59bf2bb36 100644 --- a/service/cloudformation/api_op_ValidateTemplate.go +++ b/service/cloudformation/api_op_ValidateTemplate.go @@ -5,7 +5,6 @@ package cloudformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ValidateTemplate(ctx context.Context, params *ValidateTemplateI addawsAwsquery_serdeOpValidateTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudformation/endpoints.go b/service/cloudformation/endpoints.go index 15477277404..f0ad22622bf 100644 --- a/service/cloudformation/endpoints.go +++ b/service/cloudformation/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/cloudfront/api_client.go b/service/cloudfront/api_client.go index 95450d8005f..1c1e7f35829 100644 --- a/service/cloudfront/api_client.go +++ b/service/cloudfront/api_client.go @@ -80,30 +80,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -169,6 +145,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/cloudfront/api_op_CreateCachePolicy.go b/service/cloudfront/api_op_CreateCachePolicy.go index 2ecd83e263e..02545dbc2b4 100644 --- a/service/cloudfront/api_op_CreateCachePolicy.go +++ b/service/cloudfront/api_op_CreateCachePolicy.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) CreateCachePolicy(ctx context.Context, params *CreateCachePolic addawsRestxml_serdeOpCreateCachePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_CreateCloudFrontOriginAccessIdentity.go b/service/cloudfront/api_op_CreateCloudFrontOriginAccessIdentity.go index 9e2378ddef8..5fa9e919faf 100644 --- a/service/cloudfront/api_op_CreateCloudFrontOriginAccessIdentity.go +++ b/service/cloudfront/api_op_CreateCloudFrontOriginAccessIdentity.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateCloudFrontOriginAccessIdentity(ctx context.Context, param addawsRestxml_serdeOpCreateCloudFrontOriginAccessIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_CreateDistribution.go b/service/cloudfront/api_op_CreateDistribution.go index ec5a42a3b2a..1e1e5855aed 100644 --- a/service/cloudfront/api_op_CreateDistribution.go +++ b/service/cloudfront/api_op_CreateDistribution.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) CreateDistribution(ctx context.Context, params *CreateDistribut addawsRestxml_serdeOpCreateDistributionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_CreateDistributionWithTags.go b/service/cloudfront/api_op_CreateDistributionWithTags.go index 88f023ede56..9ba6dc89967 100644 --- a/service/cloudfront/api_op_CreateDistributionWithTags.go +++ b/service/cloudfront/api_op_CreateDistributionWithTags.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDistributionWithTags(ctx context.Context, params *CreateD addawsRestxml_serdeOpCreateDistributionWithTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_CreateFieldLevelEncryptionConfig.go b/service/cloudfront/api_op_CreateFieldLevelEncryptionConfig.go index df2a9a784e5..5d965277e72 100644 --- a/service/cloudfront/api_op_CreateFieldLevelEncryptionConfig.go +++ b/service/cloudfront/api_op_CreateFieldLevelEncryptionConfig.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateFieldLevelEncryptionConfig(ctx context.Context, params *C addawsRestxml_serdeOpCreateFieldLevelEncryptionConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_CreateFieldLevelEncryptionProfile.go b/service/cloudfront/api_op_CreateFieldLevelEncryptionProfile.go index 565ccbab363..7d8395479a7 100644 --- a/service/cloudfront/api_op_CreateFieldLevelEncryptionProfile.go +++ b/service/cloudfront/api_op_CreateFieldLevelEncryptionProfile.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateFieldLevelEncryptionProfile(ctx context.Context, params * addawsRestxml_serdeOpCreateFieldLevelEncryptionProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_CreateInvalidation.go b/service/cloudfront/api_op_CreateInvalidation.go index 9ed8d4e5997..c0d78a442c9 100644 --- a/service/cloudfront/api_op_CreateInvalidation.go +++ b/service/cloudfront/api_op_CreateInvalidation.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateInvalidation(ctx context.Context, params *CreateInvalidat addawsRestxml_serdeOpCreateInvalidationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_CreateOriginRequestPolicy.go b/service/cloudfront/api_op_CreateOriginRequestPolicy.go index fe5f02b4280..db56cb1974d 100644 --- a/service/cloudfront/api_op_CreateOriginRequestPolicy.go +++ b/service/cloudfront/api_op_CreateOriginRequestPolicy.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) CreateOriginRequestPolicy(ctx context.Context, params *CreateOr addawsRestxml_serdeOpCreateOriginRequestPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_CreatePublicKey.go b/service/cloudfront/api_op_CreatePublicKey.go index ce84500501e..7d9bfa870b0 100644 --- a/service/cloudfront/api_op_CreatePublicKey.go +++ b/service/cloudfront/api_op_CreatePublicKey.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreatePublicKey(ctx context.Context, params *CreatePublicKeyInp addawsRestxml_serdeOpCreatePublicKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_CreateStreamingDistribution.go b/service/cloudfront/api_op_CreateStreamingDistribution.go index 9b9deeb12e9..55652ea77da 100644 --- a/service/cloudfront/api_op_CreateStreamingDistribution.go +++ b/service/cloudfront/api_op_CreateStreamingDistribution.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) CreateStreamingDistribution(ctx context.Context, params *Create addawsRestxml_serdeOpCreateStreamingDistributionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_CreateStreamingDistributionWithTags.go b/service/cloudfront/api_op_CreateStreamingDistributionWithTags.go index 58ec439c997..a71fe069977 100644 --- a/service/cloudfront/api_op_CreateStreamingDistributionWithTags.go +++ b/service/cloudfront/api_op_CreateStreamingDistributionWithTags.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateStreamingDistributionWithTags(ctx context.Context, params addawsRestxml_serdeOpCreateStreamingDistributionWithTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_DeleteCachePolicy.go b/service/cloudfront/api_op_DeleteCachePolicy.go index d95791159d1..7c4a4e18eea 100644 --- a/service/cloudfront/api_op_DeleteCachePolicy.go +++ b/service/cloudfront/api_op_DeleteCachePolicy.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteCachePolicy(ctx context.Context, params *DeleteCachePolic addawsRestxml_serdeOpDeleteCachePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_DeleteCloudFrontOriginAccessIdentity.go b/service/cloudfront/api_op_DeleteCloudFrontOriginAccessIdentity.go index 59a8c843188..7df0496ddd3 100644 --- a/service/cloudfront/api_op_DeleteCloudFrontOriginAccessIdentity.go +++ b/service/cloudfront/api_op_DeleteCloudFrontOriginAccessIdentity.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteCloudFrontOriginAccessIdentity(ctx context.Context, param addawsRestxml_serdeOpDeleteCloudFrontOriginAccessIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_DeleteDistribution.go b/service/cloudfront/api_op_DeleteDistribution.go index 02bddde8fd1..35ac2c0cdbf 100644 --- a/service/cloudfront/api_op_DeleteDistribution.go +++ b/service/cloudfront/api_op_DeleteDistribution.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDistribution(ctx context.Context, params *DeleteDistribut addawsRestxml_serdeOpDeleteDistributionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_DeleteFieldLevelEncryptionConfig.go b/service/cloudfront/api_op_DeleteFieldLevelEncryptionConfig.go index 25e389738f9..71bb23acfa6 100644 --- a/service/cloudfront/api_op_DeleteFieldLevelEncryptionConfig.go +++ b/service/cloudfront/api_op_DeleteFieldLevelEncryptionConfig.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteFieldLevelEncryptionConfig(ctx context.Context, params *D addawsRestxml_serdeOpDeleteFieldLevelEncryptionConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_DeleteFieldLevelEncryptionProfile.go b/service/cloudfront/api_op_DeleteFieldLevelEncryptionProfile.go index 935829698cf..d8765e426a9 100644 --- a/service/cloudfront/api_op_DeleteFieldLevelEncryptionProfile.go +++ b/service/cloudfront/api_op_DeleteFieldLevelEncryptionProfile.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteFieldLevelEncryptionProfile(ctx context.Context, params * addawsRestxml_serdeOpDeleteFieldLevelEncryptionProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_DeleteOriginRequestPolicy.go b/service/cloudfront/api_op_DeleteOriginRequestPolicy.go index 261dde0dbfc..093cfc57834 100644 --- a/service/cloudfront/api_op_DeleteOriginRequestPolicy.go +++ b/service/cloudfront/api_op_DeleteOriginRequestPolicy.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteOriginRequestPolicy(ctx context.Context, params *DeleteOr addawsRestxml_serdeOpDeleteOriginRequestPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_DeletePublicKey.go b/service/cloudfront/api_op_DeletePublicKey.go index c16f9cc94d1..c1f0b3d9f5a 100644 --- a/service/cloudfront/api_op_DeletePublicKey.go +++ b/service/cloudfront/api_op_DeletePublicKey.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeletePublicKey(ctx context.Context, params *DeletePublicKeyInp addawsRestxml_serdeOpDeletePublicKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_DeleteStreamingDistribution.go b/service/cloudfront/api_op_DeleteStreamingDistribution.go index d0326f91320..a30f99fc3d9 100644 --- a/service/cloudfront/api_op_DeleteStreamingDistribution.go +++ b/service/cloudfront/api_op_DeleteStreamingDistribution.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -49,9 +48,9 @@ func (c *Client) DeleteStreamingDistribution(ctx context.Context, params *Delete addawsRestxml_serdeOpDeleteStreamingDistributionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_GetCachePolicy.go b/service/cloudfront/api_op_GetCachePolicy.go index e27e587d980..25d159f2b37 100644 --- a/service/cloudfront/api_op_GetCachePolicy.go +++ b/service/cloudfront/api_op_GetCachePolicy.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) GetCachePolicy(ctx context.Context, params *GetCachePolicyInput addawsRestxml_serdeOpGetCachePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_GetCachePolicyConfig.go b/service/cloudfront/api_op_GetCachePolicyConfig.go index 7f9668375b4..b20ccfdd8f0 100644 --- a/service/cloudfront/api_op_GetCachePolicyConfig.go +++ b/service/cloudfront/api_op_GetCachePolicyConfig.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetCachePolicyConfig(ctx context.Context, params *GetCachePolic addawsRestxml_serdeOpGetCachePolicyConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_GetCloudFrontOriginAccessIdentity.go b/service/cloudfront/api_op_GetCloudFrontOriginAccessIdentity.go index f8b123ce3fa..265091ebab7 100644 --- a/service/cloudfront/api_op_GetCloudFrontOriginAccessIdentity.go +++ b/service/cloudfront/api_op_GetCloudFrontOriginAccessIdentity.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetCloudFrontOriginAccessIdentity(ctx context.Context, params * addawsRestxml_serdeOpGetCloudFrontOriginAccessIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_GetCloudFrontOriginAccessIdentityConfig.go b/service/cloudfront/api_op_GetCloudFrontOriginAccessIdentityConfig.go index f217eafe91a..a100dca6533 100644 --- a/service/cloudfront/api_op_GetCloudFrontOriginAccessIdentityConfig.go +++ b/service/cloudfront/api_op_GetCloudFrontOriginAccessIdentityConfig.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetCloudFrontOriginAccessIdentityConfig(ctx context.Context, pa addawsRestxml_serdeOpGetCloudFrontOriginAccessIdentityConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_GetDistribution.go b/service/cloudfront/api_op_GetDistribution.go index 3e9a07b68a1..f86e4673e32 100644 --- a/service/cloudfront/api_op_GetDistribution.go +++ b/service/cloudfront/api_op_GetDistribution.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDistribution(ctx context.Context, params *GetDistributionInp addawsRestxml_serdeOpGetDistributionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_GetDistributionConfig.go b/service/cloudfront/api_op_GetDistributionConfig.go index 2bf1d4c666b..c64dc8eddd3 100644 --- a/service/cloudfront/api_op_GetDistributionConfig.go +++ b/service/cloudfront/api_op_GetDistributionConfig.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDistributionConfig(ctx context.Context, params *GetDistribut addawsRestxml_serdeOpGetDistributionConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_GetFieldLevelEncryption.go b/service/cloudfront/api_op_GetFieldLevelEncryption.go index e09ff78857e..b66ef035e26 100644 --- a/service/cloudfront/api_op_GetFieldLevelEncryption.go +++ b/service/cloudfront/api_op_GetFieldLevelEncryption.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetFieldLevelEncryption(ctx context.Context, params *GetFieldLe addawsRestxml_serdeOpGetFieldLevelEncryptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_GetFieldLevelEncryptionConfig.go b/service/cloudfront/api_op_GetFieldLevelEncryptionConfig.go index 08f4dd2dee3..b4eda761072 100644 --- a/service/cloudfront/api_op_GetFieldLevelEncryptionConfig.go +++ b/service/cloudfront/api_op_GetFieldLevelEncryptionConfig.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetFieldLevelEncryptionConfig(ctx context.Context, params *GetF addawsRestxml_serdeOpGetFieldLevelEncryptionConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_GetFieldLevelEncryptionProfile.go b/service/cloudfront/api_op_GetFieldLevelEncryptionProfile.go index 43b43092a6a..c0de6c4b956 100644 --- a/service/cloudfront/api_op_GetFieldLevelEncryptionProfile.go +++ b/service/cloudfront/api_op_GetFieldLevelEncryptionProfile.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetFieldLevelEncryptionProfile(ctx context.Context, params *Get addawsRestxml_serdeOpGetFieldLevelEncryptionProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_GetFieldLevelEncryptionProfileConfig.go b/service/cloudfront/api_op_GetFieldLevelEncryptionProfileConfig.go index 9a67110c6cc..5839efb57ff 100644 --- a/service/cloudfront/api_op_GetFieldLevelEncryptionProfileConfig.go +++ b/service/cloudfront/api_op_GetFieldLevelEncryptionProfileConfig.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetFieldLevelEncryptionProfileConfig(ctx context.Context, param addawsRestxml_serdeOpGetFieldLevelEncryptionProfileConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_GetInvalidation.go b/service/cloudfront/api_op_GetInvalidation.go index 131b20a1460..5dc97595f5b 100644 --- a/service/cloudfront/api_op_GetInvalidation.go +++ b/service/cloudfront/api_op_GetInvalidation.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetInvalidation(ctx context.Context, params *GetInvalidationInp addawsRestxml_serdeOpGetInvalidationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_GetOriginRequestPolicy.go b/service/cloudfront/api_op_GetOriginRequestPolicy.go index a2f661ac3f9..3929e834dc7 100644 --- a/service/cloudfront/api_op_GetOriginRequestPolicy.go +++ b/service/cloudfront/api_op_GetOriginRequestPolicy.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) GetOriginRequestPolicy(ctx context.Context, params *GetOriginRe addawsRestxml_serdeOpGetOriginRequestPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_GetOriginRequestPolicyConfig.go b/service/cloudfront/api_op_GetOriginRequestPolicyConfig.go index d56f01815db..d95b27e9e2e 100644 --- a/service/cloudfront/api_op_GetOriginRequestPolicyConfig.go +++ b/service/cloudfront/api_op_GetOriginRequestPolicyConfig.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetOriginRequestPolicyConfig(ctx context.Context, params *GetOr addawsRestxml_serdeOpGetOriginRequestPolicyConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_GetPublicKey.go b/service/cloudfront/api_op_GetPublicKey.go index ecbea364ade..45678e9ed15 100644 --- a/service/cloudfront/api_op_GetPublicKey.go +++ b/service/cloudfront/api_op_GetPublicKey.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetPublicKey(ctx context.Context, params *GetPublicKeyInput, op addawsRestxml_serdeOpGetPublicKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_GetPublicKeyConfig.go b/service/cloudfront/api_op_GetPublicKeyConfig.go index a89fdab3113..c6beff509b3 100644 --- a/service/cloudfront/api_op_GetPublicKeyConfig.go +++ b/service/cloudfront/api_op_GetPublicKeyConfig.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetPublicKeyConfig(ctx context.Context, params *GetPublicKeyCon addawsRestxml_serdeOpGetPublicKeyConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_GetStreamingDistribution.go b/service/cloudfront/api_op_GetStreamingDistribution.go index 07b819fd234..66cb8c6a7ad 100644 --- a/service/cloudfront/api_op_GetStreamingDistribution.go +++ b/service/cloudfront/api_op_GetStreamingDistribution.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetStreamingDistribution(ctx context.Context, params *GetStream addawsRestxml_serdeOpGetStreamingDistributionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_GetStreamingDistributionConfig.go b/service/cloudfront/api_op_GetStreamingDistributionConfig.go index a30d5d04e70..954683688f9 100644 --- a/service/cloudfront/api_op_GetStreamingDistributionConfig.go +++ b/service/cloudfront/api_op_GetStreamingDistributionConfig.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetStreamingDistributionConfig(ctx context.Context, params *Get addawsRestxml_serdeOpGetStreamingDistributionConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_ListCachePolicies.go b/service/cloudfront/api_op_ListCachePolicies.go index 0b8f3af87ec..55e8d03b8d4 100644 --- a/service/cloudfront/api_op_ListCachePolicies.go +++ b/service/cloudfront/api_op_ListCachePolicies.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListCachePolicies(ctx context.Context, params *ListCachePolicie addawsRestxml_serdeOpListCachePoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_ListCloudFrontOriginAccessIdentities.go b/service/cloudfront/api_op_ListCloudFrontOriginAccessIdentities.go index ff42e152258..3964bf3c308 100644 --- a/service/cloudfront/api_op_ListCloudFrontOriginAccessIdentities.go +++ b/service/cloudfront/api_op_ListCloudFrontOriginAccessIdentities.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListCloudFrontOriginAccessIdentities(ctx context.Context, param addawsRestxml_serdeOpListCloudFrontOriginAccessIdentitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_ListDistributions.go b/service/cloudfront/api_op_ListDistributions.go index cc3bd6ecf35..c88cf1c9426 100644 --- a/service/cloudfront/api_op_ListDistributions.go +++ b/service/cloudfront/api_op_ListDistributions.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDistributions(ctx context.Context, params *ListDistribution addawsRestxml_serdeOpListDistributionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_ListDistributionsByCachePolicyId.go b/service/cloudfront/api_op_ListDistributionsByCachePolicyId.go index 14aad33617d..2f615739850 100644 --- a/service/cloudfront/api_op_ListDistributionsByCachePolicyId.go +++ b/service/cloudfront/api_op_ListDistributionsByCachePolicyId.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListDistributionsByCachePolicyId(ctx context.Context, params *L addawsRestxml_serdeOpListDistributionsByCachePolicyIdMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_ListDistributionsByOriginRequestPolicyId.go b/service/cloudfront/api_op_ListDistributionsByOriginRequestPolicyId.go index bc721446465..880045c4b26 100644 --- a/service/cloudfront/api_op_ListDistributionsByOriginRequestPolicyId.go +++ b/service/cloudfront/api_op_ListDistributionsByOriginRequestPolicyId.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListDistributionsByOriginRequestPolicyId(ctx context.Context, p addawsRestxml_serdeOpListDistributionsByOriginRequestPolicyIdMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_ListDistributionsByWebACLId.go b/service/cloudfront/api_op_ListDistributionsByWebACLId.go index 45b2dfedbc0..097c1260f93 100644 --- a/service/cloudfront/api_op_ListDistributionsByWebACLId.go +++ b/service/cloudfront/api_op_ListDistributionsByWebACLId.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDistributionsByWebACLId(ctx context.Context, params *ListDi addawsRestxml_serdeOpListDistributionsByWebACLIdMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_ListFieldLevelEncryptionConfigs.go b/service/cloudfront/api_op_ListFieldLevelEncryptionConfigs.go index d2d5ffe5d20..1927ac2d70b 100644 --- a/service/cloudfront/api_op_ListFieldLevelEncryptionConfigs.go +++ b/service/cloudfront/api_op_ListFieldLevelEncryptionConfigs.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListFieldLevelEncryptionConfigs(ctx context.Context, params *Li addawsRestxml_serdeOpListFieldLevelEncryptionConfigsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_ListFieldLevelEncryptionProfiles.go b/service/cloudfront/api_op_ListFieldLevelEncryptionProfiles.go index 7c8f1d8e135..d8d31e82bd9 100644 --- a/service/cloudfront/api_op_ListFieldLevelEncryptionProfiles.go +++ b/service/cloudfront/api_op_ListFieldLevelEncryptionProfiles.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListFieldLevelEncryptionProfiles(ctx context.Context, params *L addawsRestxml_serdeOpListFieldLevelEncryptionProfilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_ListInvalidations.go b/service/cloudfront/api_op_ListInvalidations.go index e09b7370490..cb17e2596c3 100644 --- a/service/cloudfront/api_op_ListInvalidations.go +++ b/service/cloudfront/api_op_ListInvalidations.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListInvalidations(ctx context.Context, params *ListInvalidation addawsRestxml_serdeOpListInvalidationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_ListOriginRequestPolicies.go b/service/cloudfront/api_op_ListOriginRequestPolicies.go index 9f4f0c9cda9..20b8bc18d36 100644 --- a/service/cloudfront/api_op_ListOriginRequestPolicies.go +++ b/service/cloudfront/api_op_ListOriginRequestPolicies.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListOriginRequestPolicies(ctx context.Context, params *ListOrig addawsRestxml_serdeOpListOriginRequestPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_ListPublicKeys.go b/service/cloudfront/api_op_ListPublicKeys.go index fad287c2369..b932a5020d0 100644 --- a/service/cloudfront/api_op_ListPublicKeys.go +++ b/service/cloudfront/api_op_ListPublicKeys.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListPublicKeys(ctx context.Context, params *ListPublicKeysInput addawsRestxml_serdeOpListPublicKeysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_ListStreamingDistributions.go b/service/cloudfront/api_op_ListStreamingDistributions.go index f1d60436dd1..f8779fc5383 100644 --- a/service/cloudfront/api_op_ListStreamingDistributions.go +++ b/service/cloudfront/api_op_ListStreamingDistributions.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListStreamingDistributions(ctx context.Context, params *ListStr addawsRestxml_serdeOpListStreamingDistributionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_ListTagsForResource.go b/service/cloudfront/api_op_ListTagsForResource.go index 80a93ae714b..9efd5f98a9e 100644 --- a/service/cloudfront/api_op_ListTagsForResource.go +++ b/service/cloudfront/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestxml_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_TagResource.go b/service/cloudfront/api_op_TagResource.go index 9975cf5bb92..4b15c27d0a4 100644 --- a/service/cloudfront/api_op_TagResource.go +++ b/service/cloudfront/api_op_TagResource.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestxml_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_UntagResource.go b/service/cloudfront/api_op_UntagResource.go index 3915e4ea50f..e8e2420bcc1 100644 --- a/service/cloudfront/api_op_UntagResource.go +++ b/service/cloudfront/api_op_UntagResource.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestxml_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_UpdateCachePolicy.go b/service/cloudfront/api_op_UpdateCachePolicy.go index 01f22209a12..b147611b4c6 100644 --- a/service/cloudfront/api_op_UpdateCachePolicy.go +++ b/service/cloudfront/api_op_UpdateCachePolicy.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) UpdateCachePolicy(ctx context.Context, params *UpdateCachePolic addawsRestxml_serdeOpUpdateCachePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_UpdateCloudFrontOriginAccessIdentity.go b/service/cloudfront/api_op_UpdateCloudFrontOriginAccessIdentity.go index f762bee3e3f..319e272b33f 100644 --- a/service/cloudfront/api_op_UpdateCloudFrontOriginAccessIdentity.go +++ b/service/cloudfront/api_op_UpdateCloudFrontOriginAccessIdentity.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateCloudFrontOriginAccessIdentity(ctx context.Context, param addawsRestxml_serdeOpUpdateCloudFrontOriginAccessIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_UpdateDistribution.go b/service/cloudfront/api_op_UpdateDistribution.go index bda02921a3a..a54485b4b6e 100644 --- a/service/cloudfront/api_op_UpdateDistribution.go +++ b/service/cloudfront/api_op_UpdateDistribution.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -71,9 +70,9 @@ func (c *Client) UpdateDistribution(ctx context.Context, params *UpdateDistribut addawsRestxml_serdeOpUpdateDistributionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_UpdateFieldLevelEncryptionConfig.go b/service/cloudfront/api_op_UpdateFieldLevelEncryptionConfig.go index 65dc04faa6d..621d749089b 100644 --- a/service/cloudfront/api_op_UpdateFieldLevelEncryptionConfig.go +++ b/service/cloudfront/api_op_UpdateFieldLevelEncryptionConfig.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateFieldLevelEncryptionConfig(ctx context.Context, params *U addawsRestxml_serdeOpUpdateFieldLevelEncryptionConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_UpdateFieldLevelEncryptionProfile.go b/service/cloudfront/api_op_UpdateFieldLevelEncryptionProfile.go index e6fe1306d62..f2eb0d1c289 100644 --- a/service/cloudfront/api_op_UpdateFieldLevelEncryptionProfile.go +++ b/service/cloudfront/api_op_UpdateFieldLevelEncryptionProfile.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateFieldLevelEncryptionProfile(ctx context.Context, params * addawsRestxml_serdeOpUpdateFieldLevelEncryptionProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_UpdateOriginRequestPolicy.go b/service/cloudfront/api_op_UpdateOriginRequestPolicy.go index da74ef6722d..f65af867482 100644 --- a/service/cloudfront/api_op_UpdateOriginRequestPolicy.go +++ b/service/cloudfront/api_op_UpdateOriginRequestPolicy.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) UpdateOriginRequestPolicy(ctx context.Context, params *UpdateOr addawsRestxml_serdeOpUpdateOriginRequestPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_UpdatePublicKey.go b/service/cloudfront/api_op_UpdatePublicKey.go index fa3913d19b7..e92a6a16bae 100644 --- a/service/cloudfront/api_op_UpdatePublicKey.go +++ b/service/cloudfront/api_op_UpdatePublicKey.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdatePublicKey(ctx context.Context, params *UpdatePublicKeyInp addawsRestxml_serdeOpUpdatePublicKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/api_op_UpdateStreamingDistribution.go b/service/cloudfront/api_op_UpdateStreamingDistribution.go index 9306447836f..5bf576cd7ed 100644 --- a/service/cloudfront/api_op_UpdateStreamingDistribution.go +++ b/service/cloudfront/api_op_UpdateStreamingDistribution.go @@ -5,7 +5,6 @@ package cloudfront import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateStreamingDistribution(ctx context.Context, params *Update addawsRestxml_serdeOpUpdateStreamingDistributionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudfront/endpoints.go b/service/cloudfront/endpoints.go index 22407f49a4e..6f1c4df4f37 100644 --- a/service/cloudfront/endpoints.go +++ b/service/cloudfront/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/cloudhsm/api_client.go b/service/cloudhsm/api_client.go index 88e1ae810d0..3489be082a0 100644 --- a/service/cloudhsm/api_client.go +++ b/service/cloudhsm/api_client.go @@ -86,30 +86,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -175,6 +151,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/cloudhsm/api_op_AddTagsToResource.go b/service/cloudhsm/api_op_AddTagsToResource.go index 68aa2ac7084..ea62218574b 100644 --- a/service/cloudhsm/api_op_AddTagsToResource.go +++ b/service/cloudhsm/api_op_AddTagsToResource.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudhsm/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) AddTagsToResource(ctx context.Context, params *AddTagsToResourc addawsAwsjson11_serdeOpAddTagsToResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_CreateHapg.go b/service/cloudhsm/api_op_CreateHapg.go index 0666b61468b..033a032c249 100644 --- a/service/cloudhsm/api_op_CreateHapg.go +++ b/service/cloudhsm/api_op_CreateHapg.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) CreateHapg(ctx context.Context, params *CreateHapgInput, optFns addawsAwsjson11_serdeOpCreateHapgMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_CreateHsm.go b/service/cloudhsm/api_op_CreateHsm.go index 98c609a11b6..36d2b29dbfb 100644 --- a/service/cloudhsm/api_op_CreateHsm.go +++ b/service/cloudhsm/api_op_CreateHsm.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudhsm/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) CreateHsm(ctx context.Context, params *CreateHsmInput, optFns . addawsAwsjson11_serdeOpCreateHsmMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_CreateLunaClient.go b/service/cloudhsm/api_op_CreateLunaClient.go index c0b7aee2370..cd867ae7db7 100644 --- a/service/cloudhsm/api_op_CreateLunaClient.go +++ b/service/cloudhsm/api_op_CreateLunaClient.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) CreateLunaClient(ctx context.Context, params *CreateLunaClientI addawsAwsjson11_serdeOpCreateLunaClientMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_DeleteHapg.go b/service/cloudhsm/api_op_DeleteHapg.go index 8c0f93375e8..2205fdf9982 100644 --- a/service/cloudhsm/api_op_DeleteHapg.go +++ b/service/cloudhsm/api_op_DeleteHapg.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) DeleteHapg(ctx context.Context, params *DeleteHapgInput, optFns addawsAwsjson11_serdeOpDeleteHapgMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_DeleteHsm.go b/service/cloudhsm/api_op_DeleteHsm.go index afcedfd212b..a67ded7c663 100644 --- a/service/cloudhsm/api_op_DeleteHsm.go +++ b/service/cloudhsm/api_op_DeleteHsm.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) DeleteHsm(ctx context.Context, params *DeleteHsmInput, optFns . addawsAwsjson11_serdeOpDeleteHsmMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_DeleteLunaClient.go b/service/cloudhsm/api_op_DeleteLunaClient.go index fd88f386bbc..10efb73512c 100644 --- a/service/cloudhsm/api_op_DeleteLunaClient.go +++ b/service/cloudhsm/api_op_DeleteLunaClient.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) DeleteLunaClient(ctx context.Context, params *DeleteLunaClientI addawsAwsjson11_serdeOpDeleteLunaClientMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_DescribeHapg.go b/service/cloudhsm/api_op_DescribeHapg.go index 2fb6d3372ed..1eeb4142af0 100644 --- a/service/cloudhsm/api_op_DescribeHapg.go +++ b/service/cloudhsm/api_op_DescribeHapg.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudhsm/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) DescribeHapg(ctx context.Context, params *DescribeHapgInput, op addawsAwsjson11_serdeOpDescribeHapgMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_DescribeHsm.go b/service/cloudhsm/api_op_DescribeHsm.go index fb38baeab5f..a75dbef8e22 100644 --- a/service/cloudhsm/api_op_DescribeHsm.go +++ b/service/cloudhsm/api_op_DescribeHsm.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudhsm/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) DescribeHsm(ctx context.Context, params *DescribeHsmInput, optF addawsAwsjson11_serdeOpDescribeHsmMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_DescribeLunaClient.go b/service/cloudhsm/api_op_DescribeLunaClient.go index 9d17b75a629..df04c76fc62 100644 --- a/service/cloudhsm/api_op_DescribeLunaClient.go +++ b/service/cloudhsm/api_op_DescribeLunaClient.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) DescribeLunaClient(ctx context.Context, params *DescribeLunaCli addawsAwsjson11_serdeOpDescribeLunaClientMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_GetConfig.go b/service/cloudhsm/api_op_GetConfig.go index 6624c088b78..2419903f98e 100644 --- a/service/cloudhsm/api_op_GetConfig.go +++ b/service/cloudhsm/api_op_GetConfig.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudhsm/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) GetConfig(ctx context.Context, params *GetConfigInput, optFns . addawsAwsjson11_serdeOpGetConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_ListAvailableZones.go b/service/cloudhsm/api_op_ListAvailableZones.go index b8fe78b5259..177837f09fd 100644 --- a/service/cloudhsm/api_op_ListAvailableZones.go +++ b/service/cloudhsm/api_op_ListAvailableZones.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) ListAvailableZones(ctx context.Context, params *ListAvailableZo addawsAwsjson11_serdeOpListAvailableZonesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_ListHapgs.go b/service/cloudhsm/api_op_ListHapgs.go index 0ec2c4805df..ce93dc8d6e8 100644 --- a/service/cloudhsm/api_op_ListHapgs.go +++ b/service/cloudhsm/api_op_ListHapgs.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) ListHapgs(ctx context.Context, params *ListHapgsInput, optFns . addawsAwsjson11_serdeOpListHapgsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_ListHsms.go b/service/cloudhsm/api_op_ListHsms.go index b240dea2ff0..47fbb554a08 100644 --- a/service/cloudhsm/api_op_ListHsms.go +++ b/service/cloudhsm/api_op_ListHsms.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -36,9 +35,9 @@ func (c *Client) ListHsms(ctx context.Context, params *ListHsmsInput, optFns ... addawsAwsjson11_serdeOpListHsmsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_ListLunaClients.go b/service/cloudhsm/api_op_ListLunaClients.go index ffb7d53d14c..c1eca63ca42 100644 --- a/service/cloudhsm/api_op_ListLunaClients.go +++ b/service/cloudhsm/api_op_ListLunaClients.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) ListLunaClients(ctx context.Context, params *ListLunaClientsInp addawsAwsjson11_serdeOpListLunaClientsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_ListTagsForResource.go b/service/cloudhsm/api_op_ListTagsForResource.go index a50cf97d887..8aac6d2ffc4 100644 --- a/service/cloudhsm/api_op_ListTagsForResource.go +++ b/service/cloudhsm/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudhsm/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_ModifyHapg.go b/service/cloudhsm/api_op_ModifyHapg.go index a4ffd6d421f..04cf78e953a 100644 --- a/service/cloudhsm/api_op_ModifyHapg.go +++ b/service/cloudhsm/api_op_ModifyHapg.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) ModifyHapg(ctx context.Context, params *ModifyHapgInput, optFns addawsAwsjson11_serdeOpModifyHapgMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_ModifyHsm.go b/service/cloudhsm/api_op_ModifyHsm.go index de50b594d64..859a464742e 100644 --- a/service/cloudhsm/api_op_ModifyHsm.go +++ b/service/cloudhsm/api_op_ModifyHsm.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -36,9 +35,9 @@ func (c *Client) ModifyHsm(ctx context.Context, params *ModifyHsmInput, optFns . addawsAwsjson11_serdeOpModifyHsmMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_ModifyLunaClient.go b/service/cloudhsm/api_op_ModifyLunaClient.go index e56f6ca69d7..ab228025673 100644 --- a/service/cloudhsm/api_op_ModifyLunaClient.go +++ b/service/cloudhsm/api_op_ModifyLunaClient.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) ModifyLunaClient(ctx context.Context, params *ModifyLunaClientI addawsAwsjson11_serdeOpModifyLunaClientMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/api_op_RemoveTagsFromResource.go b/service/cloudhsm/api_op_RemoveTagsFromResource.go index 40267236859..9f90e3f3992 100644 --- a/service/cloudhsm/api_op_RemoveTagsFromResource.go +++ b/service/cloudhsm/api_op_RemoveTagsFromResource.go @@ -5,7 +5,6 @@ package cloudhsm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -34,9 +33,9 @@ func (c *Client) RemoveTagsFromResource(ctx context.Context, params *RemoveTagsF addawsAwsjson11_serdeOpRemoveTagsFromResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsm/endpoints.go b/service/cloudhsm/endpoints.go index 15452b8d0cc..850ed6e0eec 100644 --- a/service/cloudhsm/endpoints.go +++ b/service/cloudhsm/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/cloudhsmv2/api_client.go b/service/cloudhsmv2/api_client.go index bc669c18e21..db1b1adcb94 100644 --- a/service/cloudhsmv2/api_client.go +++ b/service/cloudhsmv2/api_client.go @@ -79,30 +79,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -168,6 +144,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/cloudhsmv2/api_op_CopyBackupToRegion.go b/service/cloudhsmv2/api_op_CopyBackupToRegion.go index cdffb6287c7..c7bf9becfbe 100644 --- a/service/cloudhsmv2/api_op_CopyBackupToRegion.go +++ b/service/cloudhsmv2/api_op_CopyBackupToRegion.go @@ -5,7 +5,6 @@ package cloudhsmv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CopyBackupToRegion(ctx context.Context, params *CopyBackupToReg addawsAwsjson11_serdeOpCopyBackupToRegionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsmv2/api_op_CreateCluster.go b/service/cloudhsmv2/api_op_CreateCluster.go index 6729b0bed18..9fdba39d3da 100644 --- a/service/cloudhsmv2/api_op_CreateCluster.go +++ b/service/cloudhsmv2/api_op_CreateCluster.go @@ -5,7 +5,6 @@ package cloudhsmv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateCluster(ctx context.Context, params *CreateClusterInput, addawsAwsjson11_serdeOpCreateClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsmv2/api_op_CreateHsm.go b/service/cloudhsmv2/api_op_CreateHsm.go index 8709d904e81..b799d17240c 100644 --- a/service/cloudhsmv2/api_op_CreateHsm.go +++ b/service/cloudhsmv2/api_op_CreateHsm.go @@ -5,7 +5,6 @@ package cloudhsmv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateHsm(ctx context.Context, params *CreateHsmInput, optFns . addawsAwsjson11_serdeOpCreateHsmMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsmv2/api_op_DeleteBackup.go b/service/cloudhsmv2/api_op_DeleteBackup.go index 3c7a759fa7b..5641c9ef0d6 100644 --- a/service/cloudhsmv2/api_op_DeleteBackup.go +++ b/service/cloudhsmv2/api_op_DeleteBackup.go @@ -5,7 +5,6 @@ package cloudhsmv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DeleteBackup(ctx context.Context, params *DeleteBackupInput, op addawsAwsjson11_serdeOpDeleteBackupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsmv2/api_op_DeleteCluster.go b/service/cloudhsmv2/api_op_DeleteCluster.go index e1f3a76ede6..f7e6c7ee949 100644 --- a/service/cloudhsmv2/api_op_DeleteCluster.go +++ b/service/cloudhsmv2/api_op_DeleteCluster.go @@ -5,7 +5,6 @@ package cloudhsmv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DeleteCluster(ctx context.Context, params *DeleteClusterInput, addawsAwsjson11_serdeOpDeleteClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsmv2/api_op_DeleteHsm.go b/service/cloudhsmv2/api_op_DeleteHsm.go index 3fb74cfdb3b..f5a00620e35 100644 --- a/service/cloudhsmv2/api_op_DeleteHsm.go +++ b/service/cloudhsmv2/api_op_DeleteHsm.go @@ -5,7 +5,6 @@ package cloudhsmv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteHsm(ctx context.Context, params *DeleteHsmInput, optFns . addawsAwsjson11_serdeOpDeleteHsmMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsmv2/api_op_DescribeBackups.go b/service/cloudhsmv2/api_op_DescribeBackups.go index e7e407e39d0..1df1a0c8db3 100644 --- a/service/cloudhsmv2/api_op_DescribeBackups.go +++ b/service/cloudhsmv2/api_op_DescribeBackups.go @@ -5,7 +5,6 @@ package cloudhsmv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeBackups(ctx context.Context, params *DescribeBackupsInp addawsAwsjson11_serdeOpDescribeBackupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsmv2/api_op_DescribeClusters.go b/service/cloudhsmv2/api_op_DescribeClusters.go index 60993ef6f81..2f994bb9fbe 100644 --- a/service/cloudhsmv2/api_op_DescribeClusters.go +++ b/service/cloudhsmv2/api_op_DescribeClusters.go @@ -5,7 +5,6 @@ package cloudhsmv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeClusters(ctx context.Context, params *DescribeClustersI addawsAwsjson11_serdeOpDescribeClustersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsmv2/api_op_InitializeCluster.go b/service/cloudhsmv2/api_op_InitializeCluster.go index b57a36644e4..d6de56931fe 100644 --- a/service/cloudhsmv2/api_op_InitializeCluster.go +++ b/service/cloudhsmv2/api_op_InitializeCluster.go @@ -5,7 +5,6 @@ package cloudhsmv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) InitializeCluster(ctx context.Context, params *InitializeCluste addawsAwsjson11_serdeOpInitializeClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsmv2/api_op_ListTags.go b/service/cloudhsmv2/api_op_ListTags.go index 9c10d3619b0..f9e1e2ab3f2 100644 --- a/service/cloudhsmv2/api_op_ListTags.go +++ b/service/cloudhsmv2/api_op_ListTags.go @@ -5,7 +5,6 @@ package cloudhsmv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListTags(ctx context.Context, params *ListTagsInput, optFns ... addawsAwsjson11_serdeOpListTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsmv2/api_op_RestoreBackup.go b/service/cloudhsmv2/api_op_RestoreBackup.go index 245f5fb67b4..ec49132aa8d 100644 --- a/service/cloudhsmv2/api_op_RestoreBackup.go +++ b/service/cloudhsmv2/api_op_RestoreBackup.go @@ -5,7 +5,6 @@ package cloudhsmv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) RestoreBackup(ctx context.Context, params *RestoreBackupInput, addawsAwsjson11_serdeOpRestoreBackupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsmv2/api_op_TagResource.go b/service/cloudhsmv2/api_op_TagResource.go index ba6cd31520c..942ccd5259a 100644 --- a/service/cloudhsmv2/api_op_TagResource.go +++ b/service/cloudhsmv2/api_op_TagResource.go @@ -5,7 +5,6 @@ package cloudhsmv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsmv2/api_op_UntagResource.go b/service/cloudhsmv2/api_op_UntagResource.go index ffab3b970aa..90cc4886d10 100644 --- a/service/cloudhsmv2/api_op_UntagResource.go +++ b/service/cloudhsmv2/api_op_UntagResource.go @@ -5,7 +5,6 @@ package cloudhsmv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudhsmv2/endpoints.go b/service/cloudhsmv2/endpoints.go index c50ef21be2b..353aeb946cf 100644 --- a/service/cloudhsmv2/endpoints.go +++ b/service/cloudhsmv2/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/cloudsearch/api_client.go b/service/cloudsearch/api_client.go index 52ebd614abf..6f37866c982 100644 --- a/service/cloudsearch/api_client.go +++ b/service/cloudsearch/api_client.go @@ -85,30 +85,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -174,6 +150,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/cloudsearch/api_op_BuildSuggesters.go b/service/cloudsearch/api_op_BuildSuggesters.go index eaa6db55867..7bae491be07 100644 --- a/service/cloudsearch/api_op_BuildSuggesters.go +++ b/service/cloudsearch/api_op_BuildSuggesters.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) BuildSuggesters(ctx context.Context, params *BuildSuggestersInp addawsAwsquery_serdeOpBuildSuggestersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_CreateDomain.go b/service/cloudsearch/api_op_CreateDomain.go index ea7058f6505..a10386989d1 100644 --- a/service/cloudsearch/api_op_CreateDomain.go +++ b/service/cloudsearch/api_op_CreateDomain.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateDomain(ctx context.Context, params *CreateDomainInput, op addawsAwsquery_serdeOpCreateDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_DefineAnalysisScheme.go b/service/cloudsearch/api_op_DefineAnalysisScheme.go index 366de631cab..a7a704d82ac 100644 --- a/service/cloudsearch/api_op_DefineAnalysisScheme.go +++ b/service/cloudsearch/api_op_DefineAnalysisScheme.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DefineAnalysisScheme(ctx context.Context, params *DefineAnalysi addawsAwsquery_serdeOpDefineAnalysisSchemeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_DefineExpression.go b/service/cloudsearch/api_op_DefineExpression.go index 2f81483915d..4e0a5fc6334 100644 --- a/service/cloudsearch/api_op_DefineExpression.go +++ b/service/cloudsearch/api_op_DefineExpression.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DefineExpression(ctx context.Context, params *DefineExpressionI addawsAwsquery_serdeOpDefineExpressionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_DefineIndexField.go b/service/cloudsearch/api_op_DefineIndexField.go index ea4236701f8..b018470188d 100644 --- a/service/cloudsearch/api_op_DefineIndexField.go +++ b/service/cloudsearch/api_op_DefineIndexField.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DefineIndexField(ctx context.Context, params *DefineIndexFieldI addawsAwsquery_serdeOpDefineIndexFieldMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_DefineSuggester.go b/service/cloudsearch/api_op_DefineSuggester.go index f6b788f7a10..b73fb76ccec 100644 --- a/service/cloudsearch/api_op_DefineSuggester.go +++ b/service/cloudsearch/api_op_DefineSuggester.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DefineSuggester(ctx context.Context, params *DefineSuggesterInp addawsAwsquery_serdeOpDefineSuggesterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_DeleteAnalysisScheme.go b/service/cloudsearch/api_op_DeleteAnalysisScheme.go index 5e624c0769d..c60b2cc7f36 100644 --- a/service/cloudsearch/api_op_DeleteAnalysisScheme.go +++ b/service/cloudsearch/api_op_DeleteAnalysisScheme.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteAnalysisScheme(ctx context.Context, params *DeleteAnalysi addawsAwsquery_serdeOpDeleteAnalysisSchemeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_DeleteDomain.go b/service/cloudsearch/api_op_DeleteDomain.go index 656a0fc4006..9d59850e852 100644 --- a/service/cloudsearch/api_op_DeleteDomain.go +++ b/service/cloudsearch/api_op_DeleteDomain.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeleteDomain(ctx context.Context, params *DeleteDomainInput, op addawsAwsquery_serdeOpDeleteDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_DeleteExpression.go b/service/cloudsearch/api_op_DeleteExpression.go index c35f7d1cc15..94f6cca6bd0 100644 --- a/service/cloudsearch/api_op_DeleteExpression.go +++ b/service/cloudsearch/api_op_DeleteExpression.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteExpression(ctx context.Context, params *DeleteExpressionI addawsAwsquery_serdeOpDeleteExpressionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_DeleteIndexField.go b/service/cloudsearch/api_op_DeleteIndexField.go index b7a7aa7b704..2257b6412c3 100644 --- a/service/cloudsearch/api_op_DeleteIndexField.go +++ b/service/cloudsearch/api_op_DeleteIndexField.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteIndexField(ctx context.Context, params *DeleteIndexFieldI addawsAwsquery_serdeOpDeleteIndexFieldMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_DeleteSuggester.go b/service/cloudsearch/api_op_DeleteSuggester.go index 0d7a5f4f30b..ed5b4be6103 100644 --- a/service/cloudsearch/api_op_DeleteSuggester.go +++ b/service/cloudsearch/api_op_DeleteSuggester.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DeleteSuggester(ctx context.Context, params *DeleteSuggesterInp addawsAwsquery_serdeOpDeleteSuggesterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_DescribeAnalysisSchemes.go b/service/cloudsearch/api_op_DescribeAnalysisSchemes.go index 2d3e1ffdc7d..54621840483 100644 --- a/service/cloudsearch/api_op_DescribeAnalysisSchemes.go +++ b/service/cloudsearch/api_op_DescribeAnalysisSchemes.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DescribeAnalysisSchemes(ctx context.Context, params *DescribeAn addawsAwsquery_serdeOpDescribeAnalysisSchemesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_DescribeAvailabilityOptions.go b/service/cloudsearch/api_op_DescribeAvailabilityOptions.go index 9cba0ef1711..bb99fa2f87c 100644 --- a/service/cloudsearch/api_op_DescribeAvailabilityOptions.go +++ b/service/cloudsearch/api_op_DescribeAvailabilityOptions.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeAvailabilityOptions(ctx context.Context, params *Descri addawsAwsquery_serdeOpDescribeAvailabilityOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_DescribeDomainEndpointOptions.go b/service/cloudsearch/api_op_DescribeDomainEndpointOptions.go index f891f14e66e..5dcb25bed50 100644 --- a/service/cloudsearch/api_op_DescribeDomainEndpointOptions.go +++ b/service/cloudsearch/api_op_DescribeDomainEndpointOptions.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeDomainEndpointOptions(ctx context.Context, params *Desc addawsAwsquery_serdeOpDescribeDomainEndpointOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_DescribeDomains.go b/service/cloudsearch/api_op_DescribeDomains.go index 4576907bf45..a043a45ec4d 100644 --- a/service/cloudsearch/api_op_DescribeDomains.go +++ b/service/cloudsearch/api_op_DescribeDomains.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeDomains(ctx context.Context, params *DescribeDomainsInp addawsAwsquery_serdeOpDescribeDomainsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_DescribeExpressions.go b/service/cloudsearch/api_op_DescribeExpressions.go index 648b7916530..f181c71b5b3 100644 --- a/service/cloudsearch/api_op_DescribeExpressions.go +++ b/service/cloudsearch/api_op_DescribeExpressions.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeExpressions(ctx context.Context, params *DescribeExpres addawsAwsquery_serdeOpDescribeExpressionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_DescribeIndexFields.go b/service/cloudsearch/api_op_DescribeIndexFields.go index fdc9e2667fb..3187e7cf51a 100644 --- a/service/cloudsearch/api_op_DescribeIndexFields.go +++ b/service/cloudsearch/api_op_DescribeIndexFields.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeIndexFields(ctx context.Context, params *DescribeIndexF addawsAwsquery_serdeOpDescribeIndexFieldsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_DescribeScalingParameters.go b/service/cloudsearch/api_op_DescribeScalingParameters.go index 7aa7b5af3b2..ac2d9d813e6 100644 --- a/service/cloudsearch/api_op_DescribeScalingParameters.go +++ b/service/cloudsearch/api_op_DescribeScalingParameters.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeScalingParameters(ctx context.Context, params *Describe addawsAwsquery_serdeOpDescribeScalingParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_DescribeServiceAccessPolicies.go b/service/cloudsearch/api_op_DescribeServiceAccessPolicies.go index 61dcc3ddf23..6e15cc74bc8 100644 --- a/service/cloudsearch/api_op_DescribeServiceAccessPolicies.go +++ b/service/cloudsearch/api_op_DescribeServiceAccessPolicies.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeServiceAccessPolicies(ctx context.Context, params *Desc addawsAwsquery_serdeOpDescribeServiceAccessPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_DescribeSuggesters.go b/service/cloudsearch/api_op_DescribeSuggesters.go index 348a0497497..83d391ec1c6 100644 --- a/service/cloudsearch/api_op_DescribeSuggesters.go +++ b/service/cloudsearch/api_op_DescribeSuggesters.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DescribeSuggesters(ctx context.Context, params *DescribeSuggest addawsAwsquery_serdeOpDescribeSuggestersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_IndexDocuments.go b/service/cloudsearch/api_op_IndexDocuments.go index 6b13d9419e3..262ef20d212 100644 --- a/service/cloudsearch/api_op_IndexDocuments.go +++ b/service/cloudsearch/api_op_IndexDocuments.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) IndexDocuments(ctx context.Context, params *IndexDocumentsInput addawsAwsquery_serdeOpIndexDocumentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_ListDomainNames.go b/service/cloudsearch/api_op_ListDomainNames.go index b739d2416da..b65e4926e3f 100644 --- a/service/cloudsearch/api_op_ListDomainNames.go +++ b/service/cloudsearch/api_op_ListDomainNames.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListDomainNames(ctx context.Context, params *ListDomainNamesInp addawsAwsquery_serdeOpListDomainNamesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_UpdateAvailabilityOptions.go b/service/cloudsearch/api_op_UpdateAvailabilityOptions.go index 24ca36eb2cf..093c4d6de8c 100644 --- a/service/cloudsearch/api_op_UpdateAvailabilityOptions.go +++ b/service/cloudsearch/api_op_UpdateAvailabilityOptions.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) UpdateAvailabilityOptions(ctx context.Context, params *UpdateAv addawsAwsquery_serdeOpUpdateAvailabilityOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_UpdateDomainEndpointOptions.go b/service/cloudsearch/api_op_UpdateDomainEndpointOptions.go index aa04e58bc8e..54922d4b5d0 100644 --- a/service/cloudsearch/api_op_UpdateDomainEndpointOptions.go +++ b/service/cloudsearch/api_op_UpdateDomainEndpointOptions.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateDomainEndpointOptions(ctx context.Context, params *Update addawsAwsquery_serdeOpUpdateDomainEndpointOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_UpdateScalingParameters.go b/service/cloudsearch/api_op_UpdateScalingParameters.go index b42b7be9ce9..0de78d0cbc9 100644 --- a/service/cloudsearch/api_op_UpdateScalingParameters.go +++ b/service/cloudsearch/api_op_UpdateScalingParameters.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) UpdateScalingParameters(ctx context.Context, params *UpdateScal addawsAwsquery_serdeOpUpdateScalingParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/api_op_UpdateServiceAccessPolicies.go b/service/cloudsearch/api_op_UpdateServiceAccessPolicies.go index 1a0941282bd..3a245731da4 100644 --- a/service/cloudsearch/api_op_UpdateServiceAccessPolicies.go +++ b/service/cloudsearch/api_op_UpdateServiceAccessPolicies.go @@ -5,7 +5,6 @@ package cloudsearch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearch/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateServiceAccessPolicies(ctx context.Context, params *Update addawsAwsquery_serdeOpUpdateServiceAccessPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearch/endpoints.go b/service/cloudsearch/endpoints.go index 5438a0cc519..3e060d60ba4 100644 --- a/service/cloudsearch/endpoints.go +++ b/service/cloudsearch/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/cloudsearchdomain/api_client.go b/service/cloudsearchdomain/api_client.go index 110318ce365..9b070ab8aca 100644 --- a/service/cloudsearchdomain/api_client.go +++ b/service/cloudsearchdomain/api_client.go @@ -86,30 +86,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -175,6 +151,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/cloudsearchdomain/api_op_Search.go b/service/cloudsearchdomain/api_op_Search.go index 1f827b4da7c..9583b1275c4 100644 --- a/service/cloudsearchdomain/api_op_Search.go +++ b/service/cloudsearchdomain/api_op_Search.go @@ -5,7 +5,6 @@ package cloudsearchdomain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearchdomain/types" smithy "github.com/awslabs/smithy-go" @@ -49,9 +48,9 @@ func (c *Client) Search(ctx context.Context, params *SearchInput, optFns ...func addawsRestjson1_serdeOpSearchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearchdomain/api_op_Suggest.go b/service/cloudsearchdomain/api_op_Suggest.go index ea23b174bd7..1228f2545cb 100644 --- a/service/cloudsearchdomain/api_op_Suggest.go +++ b/service/cloudsearchdomain/api_op_Suggest.go @@ -5,7 +5,6 @@ package cloudsearchdomain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearchdomain/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) Suggest(ctx context.Context, params *SuggestInput, optFns ...fu addawsRestjson1_serdeOpSuggestMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearchdomain/api_op_UploadDocuments.go b/service/cloudsearchdomain/api_op_UploadDocuments.go index 839be7af2f4..09e82bde5fe 100644 --- a/service/cloudsearchdomain/api_op_UploadDocuments.go +++ b/service/cloudsearchdomain/api_op_UploadDocuments.go @@ -5,7 +5,6 @@ package cloudsearchdomain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudsearchdomain/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) UploadDocuments(ctx context.Context, params *UploadDocumentsInp addawsRestjson1_serdeOpUploadDocumentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudsearchdomain/endpoints.go b/service/cloudsearchdomain/endpoints.go index 22c76591553..81c2f7c1271 100644 --- a/service/cloudsearchdomain/endpoints.go +++ b/service/cloudsearchdomain/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/cloudtrail/api_client.go b/service/cloudtrail/api_client.go index 9a0c9e4ad3a..87b4a708306 100644 --- a/service/cloudtrail/api_client.go +++ b/service/cloudtrail/api_client.go @@ -93,30 +93,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -182,6 +158,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/cloudtrail/api_op_AddTags.go b/service/cloudtrail/api_op_AddTags.go index d8b54fef4c2..ad4fa08075f 100644 --- a/service/cloudtrail/api_op_AddTags.go +++ b/service/cloudtrail/api_op_AddTags.go @@ -5,7 +5,6 @@ package cloudtrail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudtrail/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) AddTags(ctx context.Context, params *AddTagsInput, optFns ...fu addawsAwsjson11_serdeOpAddTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudtrail/api_op_CreateTrail.go b/service/cloudtrail/api_op_CreateTrail.go index 05208cefb6f..cdc728ea8e5 100644 --- a/service/cloudtrail/api_op_CreateTrail.go +++ b/service/cloudtrail/api_op_CreateTrail.go @@ -5,7 +5,6 @@ package cloudtrail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudtrail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateTrail(ctx context.Context, params *CreateTrailInput, optF addawsAwsjson11_serdeOpCreateTrailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudtrail/api_op_DeleteTrail.go b/service/cloudtrail/api_op_DeleteTrail.go index 575acb823ce..c254fce322d 100644 --- a/service/cloudtrail/api_op_DeleteTrail.go +++ b/service/cloudtrail/api_op_DeleteTrail.go @@ -5,7 +5,6 @@ package cloudtrail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteTrail(ctx context.Context, params *DeleteTrailInput, optF addawsAwsjson11_serdeOpDeleteTrailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudtrail/api_op_DescribeTrails.go b/service/cloudtrail/api_op_DescribeTrails.go index e996ded4c77..4de1bcbe984 100644 --- a/service/cloudtrail/api_op_DescribeTrails.go +++ b/service/cloudtrail/api_op_DescribeTrails.go @@ -5,7 +5,6 @@ package cloudtrail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudtrail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeTrails(ctx context.Context, params *DescribeTrailsInput addawsAwsjson11_serdeOpDescribeTrailsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudtrail/api_op_GetEventSelectors.go b/service/cloudtrail/api_op_GetEventSelectors.go index 2b9f3976cc1..7ddad38f668 100644 --- a/service/cloudtrail/api_op_GetEventSelectors.go +++ b/service/cloudtrail/api_op_GetEventSelectors.go @@ -5,7 +5,6 @@ package cloudtrail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudtrail/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) GetEventSelectors(ctx context.Context, params *GetEventSelector addawsAwsjson11_serdeOpGetEventSelectorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudtrail/api_op_GetInsightSelectors.go b/service/cloudtrail/api_op_GetInsightSelectors.go index 3b347f6f076..41cf3d17c53 100644 --- a/service/cloudtrail/api_op_GetInsightSelectors.go +++ b/service/cloudtrail/api_op_GetInsightSelectors.go @@ -5,7 +5,6 @@ package cloudtrail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudtrail/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetInsightSelectors(ctx context.Context, params *GetInsightSele addawsAwsjson11_serdeOpGetInsightSelectorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudtrail/api_op_GetTrail.go b/service/cloudtrail/api_op_GetTrail.go index 6b6b2f5b07f..7d3b8953731 100644 --- a/service/cloudtrail/api_op_GetTrail.go +++ b/service/cloudtrail/api_op_GetTrail.go @@ -5,7 +5,6 @@ package cloudtrail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudtrail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetTrail(ctx context.Context, params *GetTrailInput, optFns ... addawsAwsjson11_serdeOpGetTrailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudtrail/api_op_GetTrailStatus.go b/service/cloudtrail/api_op_GetTrailStatus.go index 0d1ae6d68f8..0fbfa39a8f2 100644 --- a/service/cloudtrail/api_op_GetTrailStatus.go +++ b/service/cloudtrail/api_op_GetTrailStatus.go @@ -5,7 +5,6 @@ package cloudtrail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) GetTrailStatus(ctx context.Context, params *GetTrailStatusInput addawsAwsjson11_serdeOpGetTrailStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudtrail/api_op_ListPublicKeys.go b/service/cloudtrail/api_op_ListPublicKeys.go index 77fc0fa06ac..ad025ea1d84 100644 --- a/service/cloudtrail/api_op_ListPublicKeys.go +++ b/service/cloudtrail/api_op_ListPublicKeys.go @@ -5,7 +5,6 @@ package cloudtrail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudtrail/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListPublicKeys(ctx context.Context, params *ListPublicKeysInput addawsAwsjson11_serdeOpListPublicKeysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudtrail/api_op_ListTags.go b/service/cloudtrail/api_op_ListTags.go index 803e0713b16..194c5eaf4c6 100644 --- a/service/cloudtrail/api_op_ListTags.go +++ b/service/cloudtrail/api_op_ListTags.go @@ -5,7 +5,6 @@ package cloudtrail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudtrail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTags(ctx context.Context, params *ListTagsInput, optFns ... addawsAwsjson11_serdeOpListTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudtrail/api_op_ListTrails.go b/service/cloudtrail/api_op_ListTrails.go index 1d03350282c..7d2008e165f 100644 --- a/service/cloudtrail/api_op_ListTrails.go +++ b/service/cloudtrail/api_op_ListTrails.go @@ -5,7 +5,6 @@ package cloudtrail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudtrail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTrails(ctx context.Context, params *ListTrailsInput, optFns addawsAwsjson11_serdeOpListTrailsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudtrail/api_op_LookupEvents.go b/service/cloudtrail/api_op_LookupEvents.go index b42e82f00ae..aec7bdfe776 100644 --- a/service/cloudtrail/api_op_LookupEvents.go +++ b/service/cloudtrail/api_op_LookupEvents.go @@ -5,7 +5,6 @@ package cloudtrail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudtrail/types" smithy "github.com/awslabs/smithy-go" @@ -63,9 +62,9 @@ func (c *Client) LookupEvents(ctx context.Context, params *LookupEventsInput, op addawsAwsjson11_serdeOpLookupEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudtrail/api_op_PutEventSelectors.go b/service/cloudtrail/api_op_PutEventSelectors.go index 6248f3d7137..35d86a54b08 100644 --- a/service/cloudtrail/api_op_PutEventSelectors.go +++ b/service/cloudtrail/api_op_PutEventSelectors.go @@ -5,7 +5,6 @@ package cloudtrail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudtrail/types" smithy "github.com/awslabs/smithy-go" @@ -56,9 +55,9 @@ func (c *Client) PutEventSelectors(ctx context.Context, params *PutEventSelector addawsAwsjson11_serdeOpPutEventSelectorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudtrail/api_op_PutInsightSelectors.go b/service/cloudtrail/api_op_PutInsightSelectors.go index bfb669e8992..774409e4052 100644 --- a/service/cloudtrail/api_op_PutInsightSelectors.go +++ b/service/cloudtrail/api_op_PutInsightSelectors.go @@ -5,7 +5,6 @@ package cloudtrail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudtrail/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) PutInsightSelectors(ctx context.Context, params *PutInsightSele addawsAwsjson11_serdeOpPutInsightSelectorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudtrail/api_op_RemoveTags.go b/service/cloudtrail/api_op_RemoveTags.go index 7bca745cc47..151269bff8f 100644 --- a/service/cloudtrail/api_op_RemoveTags.go +++ b/service/cloudtrail/api_op_RemoveTags.go @@ -5,7 +5,6 @@ package cloudtrail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudtrail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RemoveTags(ctx context.Context, params *RemoveTagsInput, optFns addawsAwsjson11_serdeOpRemoveTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudtrail/api_op_StartLogging.go b/service/cloudtrail/api_op_StartLogging.go index 9745614814d..0ff83cd4377 100644 --- a/service/cloudtrail/api_op_StartLogging.go +++ b/service/cloudtrail/api_op_StartLogging.go @@ -5,7 +5,6 @@ package cloudtrail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) StartLogging(ctx context.Context, params *StartLoggingInput, op addawsAwsjson11_serdeOpStartLoggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudtrail/api_op_StopLogging.go b/service/cloudtrail/api_op_StopLogging.go index ec8a81a3a67..73a6e78dbd0 100644 --- a/service/cloudtrail/api_op_StopLogging.go +++ b/service/cloudtrail/api_op_StopLogging.go @@ -5,7 +5,6 @@ package cloudtrail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) StopLogging(ctx context.Context, params *StopLoggingInput, optF addawsAwsjson11_serdeOpStopLoggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudtrail/api_op_UpdateTrail.go b/service/cloudtrail/api_op_UpdateTrail.go index 39fad0739e4..9c425e43b89 100644 --- a/service/cloudtrail/api_op_UpdateTrail.go +++ b/service/cloudtrail/api_op_UpdateTrail.go @@ -5,7 +5,6 @@ package cloudtrail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) UpdateTrail(ctx context.Context, params *UpdateTrailInput, optF addawsAwsjson11_serdeOpUpdateTrailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudtrail/endpoints.go b/service/cloudtrail/endpoints.go index 7f645807a10..6076f58e587 100644 --- a/service/cloudtrail/endpoints.go +++ b/service/cloudtrail/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/cloudwatch/api_client.go b/service/cloudwatch/api_client.go index de00cdca52f..f3b695ef26f 100644 --- a/service/cloudwatch/api_client.go +++ b/service/cloudwatch/api_client.go @@ -88,30 +88,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -177,6 +153,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/cloudwatch/api_op_DeleteAlarms.go b/service/cloudwatch/api_op_DeleteAlarms.go index bba4846df1f..f2854e09c55 100644 --- a/service/cloudwatch/api_op_DeleteAlarms.go +++ b/service/cloudwatch/api_op_DeleteAlarms.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) DeleteAlarms(ctx context.Context, params *DeleteAlarmsInput, op addawsAwsquery_serdeOpDeleteAlarmsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_DeleteAnomalyDetector.go b/service/cloudwatch/api_op_DeleteAnomalyDetector.go index 289bb0a1909..a91a48cefb5 100644 --- a/service/cloudwatch/api_op_DeleteAnomalyDetector.go +++ b/service/cloudwatch/api_op_DeleteAnomalyDetector.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteAnomalyDetector(ctx context.Context, params *DeleteAnomal addawsAwsquery_serdeOpDeleteAnomalyDetectorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_DeleteDashboards.go b/service/cloudwatch/api_op_DeleteDashboards.go index 9d2cf88d34a..68bd70d198e 100644 --- a/service/cloudwatch/api_op_DeleteDashboards.go +++ b/service/cloudwatch/api_op_DeleteDashboards.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDashboards(ctx context.Context, params *DeleteDashboardsI addawsAwsquery_serdeOpDeleteDashboardsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_DeleteInsightRules.go b/service/cloudwatch/api_op_DeleteInsightRules.go index ad1508ec92c..7d07c6808e6 100644 --- a/service/cloudwatch/api_op_DeleteInsightRules.go +++ b/service/cloudwatch/api_op_DeleteInsightRules.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DeleteInsightRules(ctx context.Context, params *DeleteInsightRu addawsAwsquery_serdeOpDeleteInsightRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_DescribeAlarmHistory.go b/service/cloudwatch/api_op_DescribeAlarmHistory.go index 6a133df8729..26fd9fb5321 100644 --- a/service/cloudwatch/api_op_DescribeAlarmHistory.go +++ b/service/cloudwatch/api_op_DescribeAlarmHistory.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeAlarmHistory(ctx context.Context, params *DescribeAlarm addawsAwsquery_serdeOpDescribeAlarmHistoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_DescribeAlarms.go b/service/cloudwatch/api_op_DescribeAlarms.go index ac926c0ec33..f35885df793 100644 --- a/service/cloudwatch/api_op_DescribeAlarms.go +++ b/service/cloudwatch/api_op_DescribeAlarms.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAlarms(ctx context.Context, params *DescribeAlarmsInput addawsAwsquery_serdeOpDescribeAlarmsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_DescribeAlarmsForMetric.go b/service/cloudwatch/api_op_DescribeAlarmsForMetric.go index 5fc025817ef..d7df4630885 100644 --- a/service/cloudwatch/api_op_DescribeAlarmsForMetric.go +++ b/service/cloudwatch/api_op_DescribeAlarmsForMetric.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAlarmsForMetric(ctx context.Context, params *DescribeAl addawsAwsquery_serdeOpDescribeAlarmsForMetricMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_DescribeAnomalyDetectors.go b/service/cloudwatch/api_op_DescribeAnomalyDetectors.go index 7ea229b9663..badb89307d3 100644 --- a/service/cloudwatch/api_op_DescribeAnomalyDetectors.go +++ b/service/cloudwatch/api_op_DescribeAnomalyDetectors.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeAnomalyDetectors(ctx context.Context, params *DescribeA addawsAwsquery_serdeOpDescribeAnomalyDetectorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_DescribeInsightRules.go b/service/cloudwatch/api_op_DescribeInsightRules.go index 5b0e2b9ac4b..558dcbfe23e 100644 --- a/service/cloudwatch/api_op_DescribeInsightRules.go +++ b/service/cloudwatch/api_op_DescribeInsightRules.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeInsightRules(ctx context.Context, params *DescribeInsig addawsAwsquery_serdeOpDescribeInsightRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_DisableAlarmActions.go b/service/cloudwatch/api_op_DisableAlarmActions.go index 6af9a4aa539..4a526926b43 100644 --- a/service/cloudwatch/api_op_DisableAlarmActions.go +++ b/service/cloudwatch/api_op_DisableAlarmActions.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisableAlarmActions(ctx context.Context, params *DisableAlarmAc addawsAwsquery_serdeOpDisableAlarmActionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_DisableInsightRules.go b/service/cloudwatch/api_op_DisableInsightRules.go index 04dff8f8657..3c3e020c1c2 100644 --- a/service/cloudwatch/api_op_DisableInsightRules.go +++ b/service/cloudwatch/api_op_DisableInsightRules.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DisableInsightRules(ctx context.Context, params *DisableInsight addawsAwsquery_serdeOpDisableInsightRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_EnableAlarmActions.go b/service/cloudwatch/api_op_EnableAlarmActions.go index bdb2e6efa24..f48d8952015 100644 --- a/service/cloudwatch/api_op_EnableAlarmActions.go +++ b/service/cloudwatch/api_op_EnableAlarmActions.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) EnableAlarmActions(ctx context.Context, params *EnableAlarmActi addawsAwsquery_serdeOpEnableAlarmActionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_EnableInsightRules.go b/service/cloudwatch/api_op_EnableInsightRules.go index ee38396d54b..27734bc131e 100644 --- a/service/cloudwatch/api_op_EnableInsightRules.go +++ b/service/cloudwatch/api_op_EnableInsightRules.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) EnableInsightRules(ctx context.Context, params *EnableInsightRu addawsAwsquery_serdeOpEnableInsightRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_GetDashboard.go b/service/cloudwatch/api_op_GetDashboard.go index 811d5e3fe43..378af0740c6 100644 --- a/service/cloudwatch/api_op_GetDashboard.go +++ b/service/cloudwatch/api_op_GetDashboard.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) GetDashboard(ctx context.Context, params *GetDashboardInput, op addawsAwsquery_serdeOpGetDashboardMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_GetInsightRuleReport.go b/service/cloudwatch/api_op_GetInsightRuleReport.go index f1dfbab92d6..0f3161a3208 100644 --- a/service/cloudwatch/api_op_GetInsightRuleReport.go +++ b/service/cloudwatch/api_op_GetInsightRuleReport.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -55,9 +54,9 @@ func (c *Client) GetInsightRuleReport(ctx context.Context, params *GetInsightRul addawsAwsquery_serdeOpGetInsightRuleReportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_GetMetricData.go b/service/cloudwatch/api_op_GetMetricData.go index 4641f7473a7..301083a5033 100644 --- a/service/cloudwatch/api_op_GetMetricData.go +++ b/service/cloudwatch/api_op_GetMetricData.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -55,9 +54,9 @@ func (c *Client) GetMetricData(ctx context.Context, params *GetMetricDataInput, addawsAwsquery_serdeOpGetMetricDataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_GetMetricStatistics.go b/service/cloudwatch/api_op_GetMetricStatistics.go index 51a4fab5596..7eea908a707 100644 --- a/service/cloudwatch/api_op_GetMetricStatistics.go +++ b/service/cloudwatch/api_op_GetMetricStatistics.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -59,9 +58,9 @@ func (c *Client) GetMetricStatistics(ctx context.Context, params *GetMetricStati addawsAwsquery_serdeOpGetMetricStatisticsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_GetMetricWidgetImage.go b/service/cloudwatch/api_op_GetMetricWidgetImage.go index add52cc1421..19c4f67459d 100644 --- a/service/cloudwatch/api_op_GetMetricWidgetImage.go +++ b/service/cloudwatch/api_op_GetMetricWidgetImage.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) GetMetricWidgetImage(ctx context.Context, params *GetMetricWidg addawsAwsquery_serdeOpGetMetricWidgetImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_ListDashboards.go b/service/cloudwatch/api_op_ListDashboards.go index f5f1e9b906a..43fc3b07242 100644 --- a/service/cloudwatch/api_op_ListDashboards.go +++ b/service/cloudwatch/api_op_ListDashboards.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListDashboards(ctx context.Context, params *ListDashboardsInput addawsAwsquery_serdeOpListDashboardsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_ListMetrics.go b/service/cloudwatch/api_op_ListMetrics.go index 6adb839230a..c71f7009b4b 100644 --- a/service/cloudwatch/api_op_ListMetrics.go +++ b/service/cloudwatch/api_op_ListMetrics.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) ListMetrics(ctx context.Context, params *ListMetricsInput, optF addawsAwsquery_serdeOpListMetricsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_ListTagsForResource.go b/service/cloudwatch/api_op_ListTagsForResource.go index f4628d51b1a..99007b1e172 100644 --- a/service/cloudwatch/api_op_ListTagsForResource.go +++ b/service/cloudwatch/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsquery_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_PutAnomalyDetector.go b/service/cloudwatch/api_op_PutAnomalyDetector.go index c1212525a71..58a25bf12c7 100644 --- a/service/cloudwatch/api_op_PutAnomalyDetector.go +++ b/service/cloudwatch/api_op_PutAnomalyDetector.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) PutAnomalyDetector(ctx context.Context, params *PutAnomalyDetec addawsAwsquery_serdeOpPutAnomalyDetectorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_PutCompositeAlarm.go b/service/cloudwatch/api_op_PutCompositeAlarm.go index bfa0ce8964c..c6a2b77ee77 100644 --- a/service/cloudwatch/api_op_PutCompositeAlarm.go +++ b/service/cloudwatch/api_op_PutCompositeAlarm.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -48,9 +47,9 @@ func (c *Client) PutCompositeAlarm(ctx context.Context, params *PutCompositeAlar addawsAwsquery_serdeOpPutCompositeAlarmMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_PutDashboard.go b/service/cloudwatch/api_op_PutDashboard.go index 1670eb80fce..a0b4342ff31 100644 --- a/service/cloudwatch/api_op_PutDashboard.go +++ b/service/cloudwatch/api_op_PutDashboard.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) PutDashboard(ctx context.Context, params *PutDashboardInput, op addawsAwsquery_serdeOpPutDashboardMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_PutInsightRule.go b/service/cloudwatch/api_op_PutInsightRule.go index c4780d38bca..2f85abe4fcb 100644 --- a/service/cloudwatch/api_op_PutInsightRule.go +++ b/service/cloudwatch/api_op_PutInsightRule.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) PutInsightRule(ctx context.Context, params *PutInsightRuleInput addawsAwsquery_serdeOpPutInsightRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_PutMetricAlarm.go b/service/cloudwatch/api_op_PutMetricAlarm.go index 1fd5695a9c5..18eb5755da8 100644 --- a/service/cloudwatch/api_op_PutMetricAlarm.go +++ b/service/cloudwatch/api_op_PutMetricAlarm.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -53,9 +52,9 @@ func (c *Client) PutMetricAlarm(ctx context.Context, params *PutMetricAlarmInput addawsAwsquery_serdeOpPutMetricAlarmMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_PutMetricData.go b/service/cloudwatch/api_op_PutMetricData.go index 1f80ae0a95c..f6d30443541 100644 --- a/service/cloudwatch/api_op_PutMetricData.go +++ b/service/cloudwatch/api_op_PutMetricData.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -63,9 +62,9 @@ func (c *Client) PutMetricData(ctx context.Context, params *PutMetricDataInput, addawsAwsquery_serdeOpPutMetricDataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_SetAlarmState.go b/service/cloudwatch/api_op_SetAlarmState.go index 83c15756083..f9183812e9d 100644 --- a/service/cloudwatch/api_op_SetAlarmState.go +++ b/service/cloudwatch/api_op_SetAlarmState.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) SetAlarmState(ctx context.Context, params *SetAlarmStateInput, addawsAwsquery_serdeOpSetAlarmStateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_TagResource.go b/service/cloudwatch/api_op_TagResource.go index eb3f1333c93..6a85e320c5d 100644 --- a/service/cloudwatch/api_op_TagResource.go +++ b/service/cloudwatch/api_op_TagResource.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsquery_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/api_op_UntagResource.go b/service/cloudwatch/api_op_UntagResource.go index 49878ba7f83..6ca62b5f696 100644 --- a/service/cloudwatch/api_op_UntagResource.go +++ b/service/cloudwatch/api_op_UntagResource.go @@ -5,7 +5,6 @@ package cloudwatch import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsquery_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatch/endpoints.go b/service/cloudwatch/endpoints.go index 0aec128fae0..97b2bc55b49 100644 --- a/service/cloudwatch/endpoints.go +++ b/service/cloudwatch/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/cloudwatchevents/api_client.go b/service/cloudwatchevents/api_client.go index 04ffc2cf572..396f131d430 100644 --- a/service/cloudwatchevents/api_client.go +++ b/service/cloudwatchevents/api_client.go @@ -97,30 +97,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -186,6 +162,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/cloudwatchevents/api_op_ActivateEventSource.go b/service/cloudwatchevents/api_op_ActivateEventSource.go index eb6992d7960..80225c25dc4 100644 --- a/service/cloudwatchevents/api_op_ActivateEventSource.go +++ b/service/cloudwatchevents/api_op_ActivateEventSource.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ActivateEventSource(ctx context.Context, params *ActivateEventS addawsAwsjson11_serdeOpActivateEventSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_CreateEventBus.go b/service/cloudwatchevents/api_op_CreateEventBus.go index ebc2fd9c7a6..3bbae62c392 100644 --- a/service/cloudwatchevents/api_op_CreateEventBus.go +++ b/service/cloudwatchevents/api_op_CreateEventBus.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchevents/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateEventBus(ctx context.Context, params *CreateEventBusInput addawsAwsjson11_serdeOpCreateEventBusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_CreatePartnerEventSource.go b/service/cloudwatchevents/api_op_CreatePartnerEventSource.go index 28bf7e15e88..f332ed14f23 100644 --- a/service/cloudwatchevents/api_op_CreatePartnerEventSource.go +++ b/service/cloudwatchevents/api_op_CreatePartnerEventSource.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -37,9 +36,9 @@ func (c *Client) CreatePartnerEventSource(ctx context.Context, params *CreatePar addawsAwsjson11_serdeOpCreatePartnerEventSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_DeactivateEventSource.go b/service/cloudwatchevents/api_op_DeactivateEventSource.go index 55552f3222b..c199b7896f1 100644 --- a/service/cloudwatchevents/api_op_DeactivateEventSource.go +++ b/service/cloudwatchevents/api_op_DeactivateEventSource.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeactivateEventSource(ctx context.Context, params *DeactivateEv addawsAwsjson11_serdeOpDeactivateEventSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_DeleteEventBus.go b/service/cloudwatchevents/api_op_DeleteEventBus.go index 1ee88de0d41..da50477b6bc 100644 --- a/service/cloudwatchevents/api_op_DeleteEventBus.go +++ b/service/cloudwatchevents/api_op_DeleteEventBus.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteEventBus(ctx context.Context, params *DeleteEventBusInput addawsAwsjson11_serdeOpDeleteEventBusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_DeletePartnerEventSource.go b/service/cloudwatchevents/api_op_DeletePartnerEventSource.go index 221ea75330b..933c295484e 100644 --- a/service/cloudwatchevents/api_op_DeletePartnerEventSource.go +++ b/service/cloudwatchevents/api_op_DeletePartnerEventSource.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeletePartnerEventSource(ctx context.Context, params *DeletePar addawsAwsjson11_serdeOpDeletePartnerEventSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_DeleteRule.go b/service/cloudwatchevents/api_op_DeleteRule.go index 2f27cd511a9..942f492a72b 100644 --- a/service/cloudwatchevents/api_op_DeleteRule.go +++ b/service/cloudwatchevents/api_op_DeleteRule.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DeleteRule(ctx context.Context, params *DeleteRuleInput, optFns addawsAwsjson11_serdeOpDeleteRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_DescribeEventBus.go b/service/cloudwatchevents/api_op_DescribeEventBus.go index 5208c5169aa..cddbfef5dbc 100644 --- a/service/cloudwatchevents/api_op_DescribeEventBus.go +++ b/service/cloudwatchevents/api_op_DescribeEventBus.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DescribeEventBus(ctx context.Context, params *DescribeEventBusI addawsAwsjson11_serdeOpDescribeEventBusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_DescribeEventSource.go b/service/cloudwatchevents/api_op_DescribeEventSource.go index 05137232df7..dca95ef98d3 100644 --- a/service/cloudwatchevents/api_op_DescribeEventSource.go +++ b/service/cloudwatchevents/api_op_DescribeEventSource.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchevents/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeEventSource(ctx context.Context, params *DescribeEventS addawsAwsjson11_serdeOpDescribeEventSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_DescribePartnerEventSource.go b/service/cloudwatchevents/api_op_DescribePartnerEventSource.go index 5c4260ba931..0157d85b3bf 100644 --- a/service/cloudwatchevents/api_op_DescribePartnerEventSource.go +++ b/service/cloudwatchevents/api_op_DescribePartnerEventSource.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DescribePartnerEventSource(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribePartnerEventSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_DescribeRule.go b/service/cloudwatchevents/api_op_DescribeRule.go index f770596e729..c6e9c8177a6 100644 --- a/service/cloudwatchevents/api_op_DescribeRule.go +++ b/service/cloudwatchevents/api_op_DescribeRule.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchevents/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeRule(ctx context.Context, params *DescribeRuleInput, op addawsAwsjson11_serdeOpDescribeRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_DisableRule.go b/service/cloudwatchevents/api_op_DisableRule.go index 5257ac7e53c..5c726409584 100644 --- a/service/cloudwatchevents/api_op_DisableRule.go +++ b/service/cloudwatchevents/api_op_DisableRule.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DisableRule(ctx context.Context, params *DisableRuleInput, optF addawsAwsjson11_serdeOpDisableRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_EnableRule.go b/service/cloudwatchevents/api_op_EnableRule.go index 7ae4f59e200..e930a173dd6 100644 --- a/service/cloudwatchevents/api_op_EnableRule.go +++ b/service/cloudwatchevents/api_op_EnableRule.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) EnableRule(ctx context.Context, params *EnableRuleInput, optFns addawsAwsjson11_serdeOpEnableRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_ListEventBuses.go b/service/cloudwatchevents/api_op_ListEventBuses.go index 6de58edcb46..91b2cb87d8b 100644 --- a/service/cloudwatchevents/api_op_ListEventBuses.go +++ b/service/cloudwatchevents/api_op_ListEventBuses.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchevents/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListEventBuses(ctx context.Context, params *ListEventBusesInput addawsAwsjson11_serdeOpListEventBusesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_ListEventSources.go b/service/cloudwatchevents/api_op_ListEventSources.go index 55bc4fc0537..191b099d6ec 100644 --- a/service/cloudwatchevents/api_op_ListEventSources.go +++ b/service/cloudwatchevents/api_op_ListEventSources.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchevents/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListEventSources(ctx context.Context, params *ListEventSourcesI addawsAwsjson11_serdeOpListEventSourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_ListPartnerEventSourceAccounts.go b/service/cloudwatchevents/api_op_ListPartnerEventSourceAccounts.go index 5e0e6fb5411..d2eff88c82e 100644 --- a/service/cloudwatchevents/api_op_ListPartnerEventSourceAccounts.go +++ b/service/cloudwatchevents/api_op_ListPartnerEventSourceAccounts.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchevents/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListPartnerEventSourceAccounts(ctx context.Context, params *Lis addawsAwsjson11_serdeOpListPartnerEventSourceAccountsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_ListPartnerEventSources.go b/service/cloudwatchevents/api_op_ListPartnerEventSources.go index 7480e02cec9..49b7a9655c3 100644 --- a/service/cloudwatchevents/api_op_ListPartnerEventSources.go +++ b/service/cloudwatchevents/api_op_ListPartnerEventSources.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchevents/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListPartnerEventSources(ctx context.Context, params *ListPartne addawsAwsjson11_serdeOpListPartnerEventSourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_ListRuleNamesByTarget.go b/service/cloudwatchevents/api_op_ListRuleNamesByTarget.go index 026c5bcf74c..2d88929b683 100644 --- a/service/cloudwatchevents/api_op_ListRuleNamesByTarget.go +++ b/service/cloudwatchevents/api_op_ListRuleNamesByTarget.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ListRuleNamesByTarget(ctx context.Context, params *ListRuleName addawsAwsjson11_serdeOpListRuleNamesByTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_ListRules.go b/service/cloudwatchevents/api_op_ListRules.go index eef8fe9a190..af58f12fd50 100644 --- a/service/cloudwatchevents/api_op_ListRules.go +++ b/service/cloudwatchevents/api_op_ListRules.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchevents/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListRules(ctx context.Context, params *ListRulesInput, optFns . addawsAwsjson11_serdeOpListRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_ListTagsForResource.go b/service/cloudwatchevents/api_op_ListTagsForResource.go index c0970066007..6cc7dfa9eea 100644 --- a/service/cloudwatchevents/api_op_ListTagsForResource.go +++ b/service/cloudwatchevents/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchevents/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_ListTargetsByRule.go b/service/cloudwatchevents/api_op_ListTargetsByRule.go index 5c879fa073c..543ea5efc06 100644 --- a/service/cloudwatchevents/api_op_ListTargetsByRule.go +++ b/service/cloudwatchevents/api_op_ListTargetsByRule.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchevents/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTargetsByRule(ctx context.Context, params *ListTargetsByRul addawsAwsjson11_serdeOpListTargetsByRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_PutEvents.go b/service/cloudwatchevents/api_op_PutEvents.go index fd51eb15766..db2ac161725 100644 --- a/service/cloudwatchevents/api_op_PutEvents.go +++ b/service/cloudwatchevents/api_op_PutEvents.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchevents/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutEvents(ctx context.Context, params *PutEventsInput, optFns . addawsAwsjson11_serdeOpPutEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_PutPartnerEvents.go b/service/cloudwatchevents/api_op_PutPartnerEvents.go index 7087a6dcaa4..33fd844769d 100644 --- a/service/cloudwatchevents/api_op_PutPartnerEvents.go +++ b/service/cloudwatchevents/api_op_PutPartnerEvents.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchevents/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutPartnerEvents(ctx context.Context, params *PutPartnerEventsI addawsAwsjson11_serdeOpPutPartnerEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_PutPermission.go b/service/cloudwatchevents/api_op_PutPermission.go index 4ef66c1d01d..662001ee895 100644 --- a/service/cloudwatchevents/api_op_PutPermission.go +++ b/service/cloudwatchevents/api_op_PutPermission.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchevents/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) PutPermission(ctx context.Context, params *PutPermissionInput, addawsAwsjson11_serdeOpPutPermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_PutRule.go b/service/cloudwatchevents/api_op_PutRule.go index 5af550bd887..15c197e74cd 100644 --- a/service/cloudwatchevents/api_op_PutRule.go +++ b/service/cloudwatchevents/api_op_PutRule.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchevents/types" smithy "github.com/awslabs/smithy-go" @@ -65,9 +64,9 @@ func (c *Client) PutRule(ctx context.Context, params *PutRuleInput, optFns ...fu addawsAwsjson11_serdeOpPutRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_PutTargets.go b/service/cloudwatchevents/api_op_PutTargets.go index 402936aadce..b79d073ec22 100644 --- a/service/cloudwatchevents/api_op_PutTargets.go +++ b/service/cloudwatchevents/api_op_PutTargets.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchevents/types" smithy "github.com/awslabs/smithy-go" @@ -94,9 +93,9 @@ func (c *Client) PutTargets(ctx context.Context, params *PutTargetsInput, optFns addawsAwsjson11_serdeOpPutTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_RemovePermission.go b/service/cloudwatchevents/api_op_RemovePermission.go index 4444c3d957b..e1d8b551129 100644 --- a/service/cloudwatchevents/api_op_RemovePermission.go +++ b/service/cloudwatchevents/api_op_RemovePermission.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) RemovePermission(ctx context.Context, params *RemovePermissionI addawsAwsjson11_serdeOpRemovePermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_RemoveTargets.go b/service/cloudwatchevents/api_op_RemoveTargets.go index 273bdb5fe97..e4c9e5a7606 100644 --- a/service/cloudwatchevents/api_op_RemoveTargets.go +++ b/service/cloudwatchevents/api_op_RemoveTargets.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchevents/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) RemoveTargets(ctx context.Context, params *RemoveTargetsInput, addawsAwsjson11_serdeOpRemoveTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_TagResource.go b/service/cloudwatchevents/api_op_TagResource.go index 01b1b2f5ce4..ff626cf80b2 100644 --- a/service/cloudwatchevents/api_op_TagResource.go +++ b/service/cloudwatchevents/api_op_TagResource.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchevents/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_TestEventPattern.go b/service/cloudwatchevents/api_op_TestEventPattern.go index bbf7ddef10a..dc91480d041 100644 --- a/service/cloudwatchevents/api_op_TestEventPattern.go +++ b/service/cloudwatchevents/api_op_TestEventPattern.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) TestEventPattern(ctx context.Context, params *TestEventPatternI addawsAwsjson11_serdeOpTestEventPatternMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/api_op_UntagResource.go b/service/cloudwatchevents/api_op_UntagResource.go index 9b1c0a065bc..dd656424727 100644 --- a/service/cloudwatchevents/api_op_UntagResource.go +++ b/service/cloudwatchevents/api_op_UntagResource.go @@ -5,7 +5,6 @@ package cloudwatchevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchevents/endpoints.go b/service/cloudwatchevents/endpoints.go index 6361265ed9e..21455f58bdf 100644 --- a/service/cloudwatchevents/endpoints.go +++ b/service/cloudwatchevents/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/cloudwatchlogs/api_client.go b/service/cloudwatchlogs/api_client.go index a61b1fd9808..ea112836712 100644 --- a/service/cloudwatchlogs/api_client.go +++ b/service/cloudwatchlogs/api_client.go @@ -105,30 +105,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -194,6 +170,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/cloudwatchlogs/api_op_AssociateKmsKey.go b/service/cloudwatchlogs/api_op_AssociateKmsKey.go index 2795abd3364..bafe427b950 100644 --- a/service/cloudwatchlogs/api_op_AssociateKmsKey.go +++ b/service/cloudwatchlogs/api_op_AssociateKmsKey.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) AssociateKmsKey(ctx context.Context, params *AssociateKmsKeyInp addawsAwsjson11_serdeOpAssociateKmsKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_CancelExportTask.go b/service/cloudwatchlogs/api_op_CancelExportTask.go index 1d13bdfd4c2..e4091bc81dd 100644 --- a/service/cloudwatchlogs/api_op_CancelExportTask.go +++ b/service/cloudwatchlogs/api_op_CancelExportTask.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CancelExportTask(ctx context.Context, params *CancelExportTaskI addawsAwsjson11_serdeOpCancelExportTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_CreateExportTask.go b/service/cloudwatchlogs/api_op_CreateExportTask.go index 92df6b58f3a..15656a996c8 100644 --- a/service/cloudwatchlogs/api_op_CreateExportTask.go +++ b/service/cloudwatchlogs/api_op_CreateExportTask.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -36,9 +35,9 @@ func (c *Client) CreateExportTask(ctx context.Context, params *CreateExportTaskI addawsAwsjson11_serdeOpCreateExportTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_CreateLogGroup.go b/service/cloudwatchlogs/api_op_CreateLogGroup.go index 0f94b25865a..9e51653f0a1 100644 --- a/service/cloudwatchlogs/api_op_CreateLogGroup.go +++ b/service/cloudwatchlogs/api_op_CreateLogGroup.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -45,9 +44,9 @@ func (c *Client) CreateLogGroup(ctx context.Context, params *CreateLogGroupInput addawsAwsjson11_serdeOpCreateLogGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_CreateLogStream.go b/service/cloudwatchlogs/api_op_CreateLogStream.go index 86bcbccc0f7..eb0bdd5b7bf 100644 --- a/service/cloudwatchlogs/api_op_CreateLogStream.go +++ b/service/cloudwatchlogs/api_op_CreateLogStream.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -34,9 +33,9 @@ func (c *Client) CreateLogStream(ctx context.Context, params *CreateLogStreamInp addawsAwsjson11_serdeOpCreateLogStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_DeleteDestination.go b/service/cloudwatchlogs/api_op_DeleteDestination.go index 0ed0b910a88..21b8cc4b8dc 100644 --- a/service/cloudwatchlogs/api_op_DeleteDestination.go +++ b/service/cloudwatchlogs/api_op_DeleteDestination.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteDestination(ctx context.Context, params *DeleteDestinatio addawsAwsjson11_serdeOpDeleteDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_DeleteLogGroup.go b/service/cloudwatchlogs/api_op_DeleteLogGroup.go index ebfeac4776b..2201eec1cc2 100644 --- a/service/cloudwatchlogs/api_op_DeleteLogGroup.go +++ b/service/cloudwatchlogs/api_op_DeleteLogGroup.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteLogGroup(ctx context.Context, params *DeleteLogGroupInput addawsAwsjson11_serdeOpDeleteLogGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_DeleteLogStream.go b/service/cloudwatchlogs/api_op_DeleteLogStream.go index f936b789b5e..aebd3ab01c4 100644 --- a/service/cloudwatchlogs/api_op_DeleteLogStream.go +++ b/service/cloudwatchlogs/api_op_DeleteLogStream.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteLogStream(ctx context.Context, params *DeleteLogStreamInp addawsAwsjson11_serdeOpDeleteLogStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_DeleteMetricFilter.go b/service/cloudwatchlogs/api_op_DeleteMetricFilter.go index d806eda6b3e..c48dfca3bc3 100644 --- a/service/cloudwatchlogs/api_op_DeleteMetricFilter.go +++ b/service/cloudwatchlogs/api_op_DeleteMetricFilter.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteMetricFilter(ctx context.Context, params *DeleteMetricFil addawsAwsjson11_serdeOpDeleteMetricFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_DeleteQueryDefinition.go b/service/cloudwatchlogs/api_op_DeleteQueryDefinition.go index c7a5187d8d1..b51deb989a7 100644 --- a/service/cloudwatchlogs/api_op_DeleteQueryDefinition.go +++ b/service/cloudwatchlogs/api_op_DeleteQueryDefinition.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -21,9 +20,9 @@ func (c *Client) DeleteQueryDefinition(ctx context.Context, params *DeleteQueryD addawsAwsjson11_serdeOpDeleteQueryDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_DeleteResourcePolicy.go b/service/cloudwatchlogs/api_op_DeleteResourcePolicy.go index 06fb1ef7cde..f57a768ef0a 100644 --- a/service/cloudwatchlogs/api_op_DeleteResourcePolicy.go +++ b/service/cloudwatchlogs/api_op_DeleteResourcePolicy.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteResourcePolicy(ctx context.Context, params *DeleteResourc addawsAwsjson11_serdeOpDeleteResourcePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_DeleteRetentionPolicy.go b/service/cloudwatchlogs/api_op_DeleteRetentionPolicy.go index 41c5b2ee64d..1635919c01b 100644 --- a/service/cloudwatchlogs/api_op_DeleteRetentionPolicy.go +++ b/service/cloudwatchlogs/api_op_DeleteRetentionPolicy.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteRetentionPolicy(ctx context.Context, params *DeleteRetent addawsAwsjson11_serdeOpDeleteRetentionPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_DeleteSubscriptionFilter.go b/service/cloudwatchlogs/api_op_DeleteSubscriptionFilter.go index 169a0d53d0d..e3e442a0815 100644 --- a/service/cloudwatchlogs/api_op_DeleteSubscriptionFilter.go +++ b/service/cloudwatchlogs/api_op_DeleteSubscriptionFilter.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSubscriptionFilter(ctx context.Context, params *DeleteSub addawsAwsjson11_serdeOpDeleteSubscriptionFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_DescribeDestinations.go b/service/cloudwatchlogs/api_op_DescribeDestinations.go index 2f782773230..fec82f0656f 100644 --- a/service/cloudwatchlogs/api_op_DescribeDestinations.go +++ b/service/cloudwatchlogs/api_op_DescribeDestinations.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDestinations(ctx context.Context, params *DescribeDesti addawsAwsjson11_serdeOpDescribeDestinationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_DescribeExportTasks.go b/service/cloudwatchlogs/api_op_DescribeExportTasks.go index 33bdae98ef3..92cb6c0aa08 100644 --- a/service/cloudwatchlogs/api_op_DescribeExportTasks.go +++ b/service/cloudwatchlogs/api_op_DescribeExportTasks.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeExportTasks(ctx context.Context, params *DescribeExport addawsAwsjson11_serdeOpDescribeExportTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_DescribeLogGroups.go b/service/cloudwatchlogs/api_op_DescribeLogGroups.go index 54e5893cc48..643b1379531 100644 --- a/service/cloudwatchlogs/api_op_DescribeLogGroups.go +++ b/service/cloudwatchlogs/api_op_DescribeLogGroups.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeLogGroups(ctx context.Context, params *DescribeLogGroup addawsAwsjson11_serdeOpDescribeLogGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_DescribeLogStreams.go b/service/cloudwatchlogs/api_op_DescribeLogStreams.go index 46bc8efc6dd..3ba77234d83 100644 --- a/service/cloudwatchlogs/api_op_DescribeLogStreams.go +++ b/service/cloudwatchlogs/api_op_DescribeLogStreams.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeLogStreams(ctx context.Context, params *DescribeLogStre addawsAwsjson11_serdeOpDescribeLogStreamsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_DescribeMetricFilters.go b/service/cloudwatchlogs/api_op_DescribeMetricFilters.go index df002c3ac7c..393470c833e 100644 --- a/service/cloudwatchlogs/api_op_DescribeMetricFilters.go +++ b/service/cloudwatchlogs/api_op_DescribeMetricFilters.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeMetricFilters(ctx context.Context, params *DescribeMetr addawsAwsjson11_serdeOpDescribeMetricFiltersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_DescribeQueries.go b/service/cloudwatchlogs/api_op_DescribeQueries.go index 95d10bfa582..6ecbba84c0e 100644 --- a/service/cloudwatchlogs/api_op_DescribeQueries.go +++ b/service/cloudwatchlogs/api_op_DescribeQueries.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeQueries(ctx context.Context, params *DescribeQueriesInp addawsAwsjson11_serdeOpDescribeQueriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_DescribeQueryDefinitions.go b/service/cloudwatchlogs/api_op_DescribeQueryDefinitions.go index 1c016f5828c..5ee3eec8e80 100644 --- a/service/cloudwatchlogs/api_op_DescribeQueryDefinitions.go +++ b/service/cloudwatchlogs/api_op_DescribeQueryDefinitions.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -22,9 +21,9 @@ func (c *Client) DescribeQueryDefinitions(ctx context.Context, params *DescribeQ addawsAwsjson11_serdeOpDescribeQueryDefinitionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_DescribeResourcePolicies.go b/service/cloudwatchlogs/api_op_DescribeResourcePolicies.go index 6deebdb78ad..23377e2f1bf 100644 --- a/service/cloudwatchlogs/api_op_DescribeResourcePolicies.go +++ b/service/cloudwatchlogs/api_op_DescribeResourcePolicies.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeResourcePolicies(ctx context.Context, params *DescribeR addawsAwsjson11_serdeOpDescribeResourcePoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_DescribeSubscriptionFilters.go b/service/cloudwatchlogs/api_op_DescribeSubscriptionFilters.go index 2f675d8a2bf..c01fa33b5fb 100644 --- a/service/cloudwatchlogs/api_op_DescribeSubscriptionFilters.go +++ b/service/cloudwatchlogs/api_op_DescribeSubscriptionFilters.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeSubscriptionFilters(ctx context.Context, params *Descri addawsAwsjson11_serdeOpDescribeSubscriptionFiltersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_DisassociateKmsKey.go b/service/cloudwatchlogs/api_op_DisassociateKmsKey.go index bfcdc5c8a3b..323223a0b32 100644 --- a/service/cloudwatchlogs/api_op_DisassociateKmsKey.go +++ b/service/cloudwatchlogs/api_op_DisassociateKmsKey.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DisassociateKmsKey(ctx context.Context, params *DisassociateKms addawsAwsjson11_serdeOpDisassociateKmsKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_FilterLogEvents.go b/service/cloudwatchlogs/api_op_FilterLogEvents.go index 29fa1757fae..2f8c578b243 100644 --- a/service/cloudwatchlogs/api_op_FilterLogEvents.go +++ b/service/cloudwatchlogs/api_op_FilterLogEvents.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) FilterLogEvents(ctx context.Context, params *FilterLogEventsInp addawsAwsjson11_serdeOpFilterLogEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_GetLogEvents.go b/service/cloudwatchlogs/api_op_GetLogEvents.go index 2487f2900da..250581d3840 100644 --- a/service/cloudwatchlogs/api_op_GetLogEvents.go +++ b/service/cloudwatchlogs/api_op_GetLogEvents.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetLogEvents(ctx context.Context, params *GetLogEventsInput, op addawsAwsjson11_serdeOpGetLogEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_GetLogGroupFields.go b/service/cloudwatchlogs/api_op_GetLogGroupFields.go index 219b819c2b6..f7cc027273e 100644 --- a/service/cloudwatchlogs/api_op_GetLogGroupFields.go +++ b/service/cloudwatchlogs/api_op_GetLogGroupFields.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) GetLogGroupFields(ctx context.Context, params *GetLogGroupField addawsAwsjson11_serdeOpGetLogGroupFieldsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_GetLogRecord.go b/service/cloudwatchlogs/api_op_GetLogRecord.go index 294c90c3326..ac8c804bde8 100644 --- a/service/cloudwatchlogs/api_op_GetLogRecord.go +++ b/service/cloudwatchlogs/api_op_GetLogRecord.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) GetLogRecord(ctx context.Context, params *GetLogRecordInput, op addawsAwsjson11_serdeOpGetLogRecordMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_GetQueryResults.go b/service/cloudwatchlogs/api_op_GetQueryResults.go index 93cdbc497ed..21428c7d423 100644 --- a/service/cloudwatchlogs/api_op_GetQueryResults.go +++ b/service/cloudwatchlogs/api_op_GetQueryResults.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) GetQueryResults(ctx context.Context, params *GetQueryResultsInp addawsAwsjson11_serdeOpGetQueryResultsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_ListTagsLogGroup.go b/service/cloudwatchlogs/api_op_ListTagsLogGroup.go index e48b8e6441b..ecc8de1aeb3 100644 --- a/service/cloudwatchlogs/api_op_ListTagsLogGroup.go +++ b/service/cloudwatchlogs/api_op_ListTagsLogGroup.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsLogGroup(ctx context.Context, params *ListTagsLogGroupI addawsAwsjson11_serdeOpListTagsLogGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_PutDestination.go b/service/cloudwatchlogs/api_op_PutDestination.go index c5904a1e84e..7fef57b6971 100644 --- a/service/cloudwatchlogs/api_op_PutDestination.go +++ b/service/cloudwatchlogs/api_op_PutDestination.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) PutDestination(ctx context.Context, params *PutDestinationInput addawsAwsjson11_serdeOpPutDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_PutDestinationPolicy.go b/service/cloudwatchlogs/api_op_PutDestinationPolicy.go index 298e26ff6d1..be6a61903d4 100644 --- a/service/cloudwatchlogs/api_op_PutDestinationPolicy.go +++ b/service/cloudwatchlogs/api_op_PutDestinationPolicy.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) PutDestinationPolicy(ctx context.Context, params *PutDestinatio addawsAwsjson11_serdeOpPutDestinationPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_PutLogEvents.go b/service/cloudwatchlogs/api_op_PutLogEvents.go index e4438ccb7d2..78a00dc10c5 100644 --- a/service/cloudwatchlogs/api_op_PutLogEvents.go +++ b/service/cloudwatchlogs/api_op_PutLogEvents.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -61,9 +60,9 @@ func (c *Client) PutLogEvents(ctx context.Context, params *PutLogEventsInput, op addawsAwsjson11_serdeOpPutLogEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_PutMetricFilter.go b/service/cloudwatchlogs/api_op_PutMetricFilter.go index b36e9c8dd03..8465a8309ca 100644 --- a/service/cloudwatchlogs/api_op_PutMetricFilter.go +++ b/service/cloudwatchlogs/api_op_PutMetricFilter.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) PutMetricFilter(ctx context.Context, params *PutMetricFilterInp addawsAwsjson11_serdeOpPutMetricFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_PutQueryDefinition.go b/service/cloudwatchlogs/api_op_PutQueryDefinition.go index c262088b6e6..942ef5e7ed1 100644 --- a/service/cloudwatchlogs/api_op_PutQueryDefinition.go +++ b/service/cloudwatchlogs/api_op_PutQueryDefinition.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -21,9 +20,9 @@ func (c *Client) PutQueryDefinition(ctx context.Context, params *PutQueryDefinit addawsAwsjson11_serdeOpPutQueryDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_PutResourcePolicy.go b/service/cloudwatchlogs/api_op_PutResourcePolicy.go index f86c67ca9a6..9654ec64192 100644 --- a/service/cloudwatchlogs/api_op_PutResourcePolicy.go +++ b/service/cloudwatchlogs/api_op_PutResourcePolicy.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) PutResourcePolicy(ctx context.Context, params *PutResourcePolic addawsAwsjson11_serdeOpPutResourcePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_PutRetentionPolicy.go b/service/cloudwatchlogs/api_op_PutRetentionPolicy.go index 3bb92b43522..0fe61dbb99e 100644 --- a/service/cloudwatchlogs/api_op_PutRetentionPolicy.go +++ b/service/cloudwatchlogs/api_op_PutRetentionPolicy.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) PutRetentionPolicy(ctx context.Context, params *PutRetentionPol addawsAwsjson11_serdeOpPutRetentionPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_PutSubscriptionFilter.go b/service/cloudwatchlogs/api_op_PutSubscriptionFilter.go index 58ebd72eaeb..519794127e8 100644 --- a/service/cloudwatchlogs/api_op_PutSubscriptionFilter.go +++ b/service/cloudwatchlogs/api_op_PutSubscriptionFilter.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) PutSubscriptionFilter(ctx context.Context, params *PutSubscript addawsAwsjson11_serdeOpPutSubscriptionFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_StartQuery.go b/service/cloudwatchlogs/api_op_StartQuery.go index 955aa785e2d..6a1ab43853f 100644 --- a/service/cloudwatchlogs/api_op_StartQuery.go +++ b/service/cloudwatchlogs/api_op_StartQuery.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) StartQuery(ctx context.Context, params *StartQueryInput, optFns addawsAwsjson11_serdeOpStartQueryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_StopQuery.go b/service/cloudwatchlogs/api_op_StopQuery.go index 54900840805..a9908a407b4 100644 --- a/service/cloudwatchlogs/api_op_StopQuery.go +++ b/service/cloudwatchlogs/api_op_StopQuery.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) StopQuery(ctx context.Context, params *StopQueryInput, optFns . addawsAwsjson11_serdeOpStopQueryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_TagLogGroup.go b/service/cloudwatchlogs/api_op_TagLogGroup.go index 012e8cae9e4..005a8801b03 100644 --- a/service/cloudwatchlogs/api_op_TagLogGroup.go +++ b/service/cloudwatchlogs/api_op_TagLogGroup.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) TagLogGroup(ctx context.Context, params *TagLogGroupInput, optF addawsAwsjson11_serdeOpTagLogGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_TestMetricFilter.go b/service/cloudwatchlogs/api_op_TestMetricFilter.go index afe4c43799b..ec4481b25bd 100644 --- a/service/cloudwatchlogs/api_op_TestMetricFilter.go +++ b/service/cloudwatchlogs/api_op_TestMetricFilter.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) TestMetricFilter(ctx context.Context, params *TestMetricFilterI addawsAwsjson11_serdeOpTestMetricFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/api_op_UntagLogGroup.go b/service/cloudwatchlogs/api_op_UntagLogGroup.go index 94875066c8d..6022c3efe35 100644 --- a/service/cloudwatchlogs/api_op_UntagLogGroup.go +++ b/service/cloudwatchlogs/api_op_UntagLogGroup.go @@ -5,7 +5,6 @@ package cloudwatchlogs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) UntagLogGroup(ctx context.Context, params *UntagLogGroupInput, addawsAwsjson11_serdeOpUntagLogGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cloudwatchlogs/endpoints.go b/service/cloudwatchlogs/endpoints.go index 8466bd23a4b..f0f66a46f05 100644 --- a/service/cloudwatchlogs/endpoints.go +++ b/service/cloudwatchlogs/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/codeartifact/api_client.go b/service/codeartifact/api_client.go index 0d4ef4e2c2f..3171115d399 100644 --- a/service/codeartifact/api_client.go +++ b/service/codeartifact/api_client.go @@ -196,30 +196,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -285,6 +261,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/codeartifact/api_op_AssociateExternalConnection.go b/service/codeartifact/api_op_AssociateExternalConnection.go index 2388dadbeb1..166ba758158 100644 --- a/service/codeartifact/api_op_AssociateExternalConnection.go +++ b/service/codeartifact/api_op_AssociateExternalConnection.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) AssociateExternalConnection(ctx context.Context, params *Associ addawsRestjson1_serdeOpAssociateExternalConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_CopyPackageVersions.go b/service/codeartifact/api_op_CopyPackageVersions.go index 23db5983477..5aeb4cadb4f 100644 --- a/service/codeartifact/api_op_CopyPackageVersions.go +++ b/service/codeartifact/api_op_CopyPackageVersions.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CopyPackageVersions(ctx context.Context, params *CopyPackageVer addawsRestjson1_serdeOpCopyPackageVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_CreateDomain.go b/service/codeartifact/api_op_CreateDomain.go index a79b4fd981a..fb43e0587a0 100644 --- a/service/codeartifact/api_op_CreateDomain.go +++ b/service/codeartifact/api_op_CreateDomain.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateDomain(ctx context.Context, params *CreateDomainInput, op addawsRestjson1_serdeOpCreateDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_CreateRepository.go b/service/codeartifact/api_op_CreateRepository.go index 4f86f603820..67d98a7871d 100644 --- a/service/codeartifact/api_op_CreateRepository.go +++ b/service/codeartifact/api_op_CreateRepository.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateRepository(ctx context.Context, params *CreateRepositoryI addawsRestjson1_serdeOpCreateRepositoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_DeleteDomain.go b/service/codeartifact/api_op_DeleteDomain.go index 0e69a18f29d..2c05d2f04a7 100644 --- a/service/codeartifact/api_op_DeleteDomain.go +++ b/service/codeartifact/api_op_DeleteDomain.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteDomain(ctx context.Context, params *DeleteDomainInput, op addawsRestjson1_serdeOpDeleteDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_DeleteDomainPermissionsPolicy.go b/service/codeartifact/api_op_DeleteDomainPermissionsPolicy.go index 00c0dc4fce9..0766d6b3b25 100644 --- a/service/codeartifact/api_op_DeleteDomainPermissionsPolicy.go +++ b/service/codeartifact/api_op_DeleteDomainPermissionsPolicy.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteDomainPermissionsPolicy(ctx context.Context, params *Dele addawsRestjson1_serdeOpDeleteDomainPermissionsPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_DeletePackageVersions.go b/service/codeartifact/api_op_DeletePackageVersions.go index 3967f3f54e5..20d44cc7c17 100644 --- a/service/codeartifact/api_op_DeletePackageVersions.go +++ b/service/codeartifact/api_op_DeletePackageVersions.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DeletePackageVersions(ctx context.Context, params *DeletePackag addawsRestjson1_serdeOpDeletePackageVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_DeleteRepository.go b/service/codeartifact/api_op_DeleteRepository.go index f2eb4ae111c..e88ec0a8792 100644 --- a/service/codeartifact/api_op_DeleteRepository.go +++ b/service/codeartifact/api_op_DeleteRepository.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteRepository(ctx context.Context, params *DeleteRepositoryI addawsRestjson1_serdeOpDeleteRepositoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_DeleteRepositoryPermissionsPolicy.go b/service/codeartifact/api_op_DeleteRepositoryPermissionsPolicy.go index 5d4fa767e7a..da750b61276 100644 --- a/service/codeartifact/api_op_DeleteRepositoryPermissionsPolicy.go +++ b/service/codeartifact/api_op_DeleteRepositoryPermissionsPolicy.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DeleteRepositoryPermissionsPolicy(ctx context.Context, params * addawsRestjson1_serdeOpDeleteRepositoryPermissionsPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_DescribeDomain.go b/service/codeartifact/api_op_DescribeDomain.go index ea4d82dc3d2..d6f966dd57a 100644 --- a/service/codeartifact/api_op_DescribeDomain.go +++ b/service/codeartifact/api_op_DescribeDomain.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeDomain(ctx context.Context, params *DescribeDomainInput addawsRestjson1_serdeOpDescribeDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_DescribePackageVersion.go b/service/codeartifact/api_op_DescribePackageVersion.go index 4eaead2dbf1..8b46061b7dc 100644 --- a/service/codeartifact/api_op_DescribePackageVersion.go +++ b/service/codeartifact/api_op_DescribePackageVersion.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribePackageVersion(ctx context.Context, params *DescribePac addawsRestjson1_serdeOpDescribePackageVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_DescribeRepository.go b/service/codeartifact/api_op_DescribeRepository.go index db78f58a4e2..c0c864ceeb6 100644 --- a/service/codeartifact/api_op_DescribeRepository.go +++ b/service/codeartifact/api_op_DescribeRepository.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeRepository(ctx context.Context, params *DescribeReposit addawsRestjson1_serdeOpDescribeRepositoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_DisassociateExternalConnection.go b/service/codeartifact/api_op_DisassociateExternalConnection.go index 3fdc5c39f92..4d12d2fb048 100644 --- a/service/codeartifact/api_op_DisassociateExternalConnection.go +++ b/service/codeartifact/api_op_DisassociateExternalConnection.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DisassociateExternalConnection(ctx context.Context, params *Dis addawsRestjson1_serdeOpDisassociateExternalConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_DisposePackageVersions.go b/service/codeartifact/api_op_DisposePackageVersions.go index b93d5bfe3e2..1f7809b7c15 100644 --- a/service/codeartifact/api_op_DisposePackageVersions.go +++ b/service/codeartifact/api_op_DisposePackageVersions.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) DisposePackageVersions(ctx context.Context, params *DisposePack addawsRestjson1_serdeOpDisposePackageVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_GetAuthorizationToken.go b/service/codeartifact/api_op_GetAuthorizationToken.go index 3f8c076e709..58e10f2b757 100644 --- a/service/codeartifact/api_op_GetAuthorizationToken.go +++ b/service/codeartifact/api_op_GetAuthorizationToken.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -38,9 +37,9 @@ func (c *Client) GetAuthorizationToken(ctx context.Context, params *GetAuthoriza addawsRestjson1_serdeOpGetAuthorizationTokenMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_GetDomainPermissionsPolicy.go b/service/codeartifact/api_op_GetDomainPermissionsPolicy.go index df7867f9fae..187960a0c50 100644 --- a/service/codeartifact/api_op_GetDomainPermissionsPolicy.go +++ b/service/codeartifact/api_op_GetDomainPermissionsPolicy.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetDomainPermissionsPolicy(ctx context.Context, params *GetDoma addawsRestjson1_serdeOpGetDomainPermissionsPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_GetPackageVersionAsset.go b/service/codeartifact/api_op_GetPackageVersionAsset.go index 475bf24194f..902a2f07946 100644 --- a/service/codeartifact/api_op_GetPackageVersionAsset.go +++ b/service/codeartifact/api_op_GetPackageVersionAsset.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetPackageVersionAsset(ctx context.Context, params *GetPackageV addawsRestjson1_serdeOpGetPackageVersionAssetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_GetPackageVersionReadme.go b/service/codeartifact/api_op_GetPackageVersionReadme.go index 53081302476..9387fc5a0fc 100644 --- a/service/codeartifact/api_op_GetPackageVersionReadme.go +++ b/service/codeartifact/api_op_GetPackageVersionReadme.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetPackageVersionReadme(ctx context.Context, params *GetPackage addawsRestjson1_serdeOpGetPackageVersionReadmeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_GetRepositoryEndpoint.go b/service/codeartifact/api_op_GetRepositoryEndpoint.go index 00679d6137f..074430c9f15 100644 --- a/service/codeartifact/api_op_GetRepositoryEndpoint.go +++ b/service/codeartifact/api_op_GetRepositoryEndpoint.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetRepositoryEndpoint(ctx context.Context, params *GetRepositor addawsRestjson1_serdeOpGetRepositoryEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_GetRepositoryPermissionsPolicy.go b/service/codeartifact/api_op_GetRepositoryPermissionsPolicy.go index 573e8afc7be..0516123c49d 100644 --- a/service/codeartifact/api_op_GetRepositoryPermissionsPolicy.go +++ b/service/codeartifact/api_op_GetRepositoryPermissionsPolicy.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetRepositoryPermissionsPolicy(ctx context.Context, params *Get addawsRestjson1_serdeOpGetRepositoryPermissionsPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_ListDomains.go b/service/codeartifact/api_op_ListDomains.go index 2b8a79863a1..efdc6a3ed77 100644 --- a/service/codeartifact/api_op_ListDomains.go +++ b/service/codeartifact/api_op_ListDomains.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListDomains(ctx context.Context, params *ListDomainsInput, optF addawsRestjson1_serdeOpListDomainsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_ListPackageVersionAssets.go b/service/codeartifact/api_op_ListPackageVersionAssets.go index cf77355de83..09f64b7689e 100644 --- a/service/codeartifact/api_op_ListPackageVersionAssets.go +++ b/service/codeartifact/api_op_ListPackageVersionAssets.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListPackageVersionAssets(ctx context.Context, params *ListPacka addawsRestjson1_serdeOpListPackageVersionAssetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_ListPackageVersionDependencies.go b/service/codeartifact/api_op_ListPackageVersionDependencies.go index 748874762c9..535eb0ffd6d 100644 --- a/service/codeartifact/api_op_ListPackageVersionDependencies.go +++ b/service/codeartifact/api_op_ListPackageVersionDependencies.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListPackageVersionDependencies(ctx context.Context, params *Lis addawsRestjson1_serdeOpListPackageVersionDependenciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_ListPackageVersions.go b/service/codeartifact/api_op_ListPackageVersions.go index d92e939476e..5ea6720e153 100644 --- a/service/codeartifact/api_op_ListPackageVersions.go +++ b/service/codeartifact/api_op_ListPackageVersions.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListPackageVersions(ctx context.Context, params *ListPackageVer addawsRestjson1_serdeOpListPackageVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_ListPackages.go b/service/codeartifact/api_op_ListPackages.go index db73554387b..8df111e5da1 100644 --- a/service/codeartifact/api_op_ListPackages.go +++ b/service/codeartifact/api_op_ListPackages.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListPackages(ctx context.Context, params *ListPackagesInput, op addawsRestjson1_serdeOpListPackagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_ListRepositories.go b/service/codeartifact/api_op_ListRepositories.go index 88e5a205b25..4dbb3d7fe92 100644 --- a/service/codeartifact/api_op_ListRepositories.go +++ b/service/codeartifact/api_op_ListRepositories.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListRepositories(ctx context.Context, params *ListRepositoriesI addawsRestjson1_serdeOpListRepositoriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_ListRepositoriesInDomain.go b/service/codeartifact/api_op_ListRepositoriesInDomain.go index 1367b8ad5a3..b2ef27da8d0 100644 --- a/service/codeartifact/api_op_ListRepositoriesInDomain.go +++ b/service/codeartifact/api_op_ListRepositoriesInDomain.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListRepositoriesInDomain(ctx context.Context, params *ListRepos addawsRestjson1_serdeOpListRepositoriesInDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_PutDomainPermissionsPolicy.go b/service/codeartifact/api_op_PutDomainPermissionsPolicy.go index 1cf2ef6d096..beb17281851 100644 --- a/service/codeartifact/api_op_PutDomainPermissionsPolicy.go +++ b/service/codeartifact/api_op_PutDomainPermissionsPolicy.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutDomainPermissionsPolicy(ctx context.Context, params *PutDoma addawsRestjson1_serdeOpPutDomainPermissionsPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_PutRepositoryPermissionsPolicy.go b/service/codeartifact/api_op_PutRepositoryPermissionsPolicy.go index 44fd6a0965b..a62da969df2 100644 --- a/service/codeartifact/api_op_PutRepositoryPermissionsPolicy.go +++ b/service/codeartifact/api_op_PutRepositoryPermissionsPolicy.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutRepositoryPermissionsPolicy(ctx context.Context, params *Put addawsRestjson1_serdeOpPutRepositoryPermissionsPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_UpdatePackageVersionsStatus.go b/service/codeartifact/api_op_UpdatePackageVersionsStatus.go index 1446a9814de..fc5fa197c35 100644 --- a/service/codeartifact/api_op_UpdatePackageVersionsStatus.go +++ b/service/codeartifact/api_op_UpdatePackageVersionsStatus.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdatePackageVersionsStatus(ctx context.Context, params *Update addawsRestjson1_serdeOpUpdatePackageVersionsStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/api_op_UpdateRepository.go b/service/codeartifact/api_op_UpdateRepository.go index ca50770921c..3e7368b80c5 100644 --- a/service/codeartifact/api_op_UpdateRepository.go +++ b/service/codeartifact/api_op_UpdateRepository.go @@ -5,7 +5,6 @@ package codeartifact import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeartifact/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateRepository(ctx context.Context, params *UpdateRepositoryI addawsRestjson1_serdeOpUpdateRepositoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeartifact/endpoints.go b/service/codeartifact/endpoints.go index 5d6f483906f..fe83a575395 100644 --- a/service/codeartifact/endpoints.go +++ b/service/codeartifact/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/codebuild/api_client.go b/service/codebuild/api_client.go index d1e46643c40..e07bd861539 100644 --- a/service/codebuild/api_client.go +++ b/service/codebuild/api_client.go @@ -203,30 +203,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -292,6 +268,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/codebuild/api_op_BatchDeleteBuilds.go b/service/codebuild/api_op_BatchDeleteBuilds.go index e0eb6663a6a..78042d9f377 100644 --- a/service/codebuild/api_op_BatchDeleteBuilds.go +++ b/service/codebuild/api_op_BatchDeleteBuilds.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchDeleteBuilds(ctx context.Context, params *BatchDeleteBuild addawsAwsjson11_serdeOpBatchDeleteBuildsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_BatchGetBuildBatches.go b/service/codebuild/api_op_BatchGetBuildBatches.go index 57021221034..9ef31b0335f 100644 --- a/service/codebuild/api_op_BatchGetBuildBatches.go +++ b/service/codebuild/api_op_BatchGetBuildBatches.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchGetBuildBatches(ctx context.Context, params *BatchGetBuild addawsAwsjson11_serdeOpBatchGetBuildBatchesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_BatchGetBuilds.go b/service/codebuild/api_op_BatchGetBuilds.go index aa99ef4af74..5dfe1cd2c19 100644 --- a/service/codebuild/api_op_BatchGetBuilds.go +++ b/service/codebuild/api_op_BatchGetBuilds.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchGetBuilds(ctx context.Context, params *BatchGetBuildsInput addawsAwsjson11_serdeOpBatchGetBuildsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_BatchGetProjects.go b/service/codebuild/api_op_BatchGetProjects.go index 7f8685e63bc..aadc826ca4d 100644 --- a/service/codebuild/api_op_BatchGetProjects.go +++ b/service/codebuild/api_op_BatchGetProjects.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchGetProjects(ctx context.Context, params *BatchGetProjectsI addawsAwsjson11_serdeOpBatchGetProjectsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_BatchGetReportGroups.go b/service/codebuild/api_op_BatchGetReportGroups.go index 76718b228f9..a3f41d14d34 100644 --- a/service/codebuild/api_op_BatchGetReportGroups.go +++ b/service/codebuild/api_op_BatchGetReportGroups.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchGetReportGroups(ctx context.Context, params *BatchGetRepor addawsAwsjson11_serdeOpBatchGetReportGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_BatchGetReports.go b/service/codebuild/api_op_BatchGetReports.go index b343eb6159d..8461bb6f1a6 100644 --- a/service/codebuild/api_op_BatchGetReports.go +++ b/service/codebuild/api_op_BatchGetReports.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchGetReports(ctx context.Context, params *BatchGetReportsInp addawsAwsjson11_serdeOpBatchGetReportsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_CreateProject.go b/service/codebuild/api_op_CreateProject.go index 397f91695d4..ddc9f44b4e2 100644 --- a/service/codebuild/api_op_CreateProject.go +++ b/service/codebuild/api_op_CreateProject.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateProject(ctx context.Context, params *CreateProjectInput, addawsAwsjson11_serdeOpCreateProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_CreateReportGroup.go b/service/codebuild/api_op_CreateReportGroup.go index 96ad10c235c..9b3d02f84c5 100644 --- a/service/codebuild/api_op_CreateReportGroup.go +++ b/service/codebuild/api_op_CreateReportGroup.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateReportGroup(ctx context.Context, params *CreateReportGrou addawsAwsjson11_serdeOpCreateReportGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_CreateWebhook.go b/service/codebuild/api_op_CreateWebhook.go index f7feeef10c9..2708ce1bd12 100644 --- a/service/codebuild/api_op_CreateWebhook.go +++ b/service/codebuild/api_op_CreateWebhook.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) CreateWebhook(ctx context.Context, params *CreateWebhookInput, addawsAwsjson11_serdeOpCreateWebhookMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_DeleteBuildBatch.go b/service/codebuild/api_op_DeleteBuildBatch.go index 6ce2df1b1d9..6588ce9b6a7 100644 --- a/service/codebuild/api_op_DeleteBuildBatch.go +++ b/service/codebuild/api_op_DeleteBuildBatch.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteBuildBatch(ctx context.Context, params *DeleteBuildBatchI addawsAwsjson11_serdeOpDeleteBuildBatchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_DeleteProject.go b/service/codebuild/api_op_DeleteProject.go index 3b25a3aab71..de5b5227df3 100644 --- a/service/codebuild/api_op_DeleteProject.go +++ b/service/codebuild/api_op_DeleteProject.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteProject(ctx context.Context, params *DeleteProjectInput, addawsAwsjson11_serdeOpDeleteProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_DeleteReport.go b/service/codebuild/api_op_DeleteReport.go index f64a4fc4384..0e604974db2 100644 --- a/service/codebuild/api_op_DeleteReport.go +++ b/service/codebuild/api_op_DeleteReport.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteReport(ctx context.Context, params *DeleteReportInput, op addawsAwsjson11_serdeOpDeleteReportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_DeleteReportGroup.go b/service/codebuild/api_op_DeleteReportGroup.go index 4373a306d2e..74f46442bfa 100644 --- a/service/codebuild/api_op_DeleteReportGroup.go +++ b/service/codebuild/api_op_DeleteReportGroup.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeleteReportGroup(ctx context.Context, params *DeleteReportGrou addawsAwsjson11_serdeOpDeleteReportGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_DeleteResourcePolicy.go b/service/codebuild/api_op_DeleteResourcePolicy.go index e35f85a55ad..25e89577a43 100644 --- a/service/codebuild/api_op_DeleteResourcePolicy.go +++ b/service/codebuild/api_op_DeleteResourcePolicy.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteResourcePolicy(ctx context.Context, params *DeleteResourc addawsAwsjson11_serdeOpDeleteResourcePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_DeleteSourceCredentials.go b/service/codebuild/api_op_DeleteSourceCredentials.go index 776f0497ef1..b08ef3f9594 100644 --- a/service/codebuild/api_op_DeleteSourceCredentials.go +++ b/service/codebuild/api_op_DeleteSourceCredentials.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSourceCredentials(ctx context.Context, params *DeleteSour addawsAwsjson11_serdeOpDeleteSourceCredentialsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_DeleteWebhook.go b/service/codebuild/api_op_DeleteWebhook.go index 1b6c056acfe..db71730d18a 100644 --- a/service/codebuild/api_op_DeleteWebhook.go +++ b/service/codebuild/api_op_DeleteWebhook.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteWebhook(ctx context.Context, params *DeleteWebhookInput, addawsAwsjson11_serdeOpDeleteWebhookMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_DescribeCodeCoverages.go b/service/codebuild/api_op_DescribeCodeCoverages.go index 0d93cc4fc7f..efa6c51f3a6 100644 --- a/service/codebuild/api_op_DescribeCodeCoverages.go +++ b/service/codebuild/api_op_DescribeCodeCoverages.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeCodeCoverages(ctx context.Context, params *DescribeCode addawsAwsjson11_serdeOpDescribeCodeCoveragesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_DescribeTestCases.go b/service/codebuild/api_op_DescribeTestCases.go index 7c31253ba59..019f98d74d1 100644 --- a/service/codebuild/api_op_DescribeTestCases.go +++ b/service/codebuild/api_op_DescribeTestCases.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeTestCases(ctx context.Context, params *DescribeTestCase addawsAwsjson11_serdeOpDescribeTestCasesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_GetResourcePolicy.go b/service/codebuild/api_op_GetResourcePolicy.go index b7de5a18bfb..dc7d6f9c19c 100644 --- a/service/codebuild/api_op_GetResourcePolicy.go +++ b/service/codebuild/api_op_GetResourcePolicy.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetResourcePolicy(ctx context.Context, params *GetResourcePolic addawsAwsjson11_serdeOpGetResourcePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_ImportSourceCredentials.go b/service/codebuild/api_op_ImportSourceCredentials.go index b9b2d23fef9..8d7d8544e13 100644 --- a/service/codebuild/api_op_ImportSourceCredentials.go +++ b/service/codebuild/api_op_ImportSourceCredentials.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ImportSourceCredentials(ctx context.Context, params *ImportSour addawsAwsjson11_serdeOpImportSourceCredentialsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_InvalidateProjectCache.go b/service/codebuild/api_op_InvalidateProjectCache.go index 499e1f8e44d..7e4cd1ac09f 100644 --- a/service/codebuild/api_op_InvalidateProjectCache.go +++ b/service/codebuild/api_op_InvalidateProjectCache.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) InvalidateProjectCache(ctx context.Context, params *InvalidateP addawsAwsjson11_serdeOpInvalidateProjectCacheMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_ListBuildBatches.go b/service/codebuild/api_op_ListBuildBatches.go index 5d0cb3f57d0..1b18942e4c2 100644 --- a/service/codebuild/api_op_ListBuildBatches.go +++ b/service/codebuild/api_op_ListBuildBatches.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListBuildBatches(ctx context.Context, params *ListBuildBatchesI addawsAwsjson11_serdeOpListBuildBatchesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_ListBuildBatchesForProject.go b/service/codebuild/api_op_ListBuildBatchesForProject.go index 42625f3d865..e1f619e5d37 100644 --- a/service/codebuild/api_op_ListBuildBatchesForProject.go +++ b/service/codebuild/api_op_ListBuildBatchesForProject.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListBuildBatchesForProject(ctx context.Context, params *ListBui addawsAwsjson11_serdeOpListBuildBatchesForProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_ListBuilds.go b/service/codebuild/api_op_ListBuilds.go index 7053f0e706b..f59281e88ac 100644 --- a/service/codebuild/api_op_ListBuilds.go +++ b/service/codebuild/api_op_ListBuilds.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListBuilds(ctx context.Context, params *ListBuildsInput, optFns addawsAwsjson11_serdeOpListBuildsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_ListBuildsForProject.go b/service/codebuild/api_op_ListBuildsForProject.go index 39ba9bb69ff..d85e8a2775e 100644 --- a/service/codebuild/api_op_ListBuildsForProject.go +++ b/service/codebuild/api_op_ListBuildsForProject.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListBuildsForProject(ctx context.Context, params *ListBuildsFor addawsAwsjson11_serdeOpListBuildsForProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_ListCuratedEnvironmentImages.go b/service/codebuild/api_op_ListCuratedEnvironmentImages.go index a29aa2cce76..4605be11376 100644 --- a/service/codebuild/api_op_ListCuratedEnvironmentImages.go +++ b/service/codebuild/api_op_ListCuratedEnvironmentImages.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListCuratedEnvironmentImages(ctx context.Context, params *ListC addawsAwsjson11_serdeOpListCuratedEnvironmentImagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_ListProjects.go b/service/codebuild/api_op_ListProjects.go index d6695a0eb37..7916bea173d 100644 --- a/service/codebuild/api_op_ListProjects.go +++ b/service/codebuild/api_op_ListProjects.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListProjects(ctx context.Context, params *ListProjectsInput, op addawsAwsjson11_serdeOpListProjectsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_ListReportGroups.go b/service/codebuild/api_op_ListReportGroups.go index d57841a83c0..a54a77c6484 100644 --- a/service/codebuild/api_op_ListReportGroups.go +++ b/service/codebuild/api_op_ListReportGroups.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListReportGroups(ctx context.Context, params *ListReportGroupsI addawsAwsjson11_serdeOpListReportGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_ListReports.go b/service/codebuild/api_op_ListReports.go index 27aad533dbd..2782cf34b12 100644 --- a/service/codebuild/api_op_ListReports.go +++ b/service/codebuild/api_op_ListReports.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListReports(ctx context.Context, params *ListReportsInput, optF addawsAwsjson11_serdeOpListReportsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_ListReportsForReportGroup.go b/service/codebuild/api_op_ListReportsForReportGroup.go index 51cfca9126b..4cad13c0bf9 100644 --- a/service/codebuild/api_op_ListReportsForReportGroup.go +++ b/service/codebuild/api_op_ListReportsForReportGroup.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListReportsForReportGroup(ctx context.Context, params *ListRepo addawsAwsjson11_serdeOpListReportsForReportGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_ListSharedProjects.go b/service/codebuild/api_op_ListSharedProjects.go index aed10539cdc..38202db110c 100644 --- a/service/codebuild/api_op_ListSharedProjects.go +++ b/service/codebuild/api_op_ListSharedProjects.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListSharedProjects(ctx context.Context, params *ListSharedProje addawsAwsjson11_serdeOpListSharedProjectsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_ListSharedReportGroups.go b/service/codebuild/api_op_ListSharedReportGroups.go index 327ba5e9d00..f2c07a7e076 100644 --- a/service/codebuild/api_op_ListSharedReportGroups.go +++ b/service/codebuild/api_op_ListSharedReportGroups.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListSharedReportGroups(ctx context.Context, params *ListSharedR addawsAwsjson11_serdeOpListSharedReportGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_ListSourceCredentials.go b/service/codebuild/api_op_ListSourceCredentials.go index 4ee1d260745..0c9bf59dbfa 100644 --- a/service/codebuild/api_op_ListSourceCredentials.go +++ b/service/codebuild/api_op_ListSourceCredentials.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListSourceCredentials(ctx context.Context, params *ListSourceCr addawsAwsjson11_serdeOpListSourceCredentialsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_PutResourcePolicy.go b/service/codebuild/api_op_PutResourcePolicy.go index bf5a94ca8ab..eece73fff58 100644 --- a/service/codebuild/api_op_PutResourcePolicy.go +++ b/service/codebuild/api_op_PutResourcePolicy.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) PutResourcePolicy(ctx context.Context, params *PutResourcePolic addawsAwsjson11_serdeOpPutResourcePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_RetryBuild.go b/service/codebuild/api_op_RetryBuild.go index 2024efdd2f8..1bec1b26c6c 100644 --- a/service/codebuild/api_op_RetryBuild.go +++ b/service/codebuild/api_op_RetryBuild.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RetryBuild(ctx context.Context, params *RetryBuildInput, optFns addawsAwsjson11_serdeOpRetryBuildMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_RetryBuildBatch.go b/service/codebuild/api_op_RetryBuildBatch.go index c926512560d..bccf9d52b9c 100644 --- a/service/codebuild/api_op_RetryBuildBatch.go +++ b/service/codebuild/api_op_RetryBuildBatch.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RetryBuildBatch(ctx context.Context, params *RetryBuildBatchInp addawsAwsjson11_serdeOpRetryBuildBatchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_StartBuild.go b/service/codebuild/api_op_StartBuild.go index e6e1be2c073..0e907b2b6b4 100644 --- a/service/codebuild/api_op_StartBuild.go +++ b/service/codebuild/api_op_StartBuild.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StartBuild(ctx context.Context, params *StartBuildInput, optFns addawsAwsjson11_serdeOpStartBuildMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_StartBuildBatch.go b/service/codebuild/api_op_StartBuildBatch.go index 421fbd1ef9f..a5dda8d4013 100644 --- a/service/codebuild/api_op_StartBuildBatch.go +++ b/service/codebuild/api_op_StartBuildBatch.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StartBuildBatch(ctx context.Context, params *StartBuildBatchInp addawsAwsjson11_serdeOpStartBuildBatchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_StopBuild.go b/service/codebuild/api_op_StopBuild.go index 230496cb179..802ac011a94 100644 --- a/service/codebuild/api_op_StopBuild.go +++ b/service/codebuild/api_op_StopBuild.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StopBuild(ctx context.Context, params *StopBuildInput, optFns . addawsAwsjson11_serdeOpStopBuildMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_StopBuildBatch.go b/service/codebuild/api_op_StopBuildBatch.go index 6afa5d13324..5874542557c 100644 --- a/service/codebuild/api_op_StopBuildBatch.go +++ b/service/codebuild/api_op_StopBuildBatch.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StopBuildBatch(ctx context.Context, params *StopBuildBatchInput addawsAwsjson11_serdeOpStopBuildBatchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_UpdateProject.go b/service/codebuild/api_op_UpdateProject.go index 08cb1e24036..e5014f595a8 100644 --- a/service/codebuild/api_op_UpdateProject.go +++ b/service/codebuild/api_op_UpdateProject.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateProject(ctx context.Context, params *UpdateProjectInput, addawsAwsjson11_serdeOpUpdateProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_UpdateReportGroup.go b/service/codebuild/api_op_UpdateReportGroup.go index 14b7e12f9dd..a45a0691191 100644 --- a/service/codebuild/api_op_UpdateReportGroup.go +++ b/service/codebuild/api_op_UpdateReportGroup.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateReportGroup(ctx context.Context, params *UpdateReportGrou addawsAwsjson11_serdeOpUpdateReportGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/api_op_UpdateWebhook.go b/service/codebuild/api_op_UpdateWebhook.go index ed25267978a..b2fc417580b 100644 --- a/service/codebuild/api_op_UpdateWebhook.go +++ b/service/codebuild/api_op_UpdateWebhook.go @@ -5,7 +5,6 @@ package codebuild import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codebuild/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateWebhook(ctx context.Context, params *UpdateWebhookInput, addawsAwsjson11_serdeOpUpdateWebhookMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codebuild/endpoints.go b/service/codebuild/endpoints.go index 3aeab5f64f6..37f96026598 100644 --- a/service/codebuild/endpoints.go +++ b/service/codebuild/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/codecommit/api_client.go b/service/codecommit/api_client.go index c5b24172b14..a7f05ae0d66 100644 --- a/service/codecommit/api_client.go +++ b/service/codecommit/api_client.go @@ -241,34 +241,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -341,6 +313,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/codecommit/api_op_AssociateApprovalRuleTemplateWithRepository.go b/service/codecommit/api_op_AssociateApprovalRuleTemplateWithRepository.go index f1aef1f4a4d..ad4c298250b 100644 --- a/service/codecommit/api_op_AssociateApprovalRuleTemplateWithRepository.go +++ b/service/codecommit/api_op_AssociateApprovalRuleTemplateWithRepository.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) AssociateApprovalRuleTemplateWithRepository(ctx context.Context addawsAwsjson11_serdeOpAssociateApprovalRuleTemplateWithRepositoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_BatchAssociateApprovalRuleTemplateWithRepositories.go b/service/codecommit/api_op_BatchAssociateApprovalRuleTemplateWithRepositories.go index d3f203840b0..bf0df9c716d 100644 --- a/service/codecommit/api_op_BatchAssociateApprovalRuleTemplateWithRepositories.go +++ b/service/codecommit/api_op_BatchAssociateApprovalRuleTemplateWithRepositories.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) BatchAssociateApprovalRuleTemplateWithRepositories(ctx context. addawsAwsjson11_serdeOpBatchAssociateApprovalRuleTemplateWithRepositoriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_BatchDescribeMergeConflicts.go b/service/codecommit/api_op_BatchDescribeMergeConflicts.go index 32b219e5572..321dee66293 100644 --- a/service/codecommit/api_op_BatchDescribeMergeConflicts.go +++ b/service/codecommit/api_op_BatchDescribeMergeConflicts.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) BatchDescribeMergeConflicts(ctx context.Context, params *BatchD addawsAwsjson11_serdeOpBatchDescribeMergeConflictsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_BatchDisassociateApprovalRuleTemplateFromRepositories.go b/service/codecommit/api_op_BatchDisassociateApprovalRuleTemplateFromRepositories.go index bf16adf119f..f44fb90ab84 100644 --- a/service/codecommit/api_op_BatchDisassociateApprovalRuleTemplateFromRepositories.go +++ b/service/codecommit/api_op_BatchDisassociateApprovalRuleTemplateFromRepositories.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) BatchDisassociateApprovalRuleTemplateFromRepositories(ctx conte addawsAwsjson11_serdeOpBatchDisassociateApprovalRuleTemplateFromRepositoriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_BatchGetCommits.go b/service/codecommit/api_op_BatchGetCommits.go index 535a4f02237..df7ccf061b3 100644 --- a/service/codecommit/api_op_BatchGetCommits.go +++ b/service/codecommit/api_op_BatchGetCommits.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchGetCommits(ctx context.Context, params *BatchGetCommitsInp addawsAwsjson11_serdeOpBatchGetCommitsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_BatchGetRepositories.go b/service/codecommit/api_op_BatchGetRepositories.go index cebf08961e4..c4dfa63d9b2 100644 --- a/service/codecommit/api_op_BatchGetRepositories.go +++ b/service/codecommit/api_op_BatchGetRepositories.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) BatchGetRepositories(ctx context.Context, params *BatchGetRepos addawsAwsjson11_serdeOpBatchGetRepositoriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_CreateApprovalRuleTemplate.go b/service/codecommit/api_op_CreateApprovalRuleTemplate.go index 24cf98f838b..3952c99969f 100644 --- a/service/codecommit/api_op_CreateApprovalRuleTemplate.go +++ b/service/codecommit/api_op_CreateApprovalRuleTemplate.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateApprovalRuleTemplate(ctx context.Context, params *CreateA addawsAwsjson11_serdeOpCreateApprovalRuleTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_CreateBranch.go b/service/codecommit/api_op_CreateBranch.go index e2bc8c98a29..27dd661a692 100644 --- a/service/codecommit/api_op_CreateBranch.go +++ b/service/codecommit/api_op_CreateBranch.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CreateBranch(ctx context.Context, params *CreateBranchInput, op addawsAwsjson11_serdeOpCreateBranchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_CreateCommit.go b/service/codecommit/api_op_CreateCommit.go index 122020a2ef2..3e0fa07be16 100644 --- a/service/codecommit/api_op_CreateCommit.go +++ b/service/codecommit/api_op_CreateCommit.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateCommit(ctx context.Context, params *CreateCommitInput, op addawsAwsjson11_serdeOpCreateCommitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_CreatePullRequest.go b/service/codecommit/api_op_CreatePullRequest.go index 3a847f60dea..10c6a170f3b 100644 --- a/service/codecommit/api_op_CreatePullRequest.go +++ b/service/codecommit/api_op_CreatePullRequest.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreatePullRequest(ctx context.Context, params *CreatePullReques addawsAwsjson11_serdeOpCreatePullRequestMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_CreatePullRequestApprovalRule.go b/service/codecommit/api_op_CreatePullRequestApprovalRule.go index bc3006c7348..335b4e15a17 100644 --- a/service/codecommit/api_op_CreatePullRequestApprovalRule.go +++ b/service/codecommit/api_op_CreatePullRequestApprovalRule.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreatePullRequestApprovalRule(ctx context.Context, params *Crea addawsAwsjson11_serdeOpCreatePullRequestApprovalRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_CreateRepository.go b/service/codecommit/api_op_CreateRepository.go index 6e077548809..67bc1788d34 100644 --- a/service/codecommit/api_op_CreateRepository.go +++ b/service/codecommit/api_op_CreateRepository.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateRepository(ctx context.Context, params *CreateRepositoryI addawsAwsjson11_serdeOpCreateRepositoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_CreateUnreferencedMergeCommit.go b/service/codecommit/api_op_CreateUnreferencedMergeCommit.go index fba97b596d4..cb8a2a3d203 100644 --- a/service/codecommit/api_op_CreateUnreferencedMergeCommit.go +++ b/service/codecommit/api_op_CreateUnreferencedMergeCommit.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateUnreferencedMergeCommit(ctx context.Context, params *Crea addawsAwsjson11_serdeOpCreateUnreferencedMergeCommitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_DeleteApprovalRuleTemplate.go b/service/codecommit/api_op_DeleteApprovalRuleTemplate.go index da8834a914c..d2eb430af8d 100644 --- a/service/codecommit/api_op_DeleteApprovalRuleTemplate.go +++ b/service/codecommit/api_op_DeleteApprovalRuleTemplate.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteApprovalRuleTemplate(ctx context.Context, params *DeleteA addawsAwsjson11_serdeOpDeleteApprovalRuleTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_DeleteBranch.go b/service/codecommit/api_op_DeleteBranch.go index 61dff59ba9c..b9d2c91acd5 100644 --- a/service/codecommit/api_op_DeleteBranch.go +++ b/service/codecommit/api_op_DeleteBranch.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteBranch(ctx context.Context, params *DeleteBranchInput, op addawsAwsjson11_serdeOpDeleteBranchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_DeleteCommentContent.go b/service/codecommit/api_op_DeleteCommentContent.go index ca15cfa9753..1e855bc07aa 100644 --- a/service/codecommit/api_op_DeleteCommentContent.go +++ b/service/codecommit/api_op_DeleteCommentContent.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteCommentContent(ctx context.Context, params *DeleteComment addawsAwsjson11_serdeOpDeleteCommentContentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_DeleteFile.go b/service/codecommit/api_op_DeleteFile.go index 1940bfd0a0f..94e71020564 100644 --- a/service/codecommit/api_op_DeleteFile.go +++ b/service/codecommit/api_op_DeleteFile.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteFile(ctx context.Context, params *DeleteFileInput, optFns addawsAwsjson11_serdeOpDeleteFileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_DeletePullRequestApprovalRule.go b/service/codecommit/api_op_DeletePullRequestApprovalRule.go index f4a9c489a60..be5f3975719 100644 --- a/service/codecommit/api_op_DeletePullRequestApprovalRule.go +++ b/service/codecommit/api_op_DeletePullRequestApprovalRule.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeletePullRequestApprovalRule(ctx context.Context, params *Dele addawsAwsjson11_serdeOpDeletePullRequestApprovalRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_DeleteRepository.go b/service/codecommit/api_op_DeleteRepository.go index ff39e3d8f8c..ee101262f6d 100644 --- a/service/codecommit/api_op_DeleteRepository.go +++ b/service/codecommit/api_op_DeleteRepository.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteRepository(ctx context.Context, params *DeleteRepositoryI addawsAwsjson11_serdeOpDeleteRepositoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_DescribeMergeConflicts.go b/service/codecommit/api_op_DescribeMergeConflicts.go index 4cf259fa236..7f9fe6cff47 100644 --- a/service/codecommit/api_op_DescribeMergeConflicts.go +++ b/service/codecommit/api_op_DescribeMergeConflicts.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeMergeConflicts(ctx context.Context, params *DescribeMer addawsAwsjson11_serdeOpDescribeMergeConflictsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_DescribePullRequestEvents.go b/service/codecommit/api_op_DescribePullRequestEvents.go index 84295bd8930..5db1eedd982 100644 --- a/service/codecommit/api_op_DescribePullRequestEvents.go +++ b/service/codecommit/api_op_DescribePullRequestEvents.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribePullRequestEvents(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribePullRequestEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_DisassociateApprovalRuleTemplateFromRepository.go b/service/codecommit/api_op_DisassociateApprovalRuleTemplateFromRepository.go index 8f7484b37c6..893a30620c9 100644 --- a/service/codecommit/api_op_DisassociateApprovalRuleTemplateFromRepository.go +++ b/service/codecommit/api_op_DisassociateApprovalRuleTemplateFromRepository.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DisassociateApprovalRuleTemplateFromRepository(ctx context.Cont addawsAwsjson11_serdeOpDisassociateApprovalRuleTemplateFromRepositoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_EvaluatePullRequestApprovalRules.go b/service/codecommit/api_op_EvaluatePullRequestApprovalRules.go index c22cb617e35..8154b3ec523 100644 --- a/service/codecommit/api_op_EvaluatePullRequestApprovalRules.go +++ b/service/codecommit/api_op_EvaluatePullRequestApprovalRules.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) EvaluatePullRequestApprovalRules(ctx context.Context, params *E addawsAwsjson11_serdeOpEvaluatePullRequestApprovalRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetApprovalRuleTemplate.go b/service/codecommit/api_op_GetApprovalRuleTemplate.go index 6b590d964ee..aac9130b33f 100644 --- a/service/codecommit/api_op_GetApprovalRuleTemplate.go +++ b/service/codecommit/api_op_GetApprovalRuleTemplate.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetApprovalRuleTemplate(ctx context.Context, params *GetApprova addawsAwsjson11_serdeOpGetApprovalRuleTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetBlob.go b/service/codecommit/api_op_GetBlob.go index 0cb3f9593f1..6cc9ad85234 100644 --- a/service/codecommit/api_op_GetBlob.go +++ b/service/codecommit/api_op_GetBlob.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetBlob(ctx context.Context, params *GetBlobInput, optFns ...fu addawsAwsjson11_serdeOpGetBlobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetBranch.go b/service/codecommit/api_op_GetBranch.go index ce0f1a9b5e9..2374caa5f2f 100644 --- a/service/codecommit/api_op_GetBranch.go +++ b/service/codecommit/api_op_GetBranch.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetBranch(ctx context.Context, params *GetBranchInput, optFns . addawsAwsjson11_serdeOpGetBranchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetComment.go b/service/codecommit/api_op_GetComment.go index dbaaec8ffca..7a9cb47d2c9 100644 --- a/service/codecommit/api_op_GetComment.go +++ b/service/codecommit/api_op_GetComment.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetComment(ctx context.Context, params *GetCommentInput, optFns addawsAwsjson11_serdeOpGetCommentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetCommentReactions.go b/service/codecommit/api_op_GetCommentReactions.go index d91bda4cb8a..1d844c9fa12 100644 --- a/service/codecommit/api_op_GetCommentReactions.go +++ b/service/codecommit/api_op_GetCommentReactions.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetCommentReactions(ctx context.Context, params *GetCommentReac addawsAwsjson11_serdeOpGetCommentReactionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetCommentsForComparedCommit.go b/service/codecommit/api_op_GetCommentsForComparedCommit.go index 2c68afb991b..2c78ab7d5e6 100644 --- a/service/codecommit/api_op_GetCommentsForComparedCommit.go +++ b/service/codecommit/api_op_GetCommentsForComparedCommit.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetCommentsForComparedCommit(ctx context.Context, params *GetCo addawsAwsjson11_serdeOpGetCommentsForComparedCommitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetCommentsForPullRequest.go b/service/codecommit/api_op_GetCommentsForPullRequest.go index ddba031f7e9..72fb78711c0 100644 --- a/service/codecommit/api_op_GetCommentsForPullRequest.go +++ b/service/codecommit/api_op_GetCommentsForPullRequest.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetCommentsForPullRequest(ctx context.Context, params *GetComme addawsAwsjson11_serdeOpGetCommentsForPullRequestMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetCommit.go b/service/codecommit/api_op_GetCommit.go index 6fb5afded4b..0e4de4d9360 100644 --- a/service/codecommit/api_op_GetCommit.go +++ b/service/codecommit/api_op_GetCommit.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetCommit(ctx context.Context, params *GetCommitInput, optFns . addawsAwsjson11_serdeOpGetCommitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetDifferences.go b/service/codecommit/api_op_GetDifferences.go index f7921cf2491..e2a3a32218b 100644 --- a/service/codecommit/api_op_GetDifferences.go +++ b/service/codecommit/api_op_GetDifferences.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetDifferences(ctx context.Context, params *GetDifferencesInput addawsAwsjson11_serdeOpGetDifferencesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetFile.go b/service/codecommit/api_op_GetFile.go index 8c3f21e89a2..07791edccb6 100644 --- a/service/codecommit/api_op_GetFile.go +++ b/service/codecommit/api_op_GetFile.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetFile(ctx context.Context, params *GetFileInput, optFns ...fu addawsAwsjson11_serdeOpGetFileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetFolder.go b/service/codecommit/api_op_GetFolder.go index 3464e6aa200..8819168590b 100644 --- a/service/codecommit/api_op_GetFolder.go +++ b/service/codecommit/api_op_GetFolder.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetFolder(ctx context.Context, params *GetFolderInput, optFns . addawsAwsjson11_serdeOpGetFolderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetMergeCommit.go b/service/codecommit/api_op_GetMergeCommit.go index ea1167c4087..4ef3b61127a 100644 --- a/service/codecommit/api_op_GetMergeCommit.go +++ b/service/codecommit/api_op_GetMergeCommit.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetMergeCommit(ctx context.Context, params *GetMergeCommitInput addawsAwsjson11_serdeOpGetMergeCommitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetMergeConflicts.go b/service/codecommit/api_op_GetMergeConflicts.go index 1e88794ceb1..f4e37fd6bc1 100644 --- a/service/codecommit/api_op_GetMergeConflicts.go +++ b/service/codecommit/api_op_GetMergeConflicts.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetMergeConflicts(ctx context.Context, params *GetMergeConflict addawsAwsjson11_serdeOpGetMergeConflictsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetMergeOptions.go b/service/codecommit/api_op_GetMergeOptions.go index 6ea68a3fb95..b4b2d4b5c40 100644 --- a/service/codecommit/api_op_GetMergeOptions.go +++ b/service/codecommit/api_op_GetMergeOptions.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetMergeOptions(ctx context.Context, params *GetMergeOptionsInp addawsAwsjson11_serdeOpGetMergeOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetPullRequest.go b/service/codecommit/api_op_GetPullRequest.go index 85b0d29f1f9..e15da44d6c4 100644 --- a/service/codecommit/api_op_GetPullRequest.go +++ b/service/codecommit/api_op_GetPullRequest.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetPullRequest(ctx context.Context, params *GetPullRequestInput addawsAwsjson11_serdeOpGetPullRequestMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetPullRequestApprovalStates.go b/service/codecommit/api_op_GetPullRequestApprovalStates.go index 0b0e1af6a87..abbbe3f4a2f 100644 --- a/service/codecommit/api_op_GetPullRequestApprovalStates.go +++ b/service/codecommit/api_op_GetPullRequestApprovalStates.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetPullRequestApprovalStates(ctx context.Context, params *GetPu addawsAwsjson11_serdeOpGetPullRequestApprovalStatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetPullRequestOverrideState.go b/service/codecommit/api_op_GetPullRequestOverrideState.go index d311536b390..c8fa667c45a 100644 --- a/service/codecommit/api_op_GetPullRequestOverrideState.go +++ b/service/codecommit/api_op_GetPullRequestOverrideState.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) GetPullRequestOverrideState(ctx context.Context, params *GetPul addawsAwsjson11_serdeOpGetPullRequestOverrideStateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetRepository.go b/service/codecommit/api_op_GetRepository.go index d32697a058a..5ec041e6313 100644 --- a/service/codecommit/api_op_GetRepository.go +++ b/service/codecommit/api_op_GetRepository.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetRepository(ctx context.Context, params *GetRepositoryInput, addawsAwsjson11_serdeOpGetRepositoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_GetRepositoryTriggers.go b/service/codecommit/api_op_GetRepositoryTriggers.go index cb0e6b13588..a746e345513 100644 --- a/service/codecommit/api_op_GetRepositoryTriggers.go +++ b/service/codecommit/api_op_GetRepositoryTriggers.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetRepositoryTriggers(ctx context.Context, params *GetRepositor addawsAwsjson11_serdeOpGetRepositoryTriggersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_ListApprovalRuleTemplates.go b/service/codecommit/api_op_ListApprovalRuleTemplates.go index 6d7fb27a8a0..a98ea3a05e1 100644 --- a/service/codecommit/api_op_ListApprovalRuleTemplates.go +++ b/service/codecommit/api_op_ListApprovalRuleTemplates.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ListApprovalRuleTemplates(ctx context.Context, params *ListAppr addawsAwsjson11_serdeOpListApprovalRuleTemplatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_ListAssociatedApprovalRuleTemplatesForRepository.go b/service/codecommit/api_op_ListAssociatedApprovalRuleTemplatesForRepository.go index 50874cf4bc4..da1bb359b54 100644 --- a/service/codecommit/api_op_ListAssociatedApprovalRuleTemplatesForRepository.go +++ b/service/codecommit/api_op_ListAssociatedApprovalRuleTemplatesForRepository.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ListAssociatedApprovalRuleTemplatesForRepository(ctx context.Co addawsAwsjson11_serdeOpListAssociatedApprovalRuleTemplatesForRepositoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_ListBranches.go b/service/codecommit/api_op_ListBranches.go index 66a9e59ac2e..55b85f8e52e 100644 --- a/service/codecommit/api_op_ListBranches.go +++ b/service/codecommit/api_op_ListBranches.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListBranches(ctx context.Context, params *ListBranchesInput, op addawsAwsjson11_serdeOpListBranchesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_ListPullRequests.go b/service/codecommit/api_op_ListPullRequests.go index 056093e2314..3e1df466390 100644 --- a/service/codecommit/api_op_ListPullRequests.go +++ b/service/codecommit/api_op_ListPullRequests.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListPullRequests(ctx context.Context, params *ListPullRequestsI addawsAwsjson11_serdeOpListPullRequestsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_ListRepositories.go b/service/codecommit/api_op_ListRepositories.go index c065c79a78d..80b33b3ea91 100644 --- a/service/codecommit/api_op_ListRepositories.go +++ b/service/codecommit/api_op_ListRepositories.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListRepositories(ctx context.Context, params *ListRepositoriesI addawsAwsjson11_serdeOpListRepositoriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_ListRepositoriesForApprovalRuleTemplate.go b/service/codecommit/api_op_ListRepositoriesForApprovalRuleTemplate.go index 3c57440d71a..1bb7f83612d 100644 --- a/service/codecommit/api_op_ListRepositoriesForApprovalRuleTemplate.go +++ b/service/codecommit/api_op_ListRepositoriesForApprovalRuleTemplate.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListRepositoriesForApprovalRuleTemplate(ctx context.Context, pa addawsAwsjson11_serdeOpListRepositoriesForApprovalRuleTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_ListTagsForResource.go b/service/codecommit/api_op_ListTagsForResource.go index ee32161855a..5da7e0a7689 100644 --- a/service/codecommit/api_op_ListTagsForResource.go +++ b/service/codecommit/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_MergeBranchesByFastForward.go b/service/codecommit/api_op_MergeBranchesByFastForward.go index bc75aefb694..2d9403553ba 100644 --- a/service/codecommit/api_op_MergeBranchesByFastForward.go +++ b/service/codecommit/api_op_MergeBranchesByFastForward.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) MergeBranchesByFastForward(ctx context.Context, params *MergeBr addawsAwsjson11_serdeOpMergeBranchesByFastForwardMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_MergeBranchesBySquash.go b/service/codecommit/api_op_MergeBranchesBySquash.go index 7f1ed13c766..68b9c7a0262 100644 --- a/service/codecommit/api_op_MergeBranchesBySquash.go +++ b/service/codecommit/api_op_MergeBranchesBySquash.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) MergeBranchesBySquash(ctx context.Context, params *MergeBranche addawsAwsjson11_serdeOpMergeBranchesBySquashMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_MergeBranchesByThreeWay.go b/service/codecommit/api_op_MergeBranchesByThreeWay.go index 2bcc339cdec..3b316b76983 100644 --- a/service/codecommit/api_op_MergeBranchesByThreeWay.go +++ b/service/codecommit/api_op_MergeBranchesByThreeWay.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) MergeBranchesByThreeWay(ctx context.Context, params *MergeBranc addawsAwsjson11_serdeOpMergeBranchesByThreeWayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_MergePullRequestByFastForward.go b/service/codecommit/api_op_MergePullRequestByFastForward.go index a4ba76fcaa7..b938bddeed9 100644 --- a/service/codecommit/api_op_MergePullRequestByFastForward.go +++ b/service/codecommit/api_op_MergePullRequestByFastForward.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) MergePullRequestByFastForward(ctx context.Context, params *Merg addawsAwsjson11_serdeOpMergePullRequestByFastForwardMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_MergePullRequestBySquash.go b/service/codecommit/api_op_MergePullRequestBySquash.go index 7186040222d..687db988fe2 100644 --- a/service/codecommit/api_op_MergePullRequestBySquash.go +++ b/service/codecommit/api_op_MergePullRequestBySquash.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) MergePullRequestBySquash(ctx context.Context, params *MergePull addawsAwsjson11_serdeOpMergePullRequestBySquashMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_MergePullRequestByThreeWay.go b/service/codecommit/api_op_MergePullRequestByThreeWay.go index c0ef207e1b2..2f05c6bd045 100644 --- a/service/codecommit/api_op_MergePullRequestByThreeWay.go +++ b/service/codecommit/api_op_MergePullRequestByThreeWay.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) MergePullRequestByThreeWay(ctx context.Context, params *MergePu addawsAwsjson11_serdeOpMergePullRequestByThreeWayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_OverridePullRequestApprovalRules.go b/service/codecommit/api_op_OverridePullRequestApprovalRules.go index 21634818d7e..b5aba5035b5 100644 --- a/service/codecommit/api_op_OverridePullRequestApprovalRules.go +++ b/service/codecommit/api_op_OverridePullRequestApprovalRules.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) OverridePullRequestApprovalRules(ctx context.Context, params *O addawsAwsjson11_serdeOpOverridePullRequestApprovalRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_PostCommentForComparedCommit.go b/service/codecommit/api_op_PostCommentForComparedCommit.go index 1a474b49dff..841da08d184 100644 --- a/service/codecommit/api_op_PostCommentForComparedCommit.go +++ b/service/codecommit/api_op_PostCommentForComparedCommit.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PostCommentForComparedCommit(ctx context.Context, params *PostC addawsAwsjson11_serdeOpPostCommentForComparedCommitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_PostCommentForPullRequest.go b/service/codecommit/api_op_PostCommentForPullRequest.go index 1f5cc576017..11046415609 100644 --- a/service/codecommit/api_op_PostCommentForPullRequest.go +++ b/service/codecommit/api_op_PostCommentForPullRequest.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PostCommentForPullRequest(ctx context.Context, params *PostComm addawsAwsjson11_serdeOpPostCommentForPullRequestMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_PostCommentReply.go b/service/codecommit/api_op_PostCommentReply.go index 7f3ad17f281..eac9311cb23 100644 --- a/service/codecommit/api_op_PostCommentReply.go +++ b/service/codecommit/api_op_PostCommentReply.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) PostCommentReply(ctx context.Context, params *PostCommentReplyI addawsAwsjson11_serdeOpPostCommentReplyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_PutCommentReaction.go b/service/codecommit/api_op_PutCommentReaction.go index fe8636f66fb..cb657c2598c 100644 --- a/service/codecommit/api_op_PutCommentReaction.go +++ b/service/codecommit/api_op_PutCommentReaction.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) PutCommentReaction(ctx context.Context, params *PutCommentReact addawsAwsjson11_serdeOpPutCommentReactionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_PutFile.go b/service/codecommit/api_op_PutFile.go index 832fb8a72bd..04040090d17 100644 --- a/service/codecommit/api_op_PutFile.go +++ b/service/codecommit/api_op_PutFile.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutFile(ctx context.Context, params *PutFileInput, optFns ...fu addawsAwsjson11_serdeOpPutFileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_PutRepositoryTriggers.go b/service/codecommit/api_op_PutRepositoryTriggers.go index b78e7f05e9c..6051b5dec15 100644 --- a/service/codecommit/api_op_PutRepositoryTriggers.go +++ b/service/codecommit/api_op_PutRepositoryTriggers.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutRepositoryTriggers(ctx context.Context, params *PutRepositor addawsAwsjson11_serdeOpPutRepositoryTriggersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_TagResource.go b/service/codecommit/api_op_TagResource.go index 3307f612083..c9dbcc31e00 100644 --- a/service/codecommit/api_op_TagResource.go +++ b/service/codecommit/api_op_TagResource.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_TestRepositoryTriggers.go b/service/codecommit/api_op_TestRepositoryTriggers.go index 03f0c35bf23..fa822d95c54 100644 --- a/service/codecommit/api_op_TestRepositoryTriggers.go +++ b/service/codecommit/api_op_TestRepositoryTriggers.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) TestRepositoryTriggers(ctx context.Context, params *TestReposit addawsAwsjson11_serdeOpTestRepositoryTriggersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_UntagResource.go b/service/codecommit/api_op_UntagResource.go index 9896e56744c..aae323430e6 100644 --- a/service/codecommit/api_op_UntagResource.go +++ b/service/codecommit/api_op_UntagResource.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_UpdateApprovalRuleTemplateContent.go b/service/codecommit/api_op_UpdateApprovalRuleTemplateContent.go index a643985cd9f..a66b48e076e 100644 --- a/service/codecommit/api_op_UpdateApprovalRuleTemplateContent.go +++ b/service/codecommit/api_op_UpdateApprovalRuleTemplateContent.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateApprovalRuleTemplateContent(ctx context.Context, params * addawsAwsjson11_serdeOpUpdateApprovalRuleTemplateContentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_UpdateApprovalRuleTemplateDescription.go b/service/codecommit/api_op_UpdateApprovalRuleTemplateDescription.go index ee7c2aeb32c..e98dd58d904 100644 --- a/service/codecommit/api_op_UpdateApprovalRuleTemplateDescription.go +++ b/service/codecommit/api_op_UpdateApprovalRuleTemplateDescription.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateApprovalRuleTemplateDescription(ctx context.Context, para addawsAwsjson11_serdeOpUpdateApprovalRuleTemplateDescriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_UpdateApprovalRuleTemplateName.go b/service/codecommit/api_op_UpdateApprovalRuleTemplateName.go index bc8cf8acfa6..52f3203aa08 100644 --- a/service/codecommit/api_op_UpdateApprovalRuleTemplateName.go +++ b/service/codecommit/api_op_UpdateApprovalRuleTemplateName.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateApprovalRuleTemplateName(ctx context.Context, params *Upd addawsAwsjson11_serdeOpUpdateApprovalRuleTemplateNameMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_UpdateComment.go b/service/codecommit/api_op_UpdateComment.go index d46bdc0646f..c714f89e01e 100644 --- a/service/codecommit/api_op_UpdateComment.go +++ b/service/codecommit/api_op_UpdateComment.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateComment(ctx context.Context, params *UpdateCommentInput, addawsAwsjson11_serdeOpUpdateCommentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_UpdateDefaultBranch.go b/service/codecommit/api_op_UpdateDefaultBranch.go index 18d41b581dc..75f4e85e0a6 100644 --- a/service/codecommit/api_op_UpdateDefaultBranch.go +++ b/service/codecommit/api_op_UpdateDefaultBranch.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) UpdateDefaultBranch(ctx context.Context, params *UpdateDefaultB addawsAwsjson11_serdeOpUpdateDefaultBranchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_UpdatePullRequestApprovalRuleContent.go b/service/codecommit/api_op_UpdatePullRequestApprovalRuleContent.go index ade082393bd..1b63c1db4fd 100644 --- a/service/codecommit/api_op_UpdatePullRequestApprovalRuleContent.go +++ b/service/codecommit/api_op_UpdatePullRequestApprovalRuleContent.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdatePullRequestApprovalRuleContent(ctx context.Context, param addawsAwsjson11_serdeOpUpdatePullRequestApprovalRuleContentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_UpdatePullRequestApprovalState.go b/service/codecommit/api_op_UpdatePullRequestApprovalState.go index 2f017a3a62b..3a75e2edf72 100644 --- a/service/codecommit/api_op_UpdatePullRequestApprovalState.go +++ b/service/codecommit/api_op_UpdatePullRequestApprovalState.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdatePullRequestApprovalState(ctx context.Context, params *Upd addawsAwsjson11_serdeOpUpdatePullRequestApprovalStateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_UpdatePullRequestDescription.go b/service/codecommit/api_op_UpdatePullRequestDescription.go index b90df02f68c..e022af22974 100644 --- a/service/codecommit/api_op_UpdatePullRequestDescription.go +++ b/service/codecommit/api_op_UpdatePullRequestDescription.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdatePullRequestDescription(ctx context.Context, params *Updat addawsAwsjson11_serdeOpUpdatePullRequestDescriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_UpdatePullRequestStatus.go b/service/codecommit/api_op_UpdatePullRequestStatus.go index a0cf71a120d..a7de66d1b0b 100644 --- a/service/codecommit/api_op_UpdatePullRequestStatus.go +++ b/service/codecommit/api_op_UpdatePullRequestStatus.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdatePullRequestStatus(ctx context.Context, params *UpdatePull addawsAwsjson11_serdeOpUpdatePullRequestStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_UpdatePullRequestTitle.go b/service/codecommit/api_op_UpdatePullRequestTitle.go index 60375b0d188..7da7d147bbc 100644 --- a/service/codecommit/api_op_UpdatePullRequestTitle.go +++ b/service/codecommit/api_op_UpdatePullRequestTitle.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codecommit/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdatePullRequestTitle(ctx context.Context, params *UpdatePullR addawsAwsjson11_serdeOpUpdatePullRequestTitleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_UpdateRepositoryDescription.go b/service/codecommit/api_op_UpdateRepositoryDescription.go index 02bb57ec880..a1ab6df9a47 100644 --- a/service/codecommit/api_op_UpdateRepositoryDescription.go +++ b/service/codecommit/api_op_UpdateRepositoryDescription.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) UpdateRepositoryDescription(ctx context.Context, params *Update addawsAwsjson11_serdeOpUpdateRepositoryDescriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/api_op_UpdateRepositoryName.go b/service/codecommit/api_op_UpdateRepositoryName.go index 96b734838ac..31730ff943f 100644 --- a/service/codecommit/api_op_UpdateRepositoryName.go +++ b/service/codecommit/api_op_UpdateRepositoryName.go @@ -5,7 +5,6 @@ package codecommit import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) UpdateRepositoryName(ctx context.Context, params *UpdateReposit addawsAwsjson11_serdeOpUpdateRepositoryNameMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codecommit/endpoints.go b/service/codecommit/endpoints.go index b9cb624c0dd..7fbe580638c 100644 --- a/service/codecommit/endpoints.go +++ b/service/codecommit/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/codedeploy/api_client.go b/service/codedeploy/api_client.go index 4c0b7fe6720..a939225ffe4 100644 --- a/service/codedeploy/api_client.go +++ b/service/codedeploy/api_client.go @@ -148,30 +148,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -237,6 +213,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/codedeploy/api_op_AddTagsToOnPremisesInstances.go b/service/codedeploy/api_op_AddTagsToOnPremisesInstances.go index 9aa31ba665a..175a5827a16 100644 --- a/service/codedeploy/api_op_AddTagsToOnPremisesInstances.go +++ b/service/codedeploy/api_op_AddTagsToOnPremisesInstances.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) AddTagsToOnPremisesInstances(ctx context.Context, params *AddTa addawsAwsjson11_serdeOpAddTagsToOnPremisesInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_BatchGetApplicationRevisions.go b/service/codedeploy/api_op_BatchGetApplicationRevisions.go index cb07121399d..1f4e8090815 100644 --- a/service/codedeploy/api_op_BatchGetApplicationRevisions.go +++ b/service/codedeploy/api_op_BatchGetApplicationRevisions.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) BatchGetApplicationRevisions(ctx context.Context, params *Batch addawsAwsjson11_serdeOpBatchGetApplicationRevisionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_BatchGetApplications.go b/service/codedeploy/api_op_BatchGetApplications.go index 0ff5684d1ce..21475eb136b 100644 --- a/service/codedeploy/api_op_BatchGetApplications.go +++ b/service/codedeploy/api_op_BatchGetApplications.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) BatchGetApplications(ctx context.Context, params *BatchGetAppli addawsAwsjson11_serdeOpBatchGetApplicationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_BatchGetDeploymentGroups.go b/service/codedeploy/api_op_BatchGetDeploymentGroups.go index 2b082c019db..6118dba8aa1 100644 --- a/service/codedeploy/api_op_BatchGetDeploymentGroups.go +++ b/service/codedeploy/api_op_BatchGetDeploymentGroups.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchGetDeploymentGroups(ctx context.Context, params *BatchGetD addawsAwsjson11_serdeOpBatchGetDeploymentGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_BatchGetDeploymentInstances.go b/service/codedeploy/api_op_BatchGetDeploymentInstances.go index 16398893304..1e8f1fdc0c3 100644 --- a/service/codedeploy/api_op_BatchGetDeploymentInstances.go +++ b/service/codedeploy/api_op_BatchGetDeploymentInstances.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) BatchGetDeploymentInstances(ctx context.Context, params *BatchG addawsAwsjson11_serdeOpBatchGetDeploymentInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_BatchGetDeploymentTargets.go b/service/codedeploy/api_op_BatchGetDeploymentTargets.go index ee9a7ba4bf0..4ea834f89a1 100644 --- a/service/codedeploy/api_op_BatchGetDeploymentTargets.go +++ b/service/codedeploy/api_op_BatchGetDeploymentTargets.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) BatchGetDeploymentTargets(ctx context.Context, params *BatchGet addawsAwsjson11_serdeOpBatchGetDeploymentTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_BatchGetDeployments.go b/service/codedeploy/api_op_BatchGetDeployments.go index 0ac973a529e..93297fb29ce 100644 --- a/service/codedeploy/api_op_BatchGetDeployments.go +++ b/service/codedeploy/api_op_BatchGetDeployments.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) BatchGetDeployments(ctx context.Context, params *BatchGetDeploy addawsAwsjson11_serdeOpBatchGetDeploymentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_BatchGetOnPremisesInstances.go b/service/codedeploy/api_op_BatchGetOnPremisesInstances.go index a42a7d9a31a..23746504471 100644 --- a/service/codedeploy/api_op_BatchGetOnPremisesInstances.go +++ b/service/codedeploy/api_op_BatchGetOnPremisesInstances.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) BatchGetOnPremisesInstances(ctx context.Context, params *BatchG addawsAwsjson11_serdeOpBatchGetOnPremisesInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_ContinueDeployment.go b/service/codedeploy/api_op_ContinueDeployment.go index c8e6c6d22ce..94f1150ba2d 100644 --- a/service/codedeploy/api_op_ContinueDeployment.go +++ b/service/codedeploy/api_op_ContinueDeployment.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ContinueDeployment(ctx context.Context, params *ContinueDeploym addawsAwsjson11_serdeOpContinueDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_CreateApplication.go b/service/codedeploy/api_op_CreateApplication.go index 00e1a934523..defe63eaa2b 100644 --- a/service/codedeploy/api_op_CreateApplication.go +++ b/service/codedeploy/api_op_CreateApplication.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateApplication(ctx context.Context, params *CreateApplicatio addawsAwsjson11_serdeOpCreateApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_CreateDeployment.go b/service/codedeploy/api_op_CreateDeployment.go index 36ccb57e584..d802d6c93bb 100644 --- a/service/codedeploy/api_op_CreateDeployment.go +++ b/service/codedeploy/api_op_CreateDeployment.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDeployment(ctx context.Context, params *CreateDeploymentI addawsAwsjson11_serdeOpCreateDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_CreateDeploymentConfig.go b/service/codedeploy/api_op_CreateDeploymentConfig.go index 9f582542f55..b48a67605e4 100644 --- a/service/codedeploy/api_op_CreateDeploymentConfig.go +++ b/service/codedeploy/api_op_CreateDeploymentConfig.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDeploymentConfig(ctx context.Context, params *CreateDeplo addawsAwsjson11_serdeOpCreateDeploymentConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_CreateDeploymentGroup.go b/service/codedeploy/api_op_CreateDeploymentGroup.go index 8d428d2cdff..7103e4f568b 100644 --- a/service/codedeploy/api_op_CreateDeploymentGroup.go +++ b/service/codedeploy/api_op_CreateDeploymentGroup.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDeploymentGroup(ctx context.Context, params *CreateDeploy addawsAwsjson11_serdeOpCreateDeploymentGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_DeleteApplication.go b/service/codedeploy/api_op_DeleteApplication.go index 8ff62e25787..e9473dc6d78 100644 --- a/service/codedeploy/api_op_DeleteApplication.go +++ b/service/codedeploy/api_op_DeleteApplication.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteApplication(ctx context.Context, params *DeleteApplicatio addawsAwsjson11_serdeOpDeleteApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_DeleteDeploymentConfig.go b/service/codedeploy/api_op_DeleteDeploymentConfig.go index 34251070a11..1a51faa0bb6 100644 --- a/service/codedeploy/api_op_DeleteDeploymentConfig.go +++ b/service/codedeploy/api_op_DeleteDeploymentConfig.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDeploymentConfig(ctx context.Context, params *DeleteDeplo addawsAwsjson11_serdeOpDeleteDeploymentConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_DeleteDeploymentGroup.go b/service/codedeploy/api_op_DeleteDeploymentGroup.go index d9566cca079..571551298c6 100644 --- a/service/codedeploy/api_op_DeleteDeploymentGroup.go +++ b/service/codedeploy/api_op_DeleteDeploymentGroup.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteDeploymentGroup(ctx context.Context, params *DeleteDeploy addawsAwsjson11_serdeOpDeleteDeploymentGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_DeleteGitHubAccountToken.go b/service/codedeploy/api_op_DeleteGitHubAccountToken.go index f383dac932b..5553feb5c7d 100644 --- a/service/codedeploy/api_op_DeleteGitHubAccountToken.go +++ b/service/codedeploy/api_op_DeleteGitHubAccountToken.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteGitHubAccountToken(ctx context.Context, params *DeleteGit addawsAwsjson11_serdeOpDeleteGitHubAccountTokenMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_DeleteResourcesByExternalId.go b/service/codedeploy/api_op_DeleteResourcesByExternalId.go index 00f63a7ec88..6ac5b82cfdd 100644 --- a/service/codedeploy/api_op_DeleteResourcesByExternalId.go +++ b/service/codedeploy/api_op_DeleteResourcesByExternalId.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteResourcesByExternalId(ctx context.Context, params *Delete addawsAwsjson11_serdeOpDeleteResourcesByExternalIdMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_DeregisterOnPremisesInstance.go b/service/codedeploy/api_op_DeregisterOnPremisesInstance.go index b92aa9d446b..3aea8c75908 100644 --- a/service/codedeploy/api_op_DeregisterOnPremisesInstance.go +++ b/service/codedeploy/api_op_DeregisterOnPremisesInstance.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeregisterOnPremisesInstance(ctx context.Context, params *Dereg addawsAwsjson11_serdeOpDeregisterOnPremisesInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_GetApplication.go b/service/codedeploy/api_op_GetApplication.go index c5710066fde..1e1be33b847 100644 --- a/service/codedeploy/api_op_GetApplication.go +++ b/service/codedeploy/api_op_GetApplication.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetApplication(ctx context.Context, params *GetApplicationInput addawsAwsjson11_serdeOpGetApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_GetApplicationRevision.go b/service/codedeploy/api_op_GetApplicationRevision.go index 094c632e46f..7c5b582b888 100644 --- a/service/codedeploy/api_op_GetApplicationRevision.go +++ b/service/codedeploy/api_op_GetApplicationRevision.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetApplicationRevision(ctx context.Context, params *GetApplicat addawsAwsjson11_serdeOpGetApplicationRevisionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_GetDeployment.go b/service/codedeploy/api_op_GetDeployment.go index a48c2ab7a0b..c67c3ac6f96 100644 --- a/service/codedeploy/api_op_GetDeployment.go +++ b/service/codedeploy/api_op_GetDeployment.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetDeployment(ctx context.Context, params *GetDeploymentInput, addawsAwsjson11_serdeOpGetDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_GetDeploymentConfig.go b/service/codedeploy/api_op_GetDeploymentConfig.go index 2c803802a7a..dc577325095 100644 --- a/service/codedeploy/api_op_GetDeploymentConfig.go +++ b/service/codedeploy/api_op_GetDeploymentConfig.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDeploymentConfig(ctx context.Context, params *GetDeploymentC addawsAwsjson11_serdeOpGetDeploymentConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_GetDeploymentGroup.go b/service/codedeploy/api_op_GetDeploymentGroup.go index 16c81661f94..0b810df532d 100644 --- a/service/codedeploy/api_op_GetDeploymentGroup.go +++ b/service/codedeploy/api_op_GetDeploymentGroup.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDeploymentGroup(ctx context.Context, params *GetDeploymentGr addawsAwsjson11_serdeOpGetDeploymentGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_GetDeploymentInstance.go b/service/codedeploy/api_op_GetDeploymentInstance.go index 698c356b3af..94cdd425b94 100644 --- a/service/codedeploy/api_op_GetDeploymentInstance.go +++ b/service/codedeploy/api_op_GetDeploymentInstance.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDeploymentInstance(ctx context.Context, params *GetDeploymen addawsAwsjson11_serdeOpGetDeploymentInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_GetDeploymentTarget.go b/service/codedeploy/api_op_GetDeploymentTarget.go index 5137a135bfd..04e2285f7b9 100644 --- a/service/codedeploy/api_op_GetDeploymentTarget.go +++ b/service/codedeploy/api_op_GetDeploymentTarget.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDeploymentTarget(ctx context.Context, params *GetDeploymentT addawsAwsjson11_serdeOpGetDeploymentTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_GetOnPremisesInstance.go b/service/codedeploy/api_op_GetOnPremisesInstance.go index dad13bfcca4..e1c30fd1835 100644 --- a/service/codedeploy/api_op_GetOnPremisesInstance.go +++ b/service/codedeploy/api_op_GetOnPremisesInstance.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetOnPremisesInstance(ctx context.Context, params *GetOnPremise addawsAwsjson11_serdeOpGetOnPremisesInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_ListApplicationRevisions.go b/service/codedeploy/api_op_ListApplicationRevisions.go index b57fae57cbd..3f0eb85bbc7 100644 --- a/service/codedeploy/api_op_ListApplicationRevisions.go +++ b/service/codedeploy/api_op_ListApplicationRevisions.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListApplicationRevisions(ctx context.Context, params *ListAppli addawsAwsjson11_serdeOpListApplicationRevisionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_ListApplications.go b/service/codedeploy/api_op_ListApplications.go index d6c4d4c72e9..32a6a2ffcd7 100644 --- a/service/codedeploy/api_op_ListApplications.go +++ b/service/codedeploy/api_op_ListApplications.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListApplications(ctx context.Context, params *ListApplicationsI addawsAwsjson11_serdeOpListApplicationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_ListDeploymentConfigs.go b/service/codedeploy/api_op_ListDeploymentConfigs.go index 7f2da2d2fee..d3792373af2 100644 --- a/service/codedeploy/api_op_ListDeploymentConfigs.go +++ b/service/codedeploy/api_op_ListDeploymentConfigs.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListDeploymentConfigs(ctx context.Context, params *ListDeployme addawsAwsjson11_serdeOpListDeploymentConfigsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_ListDeploymentGroups.go b/service/codedeploy/api_op_ListDeploymentGroups.go index 303f4d57ab8..c7092dcabfd 100644 --- a/service/codedeploy/api_op_ListDeploymentGroups.go +++ b/service/codedeploy/api_op_ListDeploymentGroups.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ListDeploymentGroups(ctx context.Context, params *ListDeploymen addawsAwsjson11_serdeOpListDeploymentGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_ListDeploymentInstances.go b/service/codedeploy/api_op_ListDeploymentInstances.go index 5204ff46727..e174de35fdb 100644 --- a/service/codedeploy/api_op_ListDeploymentInstances.go +++ b/service/codedeploy/api_op_ListDeploymentInstances.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListDeploymentInstances(ctx context.Context, params *ListDeploy addawsAwsjson11_serdeOpListDeploymentInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_ListDeploymentTargets.go b/service/codedeploy/api_op_ListDeploymentTargets.go index bae1cbf73f4..9a133c5b180 100644 --- a/service/codedeploy/api_op_ListDeploymentTargets.go +++ b/service/codedeploy/api_op_ListDeploymentTargets.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListDeploymentTargets(ctx context.Context, params *ListDeployme addawsAwsjson11_serdeOpListDeploymentTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_ListDeployments.go b/service/codedeploy/api_op_ListDeployments.go index a157da78a93..60c911e7274 100644 --- a/service/codedeploy/api_op_ListDeployments.go +++ b/service/codedeploy/api_op_ListDeployments.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListDeployments(ctx context.Context, params *ListDeploymentsInp addawsAwsjson11_serdeOpListDeploymentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_ListGitHubAccountTokenNames.go b/service/codedeploy/api_op_ListGitHubAccountTokenNames.go index ae2f8676016..766e26d0ae0 100644 --- a/service/codedeploy/api_op_ListGitHubAccountTokenNames.go +++ b/service/codedeploy/api_op_ListGitHubAccountTokenNames.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListGitHubAccountTokenNames(ctx context.Context, params *ListGi addawsAwsjson11_serdeOpListGitHubAccountTokenNamesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_ListOnPremisesInstances.go b/service/codedeploy/api_op_ListOnPremisesInstances.go index 2fb63929bd3..4085b9957cb 100644 --- a/service/codedeploy/api_op_ListOnPremisesInstances.go +++ b/service/codedeploy/api_op_ListOnPremisesInstances.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListOnPremisesInstances(ctx context.Context, params *ListOnPrem addawsAwsjson11_serdeOpListOnPremisesInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_ListTagsForResource.go b/service/codedeploy/api_op_ListTagsForResource.go index f1d9b46d49f..12ea85f693b 100644 --- a/service/codedeploy/api_op_ListTagsForResource.go +++ b/service/codedeploy/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_PutLifecycleEventHookExecutionStatus.go b/service/codedeploy/api_op_PutLifecycleEventHookExecutionStatus.go index 6ad476c3bd9..64dcadb6b6f 100644 --- a/service/codedeploy/api_op_PutLifecycleEventHookExecutionStatus.go +++ b/service/codedeploy/api_op_PutLifecycleEventHookExecutionStatus.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) PutLifecycleEventHookExecutionStatus(ctx context.Context, param addawsAwsjson11_serdeOpPutLifecycleEventHookExecutionStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_RegisterApplicationRevision.go b/service/codedeploy/api_op_RegisterApplicationRevision.go index 17a2fbc52de..be2c395b177 100644 --- a/service/codedeploy/api_op_RegisterApplicationRevision.go +++ b/service/codedeploy/api_op_RegisterApplicationRevision.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RegisterApplicationRevision(ctx context.Context, params *Regist addawsAwsjson11_serdeOpRegisterApplicationRevisionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_RegisterOnPremisesInstance.go b/service/codedeploy/api_op_RegisterOnPremisesInstance.go index 569702bfb1d..027ad504803 100644 --- a/service/codedeploy/api_op_RegisterOnPremisesInstance.go +++ b/service/codedeploy/api_op_RegisterOnPremisesInstance.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) RegisterOnPremisesInstance(ctx context.Context, params *Registe addawsAwsjson11_serdeOpRegisterOnPremisesInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_RemoveTagsFromOnPremisesInstances.go b/service/codedeploy/api_op_RemoveTagsFromOnPremisesInstances.go index 5adf5f7ea3d..0e3b168cbf1 100644 --- a/service/codedeploy/api_op_RemoveTagsFromOnPremisesInstances.go +++ b/service/codedeploy/api_op_RemoveTagsFromOnPremisesInstances.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RemoveTagsFromOnPremisesInstances(ctx context.Context, params * addawsAwsjson11_serdeOpRemoveTagsFromOnPremisesInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_SkipWaitTimeForInstanceTermination.go b/service/codedeploy/api_op_SkipWaitTimeForInstanceTermination.go index c25eab8513f..9ab2d733d48 100644 --- a/service/codedeploy/api_op_SkipWaitTimeForInstanceTermination.go +++ b/service/codedeploy/api_op_SkipWaitTimeForInstanceTermination.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) SkipWaitTimeForInstanceTermination(ctx context.Context, params addawsAwsjson11_serdeOpSkipWaitTimeForInstanceTerminationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_StopDeployment.go b/service/codedeploy/api_op_StopDeployment.go index e2227bf38a0..128a5355f7a 100644 --- a/service/codedeploy/api_op_StopDeployment.go +++ b/service/codedeploy/api_op_StopDeployment.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StopDeployment(ctx context.Context, params *StopDeploymentInput addawsAwsjson11_serdeOpStopDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_TagResource.go b/service/codedeploy/api_op_TagResource.go index 14e46da7dee..2562a80ffec 100644 --- a/service/codedeploy/api_op_TagResource.go +++ b/service/codedeploy/api_op_TagResource.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_UntagResource.go b/service/codedeploy/api_op_UntagResource.go index e6673cf2cc1..f1ce7ff2779 100644 --- a/service/codedeploy/api_op_UntagResource.go +++ b/service/codedeploy/api_op_UntagResource.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_UpdateApplication.go b/service/codedeploy/api_op_UpdateApplication.go index 62ea1abe06f..7496af803e1 100644 --- a/service/codedeploy/api_op_UpdateApplication.go +++ b/service/codedeploy/api_op_UpdateApplication.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateApplication(ctx context.Context, params *UpdateApplicatio addawsAwsjson11_serdeOpUpdateApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/api_op_UpdateDeploymentGroup.go b/service/codedeploy/api_op_UpdateDeploymentGroup.go index 6a5f6eea93f..aa8409c41b5 100644 --- a/service/codedeploy/api_op_UpdateDeploymentGroup.go +++ b/service/codedeploy/api_op_UpdateDeploymentGroup.go @@ -5,7 +5,6 @@ package codedeploy import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codedeploy/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDeploymentGroup(ctx context.Context, params *UpdateDeploy addawsAwsjson11_serdeOpUpdateDeploymentGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codedeploy/endpoints.go b/service/codedeploy/endpoints.go index 3208609f28d..ea4aad0f31f 100644 --- a/service/codedeploy/endpoints.go +++ b/service/codedeploy/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/codeguruprofiler/api_client.go b/service/codeguruprofiler/api_client.go index 9760d947931..03e5d811c03 100644 --- a/service/codeguruprofiler/api_client.go +++ b/service/codeguruprofiler/api_client.go @@ -78,30 +78,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -167,6 +143,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/codeguruprofiler/api_op_ConfigureAgent.go b/service/codeguruprofiler/api_op_ConfigureAgent.go index a939db05745..58ebbff50db 100644 --- a/service/codeguruprofiler/api_op_ConfigureAgent.go +++ b/service/codeguruprofiler/api_op_ConfigureAgent.go @@ -5,7 +5,6 @@ package codeguruprofiler import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeguruprofiler/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ConfigureAgent(ctx context.Context, params *ConfigureAgentInput addawsRestjson1_serdeOpConfigureAgentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeguruprofiler/api_op_CreateProfilingGroup.go b/service/codeguruprofiler/api_op_CreateProfilingGroup.go index 417f97cd5e9..e06c92abc46 100644 --- a/service/codeguruprofiler/api_op_CreateProfilingGroup.go +++ b/service/codeguruprofiler/api_op_CreateProfilingGroup.go @@ -5,7 +5,6 @@ package codeguruprofiler import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeguruprofiler/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateProfilingGroup(ctx context.Context, params *CreateProfili addawsRestjson1_serdeOpCreateProfilingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeguruprofiler/api_op_DeleteProfilingGroup.go b/service/codeguruprofiler/api_op_DeleteProfilingGroup.go index f12cd6abf3c..a294935bc9c 100644 --- a/service/codeguruprofiler/api_op_DeleteProfilingGroup.go +++ b/service/codeguruprofiler/api_op_DeleteProfilingGroup.go @@ -5,7 +5,6 @@ package codeguruprofiler import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteProfilingGroup(ctx context.Context, params *DeleteProfili addawsRestjson1_serdeOpDeleteProfilingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeguruprofiler/api_op_DescribeProfilingGroup.go b/service/codeguruprofiler/api_op_DescribeProfilingGroup.go index 749943fa9a1..f4d3a07c973 100644 --- a/service/codeguruprofiler/api_op_DescribeProfilingGroup.go +++ b/service/codeguruprofiler/api_op_DescribeProfilingGroup.go @@ -5,7 +5,6 @@ package codeguruprofiler import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeguruprofiler/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeProfilingGroup(ctx context.Context, params *DescribePro addawsRestjson1_serdeOpDescribeProfilingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeguruprofiler/api_op_GetPolicy.go b/service/codeguruprofiler/api_op_GetPolicy.go index 8574ddb4c65..5e0ad9c49bf 100644 --- a/service/codeguruprofiler/api_op_GetPolicy.go +++ b/service/codeguruprofiler/api_op_GetPolicy.go @@ -5,7 +5,6 @@ package codeguruprofiler import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetPolicy(ctx context.Context, params *GetPolicyInput, optFns . addawsRestjson1_serdeOpGetPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeguruprofiler/api_op_GetProfile.go b/service/codeguruprofiler/api_op_GetProfile.go index 5f2fa7be760..c391c848aca 100644 --- a/service/codeguruprofiler/api_op_GetProfile.go +++ b/service/codeguruprofiler/api_op_GetProfile.go @@ -5,7 +5,6 @@ package codeguruprofiler import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) GetProfile(ctx context.Context, params *GetProfileInput, optFns addawsRestjson1_serdeOpGetProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeguruprofiler/api_op_ListProfileTimes.go b/service/codeguruprofiler/api_op_ListProfileTimes.go index f89388d0853..bca0c0f9b54 100644 --- a/service/codeguruprofiler/api_op_ListProfileTimes.go +++ b/service/codeguruprofiler/api_op_ListProfileTimes.go @@ -5,7 +5,6 @@ package codeguruprofiler import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeguruprofiler/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListProfileTimes(ctx context.Context, params *ListProfileTimesI addawsRestjson1_serdeOpListProfileTimesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeguruprofiler/api_op_ListProfilingGroups.go b/service/codeguruprofiler/api_op_ListProfilingGroups.go index 262d7ca4e01..36a69599131 100644 --- a/service/codeguruprofiler/api_op_ListProfilingGroups.go +++ b/service/codeguruprofiler/api_op_ListProfilingGroups.go @@ -5,7 +5,6 @@ package codeguruprofiler import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeguruprofiler/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListProfilingGroups(ctx context.Context, params *ListProfilingG addawsRestjson1_serdeOpListProfilingGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeguruprofiler/api_op_PostAgentProfile.go b/service/codeguruprofiler/api_op_PostAgentProfile.go index 1ec9b5f9b3f..d1ec4fd9bff 100644 --- a/service/codeguruprofiler/api_op_PostAgentProfile.go +++ b/service/codeguruprofiler/api_op_PostAgentProfile.go @@ -5,7 +5,6 @@ package codeguruprofiler import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) PostAgentProfile(ctx context.Context, params *PostAgentProfileI addawsRestjson1_serdeOpPostAgentProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeguruprofiler/api_op_PutPermission.go b/service/codeguruprofiler/api_op_PutPermission.go index 86a254427f4..521138485b5 100644 --- a/service/codeguruprofiler/api_op_PutPermission.go +++ b/service/codeguruprofiler/api_op_PutPermission.go @@ -5,7 +5,6 @@ package codeguruprofiler import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeguruprofiler/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutPermission(ctx context.Context, params *PutPermissionInput, addawsRestjson1_serdeOpPutPermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeguruprofiler/api_op_RemovePermission.go b/service/codeguruprofiler/api_op_RemovePermission.go index 2376cda861c..ae4b54e18a9 100644 --- a/service/codeguruprofiler/api_op_RemovePermission.go +++ b/service/codeguruprofiler/api_op_RemovePermission.go @@ -5,7 +5,6 @@ package codeguruprofiler import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeguruprofiler/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RemovePermission(ctx context.Context, params *RemovePermissionI addawsRestjson1_serdeOpRemovePermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeguruprofiler/api_op_RetrieveTimeSeries.go b/service/codeguruprofiler/api_op_RetrieveTimeSeries.go index e41134eb891..a27f467bb95 100644 --- a/service/codeguruprofiler/api_op_RetrieveTimeSeries.go +++ b/service/codeguruprofiler/api_op_RetrieveTimeSeries.go @@ -5,7 +5,6 @@ package codeguruprofiler import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeguruprofiler/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RetrieveTimeSeries(ctx context.Context, params *RetrieveTimeSer addawsRestjson1_serdeOpRetrieveTimeSeriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeguruprofiler/api_op_UpdateProfilingGroup.go b/service/codeguruprofiler/api_op_UpdateProfilingGroup.go index e515ba442d2..5be4bbdd1c1 100644 --- a/service/codeguruprofiler/api_op_UpdateProfilingGroup.go +++ b/service/codeguruprofiler/api_op_UpdateProfilingGroup.go @@ -5,7 +5,6 @@ package codeguruprofiler import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codeguruprofiler/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateProfilingGroup(ctx context.Context, params *UpdateProfili addawsRestjson1_serdeOpUpdateProfilingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codeguruprofiler/endpoints.go b/service/codeguruprofiler/endpoints.go index 1b28f65cf08..4cbdfeb9da1 100644 --- a/service/codeguruprofiler/endpoints.go +++ b/service/codeguruprofiler/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/codegurureviewer/api_client.go b/service/codegurureviewer/api_client.go index 8b9251aebcc..b79dcf2746f 100644 --- a/service/codegurureviewer/api_client.go +++ b/service/codegurureviewer/api_client.go @@ -94,34 +94,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -194,6 +166,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/codegurureviewer/api_op_AssociateRepository.go b/service/codegurureviewer/api_op_AssociateRepository.go index 24894955c1f..611922f2ec9 100644 --- a/service/codegurureviewer/api_op_AssociateRepository.go +++ b/service/codegurureviewer/api_op_AssociateRepository.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codegurureviewer/types" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) AssociateRepository(ctx context.Context, params *AssociateRepos addawsRestjson1_serdeOpAssociateRepositoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codegurureviewer/api_op_DescribeCodeReview.go b/service/codegurureviewer/api_op_DescribeCodeReview.go index aef5c1219d4..097b453a7fb 100644 --- a/service/codegurureviewer/api_op_DescribeCodeReview.go +++ b/service/codegurureviewer/api_op_DescribeCodeReview.go @@ -5,7 +5,6 @@ package codegurureviewer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codegurureviewer/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeCodeReview(ctx context.Context, params *DescribeCodeRev addawsRestjson1_serdeOpDescribeCodeReviewMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codegurureviewer/api_op_DescribeRecommendationFeedback.go b/service/codegurureviewer/api_op_DescribeRecommendationFeedback.go index 7d256818c3e..ab35c2e3ccf 100644 --- a/service/codegurureviewer/api_op_DescribeRecommendationFeedback.go +++ b/service/codegurureviewer/api_op_DescribeRecommendationFeedback.go @@ -5,7 +5,6 @@ package codegurureviewer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codegurureviewer/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeRecommendationFeedback(ctx context.Context, params *Des addawsRestjson1_serdeOpDescribeRecommendationFeedbackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codegurureviewer/api_op_DescribeRepositoryAssociation.go b/service/codegurureviewer/api_op_DescribeRepositoryAssociation.go index b099f81955c..60710ac0007 100644 --- a/service/codegurureviewer/api_op_DescribeRepositoryAssociation.go +++ b/service/codegurureviewer/api_op_DescribeRepositoryAssociation.go @@ -5,7 +5,6 @@ package codegurureviewer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codegurureviewer/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeRepositoryAssociation(ctx context.Context, params *Desc addawsRestjson1_serdeOpDescribeRepositoryAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codegurureviewer/api_op_DisassociateRepository.go b/service/codegurureviewer/api_op_DisassociateRepository.go index 981ca3aab38..aa72a8265fb 100644 --- a/service/codegurureviewer/api_op_DisassociateRepository.go +++ b/service/codegurureviewer/api_op_DisassociateRepository.go @@ -5,7 +5,6 @@ package codegurureviewer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codegurureviewer/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DisassociateRepository(ctx context.Context, params *Disassociat addawsRestjson1_serdeOpDisassociateRepositoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codegurureviewer/api_op_ListCodeReviews.go b/service/codegurureviewer/api_op_ListCodeReviews.go index ed2d9106fdd..d7ee9c7071a 100644 --- a/service/codegurureviewer/api_op_ListCodeReviews.go +++ b/service/codegurureviewer/api_op_ListCodeReviews.go @@ -5,7 +5,6 @@ package codegurureviewer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codegurureviewer/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListCodeReviews(ctx context.Context, params *ListCodeReviewsInp addawsRestjson1_serdeOpListCodeReviewsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codegurureviewer/api_op_ListRecommendationFeedback.go b/service/codegurureviewer/api_op_ListRecommendationFeedback.go index 9b7323ead88..0f7d0175167 100644 --- a/service/codegurureviewer/api_op_ListRecommendationFeedback.go +++ b/service/codegurureviewer/api_op_ListRecommendationFeedback.go @@ -5,7 +5,6 @@ package codegurureviewer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codegurureviewer/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListRecommendationFeedback(ctx context.Context, params *ListRec addawsRestjson1_serdeOpListRecommendationFeedbackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codegurureviewer/api_op_ListRecommendations.go b/service/codegurureviewer/api_op_ListRecommendations.go index 1ed509a628a..1a24a8dd3d4 100644 --- a/service/codegurureviewer/api_op_ListRecommendations.go +++ b/service/codegurureviewer/api_op_ListRecommendations.go @@ -5,7 +5,6 @@ package codegurureviewer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codegurureviewer/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListRecommendations(ctx context.Context, params *ListRecommenda addawsRestjson1_serdeOpListRecommendationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codegurureviewer/api_op_ListRepositoryAssociations.go b/service/codegurureviewer/api_op_ListRepositoryAssociations.go index a5b018bfdf2..ac62fd9b2ad 100644 --- a/service/codegurureviewer/api_op_ListRepositoryAssociations.go +++ b/service/codegurureviewer/api_op_ListRepositoryAssociations.go @@ -5,7 +5,6 @@ package codegurureviewer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codegurureviewer/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) ListRepositoryAssociations(ctx context.Context, params *ListRep addawsRestjson1_serdeOpListRepositoryAssociationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codegurureviewer/api_op_PutRecommendationFeedback.go b/service/codegurureviewer/api_op_PutRecommendationFeedback.go index 6f7b94872a3..54597b7c3ed 100644 --- a/service/codegurureviewer/api_op_PutRecommendationFeedback.go +++ b/service/codegurureviewer/api_op_PutRecommendationFeedback.go @@ -5,7 +5,6 @@ package codegurureviewer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codegurureviewer/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutRecommendationFeedback(ctx context.Context, params *PutRecom addawsRestjson1_serdeOpPutRecommendationFeedbackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codegurureviewer/endpoints.go b/service/codegurureviewer/endpoints.go index 3166c0046ac..b1dd9c4074f 100644 --- a/service/codegurureviewer/endpoints.go +++ b/service/codegurureviewer/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/codepipeline/api_client.go b/service/codepipeline/api_client.go index 1f1f1a65890..61a248ce09c 100644 --- a/service/codepipeline/api_client.go +++ b/service/codepipeline/api_client.go @@ -219,34 +219,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -319,6 +291,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/codepipeline/api_op_AcknowledgeJob.go b/service/codepipeline/api_op_AcknowledgeJob.go index 3189cdbfe25..d8dcc259855 100644 --- a/service/codepipeline/api_op_AcknowledgeJob.go +++ b/service/codepipeline/api_op_AcknowledgeJob.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AcknowledgeJob(ctx context.Context, params *AcknowledgeJobInput addawsAwsjson11_serdeOpAcknowledgeJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_AcknowledgeThirdPartyJob.go b/service/codepipeline/api_op_AcknowledgeThirdPartyJob.go index 556f446243f..59a9cea18a6 100644 --- a/service/codepipeline/api_op_AcknowledgeThirdPartyJob.go +++ b/service/codepipeline/api_op_AcknowledgeThirdPartyJob.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AcknowledgeThirdPartyJob(ctx context.Context, params *Acknowled addawsAwsjson11_serdeOpAcknowledgeThirdPartyJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_CreateCustomActionType.go b/service/codepipeline/api_op_CreateCustomActionType.go index 634d06be5ec..251982e70e1 100644 --- a/service/codepipeline/api_op_CreateCustomActionType.go +++ b/service/codepipeline/api_op_CreateCustomActionType.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateCustomActionType(ctx context.Context, params *CreateCusto addawsAwsjson11_serdeOpCreateCustomActionTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_CreatePipeline.go b/service/codepipeline/api_op_CreatePipeline.go index 9485536cf6e..b646d4f8b36 100644 --- a/service/codepipeline/api_op_CreatePipeline.go +++ b/service/codepipeline/api_op_CreatePipeline.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreatePipeline(ctx context.Context, params *CreatePipelineInput addawsAwsjson11_serdeOpCreatePipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_DeleteCustomActionType.go b/service/codepipeline/api_op_DeleteCustomActionType.go index 94f9a0015ca..16c890dd3f4 100644 --- a/service/codepipeline/api_op_DeleteCustomActionType.go +++ b/service/codepipeline/api_op_DeleteCustomActionType.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DeleteCustomActionType(ctx context.Context, params *DeleteCusto addawsAwsjson11_serdeOpDeleteCustomActionTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_DeletePipeline.go b/service/codepipeline/api_op_DeletePipeline.go index 9716ac9bb7e..7256bbebb3b 100644 --- a/service/codepipeline/api_op_DeletePipeline.go +++ b/service/codepipeline/api_op_DeletePipeline.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeletePipeline(ctx context.Context, params *DeletePipelineInput addawsAwsjson11_serdeOpDeletePipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_DeleteWebhook.go b/service/codepipeline/api_op_DeleteWebhook.go index 414208bc7b4..09360e5cfa0 100644 --- a/service/codepipeline/api_op_DeleteWebhook.go +++ b/service/codepipeline/api_op_DeleteWebhook.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteWebhook(ctx context.Context, params *DeleteWebhookInput, addawsAwsjson11_serdeOpDeleteWebhookMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_DeregisterWebhookWithThirdParty.go b/service/codepipeline/api_op_DeregisterWebhookWithThirdParty.go index f5192a071be..1eaa09d213f 100644 --- a/service/codepipeline/api_op_DeregisterWebhookWithThirdParty.go +++ b/service/codepipeline/api_op_DeregisterWebhookWithThirdParty.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeregisterWebhookWithThirdParty(ctx context.Context, params *De addawsAwsjson11_serdeOpDeregisterWebhookWithThirdPartyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_DisableStageTransition.go b/service/codepipeline/api_op_DisableStageTransition.go index d9faa3692cc..d088133c4f8 100644 --- a/service/codepipeline/api_op_DisableStageTransition.go +++ b/service/codepipeline/api_op_DisableStageTransition.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DisableStageTransition(ctx context.Context, params *DisableStag addawsAwsjson11_serdeOpDisableStageTransitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_EnableStageTransition.go b/service/codepipeline/api_op_EnableStageTransition.go index 330c70f78cd..73c8c268504 100644 --- a/service/codepipeline/api_op_EnableStageTransition.go +++ b/service/codepipeline/api_op_EnableStageTransition.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) EnableStageTransition(ctx context.Context, params *EnableStageT addawsAwsjson11_serdeOpEnableStageTransitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_GetJobDetails.go b/service/codepipeline/api_op_GetJobDetails.go index b1b0cb87433..563e26d65a3 100644 --- a/service/codepipeline/api_op_GetJobDetails.go +++ b/service/codepipeline/api_op_GetJobDetails.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetJobDetails(ctx context.Context, params *GetJobDetailsInput, addawsAwsjson11_serdeOpGetJobDetailsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_GetPipeline.go b/service/codepipeline/api_op_GetPipeline.go index 7efc5bce9aa..de6555bb1b3 100644 --- a/service/codepipeline/api_op_GetPipeline.go +++ b/service/codepipeline/api_op_GetPipeline.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetPipeline(ctx context.Context, params *GetPipelineInput, optF addawsAwsjson11_serdeOpGetPipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_GetPipelineExecution.go b/service/codepipeline/api_op_GetPipelineExecution.go index b06725c52b9..b43cc38dfb0 100644 --- a/service/codepipeline/api_op_GetPipelineExecution.go +++ b/service/codepipeline/api_op_GetPipelineExecution.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetPipelineExecution(ctx context.Context, params *GetPipelineEx addawsAwsjson11_serdeOpGetPipelineExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_GetPipelineState.go b/service/codepipeline/api_op_GetPipelineState.go index af6eb54328e..9503f61b085 100644 --- a/service/codepipeline/api_op_GetPipelineState.go +++ b/service/codepipeline/api_op_GetPipelineState.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetPipelineState(ctx context.Context, params *GetPipelineStateI addawsAwsjson11_serdeOpGetPipelineStateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_GetThirdPartyJobDetails.go b/service/codepipeline/api_op_GetThirdPartyJobDetails.go index 44435fc4760..4645056d591 100644 --- a/service/codepipeline/api_op_GetThirdPartyJobDetails.go +++ b/service/codepipeline/api_op_GetThirdPartyJobDetails.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetThirdPartyJobDetails(ctx context.Context, params *GetThirdPa addawsAwsjson11_serdeOpGetThirdPartyJobDetailsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_ListActionExecutions.go b/service/codepipeline/api_op_ListActionExecutions.go index a58b34abad0..37e30157184 100644 --- a/service/codepipeline/api_op_ListActionExecutions.go +++ b/service/codepipeline/api_op_ListActionExecutions.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListActionExecutions(ctx context.Context, params *ListActionExe addawsAwsjson11_serdeOpListActionExecutionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_ListActionTypes.go b/service/codepipeline/api_op_ListActionTypes.go index 863639e095f..948e86ac4d1 100644 --- a/service/codepipeline/api_op_ListActionTypes.go +++ b/service/codepipeline/api_op_ListActionTypes.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListActionTypes(ctx context.Context, params *ListActionTypesInp addawsAwsjson11_serdeOpListActionTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_ListPipelineExecutions.go b/service/codepipeline/api_op_ListPipelineExecutions.go index 538d43a9858..b042537da0d 100644 --- a/service/codepipeline/api_op_ListPipelineExecutions.go +++ b/service/codepipeline/api_op_ListPipelineExecutions.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListPipelineExecutions(ctx context.Context, params *ListPipelin addawsAwsjson11_serdeOpListPipelineExecutionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_ListPipelines.go b/service/codepipeline/api_op_ListPipelines.go index 40ceb960a92..33254bf55f7 100644 --- a/service/codepipeline/api_op_ListPipelines.go +++ b/service/codepipeline/api_op_ListPipelines.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListPipelines(ctx context.Context, params *ListPipelinesInput, addawsAwsjson11_serdeOpListPipelinesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_ListTagsForResource.go b/service/codepipeline/api_op_ListTagsForResource.go index 2edf26455d3..4f7a5628bb8 100644 --- a/service/codepipeline/api_op_ListTagsForResource.go +++ b/service/codepipeline/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_ListWebhooks.go b/service/codepipeline/api_op_ListWebhooks.go index ff5b1de0813..fabad013a6d 100644 --- a/service/codepipeline/api_op_ListWebhooks.go +++ b/service/codepipeline/api_op_ListWebhooks.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListWebhooks(ctx context.Context, params *ListWebhooksInput, op addawsAwsjson11_serdeOpListWebhooksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_PollForJobs.go b/service/codepipeline/api_op_PollForJobs.go index 106d8531ba4..9a68ef170b2 100644 --- a/service/codepipeline/api_op_PollForJobs.go +++ b/service/codepipeline/api_op_PollForJobs.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) PollForJobs(ctx context.Context, params *PollForJobsInput, optF addawsAwsjson11_serdeOpPollForJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_PollForThirdPartyJobs.go b/service/codepipeline/api_op_PollForThirdPartyJobs.go index 25bea712b5e..edf01e65fe8 100644 --- a/service/codepipeline/api_op_PollForThirdPartyJobs.go +++ b/service/codepipeline/api_op_PollForThirdPartyJobs.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) PollForThirdPartyJobs(ctx context.Context, params *PollForThird addawsAwsjson11_serdeOpPollForThirdPartyJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_PutActionRevision.go b/service/codepipeline/api_op_PutActionRevision.go index 7ab60cf8446..53aa04628b9 100644 --- a/service/codepipeline/api_op_PutActionRevision.go +++ b/service/codepipeline/api_op_PutActionRevision.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutActionRevision(ctx context.Context, params *PutActionRevisio addawsAwsjson11_serdeOpPutActionRevisionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_PutApprovalResult.go b/service/codepipeline/api_op_PutApprovalResult.go index e8b7501a46b..3b365f59040 100644 --- a/service/codepipeline/api_op_PutApprovalResult.go +++ b/service/codepipeline/api_op_PutApprovalResult.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) PutApprovalResult(ctx context.Context, params *PutApprovalResul addawsAwsjson11_serdeOpPutApprovalResultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_PutJobFailureResult.go b/service/codepipeline/api_op_PutJobFailureResult.go index 3800015571a..c2d95011b1b 100644 --- a/service/codepipeline/api_op_PutJobFailureResult.go +++ b/service/codepipeline/api_op_PutJobFailureResult.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutJobFailureResult(ctx context.Context, params *PutJobFailureR addawsAwsjson11_serdeOpPutJobFailureResultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_PutJobSuccessResult.go b/service/codepipeline/api_op_PutJobSuccessResult.go index 00ae4631d52..752b03d9687 100644 --- a/service/codepipeline/api_op_PutJobSuccessResult.go +++ b/service/codepipeline/api_op_PutJobSuccessResult.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutJobSuccessResult(ctx context.Context, params *PutJobSuccessR addawsAwsjson11_serdeOpPutJobSuccessResultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_PutThirdPartyJobFailureResult.go b/service/codepipeline/api_op_PutThirdPartyJobFailureResult.go index 6667392d91a..a0a22023ade 100644 --- a/service/codepipeline/api_op_PutThirdPartyJobFailureResult.go +++ b/service/codepipeline/api_op_PutThirdPartyJobFailureResult.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutThirdPartyJobFailureResult(ctx context.Context, params *PutT addawsAwsjson11_serdeOpPutThirdPartyJobFailureResultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_PutThirdPartyJobSuccessResult.go b/service/codepipeline/api_op_PutThirdPartyJobSuccessResult.go index c15fb94a6ef..22419bbe82d 100644 --- a/service/codepipeline/api_op_PutThirdPartyJobSuccessResult.go +++ b/service/codepipeline/api_op_PutThirdPartyJobSuccessResult.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutThirdPartyJobSuccessResult(ctx context.Context, params *PutT addawsAwsjson11_serdeOpPutThirdPartyJobSuccessResultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_PutWebhook.go b/service/codepipeline/api_op_PutWebhook.go index 4e76d6ef616..39b1060dff6 100644 --- a/service/codepipeline/api_op_PutWebhook.go +++ b/service/codepipeline/api_op_PutWebhook.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) PutWebhook(ctx context.Context, params *PutWebhookInput, optFns addawsAwsjson11_serdeOpPutWebhookMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_RegisterWebhookWithThirdParty.go b/service/codepipeline/api_op_RegisterWebhookWithThirdParty.go index 87f5bdde58b..438875449b5 100644 --- a/service/codepipeline/api_op_RegisterWebhookWithThirdParty.go +++ b/service/codepipeline/api_op_RegisterWebhookWithThirdParty.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) RegisterWebhookWithThirdParty(ctx context.Context, params *Regi addawsAwsjson11_serdeOpRegisterWebhookWithThirdPartyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_RetryStageExecution.go b/service/codepipeline/api_op_RetryStageExecution.go index 97508854c4f..c6f55bf93f7 100644 --- a/service/codepipeline/api_op_RetryStageExecution.go +++ b/service/codepipeline/api_op_RetryStageExecution.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) RetryStageExecution(ctx context.Context, params *RetryStageExec addawsAwsjson11_serdeOpRetryStageExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_StartPipelineExecution.go b/service/codepipeline/api_op_StartPipelineExecution.go index e4be35698ad..5c188f277ff 100644 --- a/service/codepipeline/api_op_StartPipelineExecution.go +++ b/service/codepipeline/api_op_StartPipelineExecution.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) StartPipelineExecution(ctx context.Context, params *StartPipeli addawsAwsjson11_serdeOpStartPipelineExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_StopPipelineExecution.go b/service/codepipeline/api_op_StopPipelineExecution.go index 1b067b19172..37a8ac49de3 100644 --- a/service/codepipeline/api_op_StopPipelineExecution.go +++ b/service/codepipeline/api_op_StopPipelineExecution.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) StopPipelineExecution(ctx context.Context, params *StopPipeline addawsAwsjson11_serdeOpStopPipelineExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_TagResource.go b/service/codepipeline/api_op_TagResource.go index 343946a8099..70d876d3e30 100644 --- a/service/codepipeline/api_op_TagResource.go +++ b/service/codepipeline/api_op_TagResource.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_UntagResource.go b/service/codepipeline/api_op_UntagResource.go index 7c9a531a863..d3e3933a4f1 100644 --- a/service/codepipeline/api_op_UntagResource.go +++ b/service/codepipeline/api_op_UntagResource.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/api_op_UpdatePipeline.go b/service/codepipeline/api_op_UpdatePipeline.go index b96066f925b..b35bc5b4e42 100644 --- a/service/codepipeline/api_op_UpdatePipeline.go +++ b/service/codepipeline/api_op_UpdatePipeline.go @@ -5,7 +5,6 @@ package codepipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdatePipeline(ctx context.Context, params *UpdatePipelineInput addawsAwsjson11_serdeOpUpdatePipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codepipeline/endpoints.go b/service/codepipeline/endpoints.go index 624902b2dd7..a710d31001d 100644 --- a/service/codepipeline/endpoints.go +++ b/service/codepipeline/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/codestar/api_client.go b/service/codestar/api_client.go index 7fe57547a72..553eb8c787f 100644 --- a/service/codestar/api_client.go +++ b/service/codestar/api_client.go @@ -135,30 +135,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -224,6 +200,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/codestar/api_op_AssociateTeamMember.go b/service/codestar/api_op_AssociateTeamMember.go index 623a4b65822..d9231f1e2bb 100644 --- a/service/codestar/api_op_AssociateTeamMember.go +++ b/service/codestar/api_op_AssociateTeamMember.go @@ -5,7 +5,6 @@ package codestar import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AssociateTeamMember(ctx context.Context, params *AssociateTeamM addawsAwsjson11_serdeOpAssociateTeamMemberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestar/api_op_CreateProject.go b/service/codestar/api_op_CreateProject.go index 12cf176de27..9fd72242f67 100644 --- a/service/codestar/api_op_CreateProject.go +++ b/service/codestar/api_op_CreateProject.go @@ -5,7 +5,6 @@ package codestar import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestar/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateProject(ctx context.Context, params *CreateProjectInput, addawsAwsjson11_serdeOpCreateProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestar/api_op_CreateUserProfile.go b/service/codestar/api_op_CreateUserProfile.go index cb0ba813565..fa655387a81 100644 --- a/service/codestar/api_op_CreateUserProfile.go +++ b/service/codestar/api_op_CreateUserProfile.go @@ -5,7 +5,6 @@ package codestar import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) CreateUserProfile(ctx context.Context, params *CreateUserProfil addawsAwsjson11_serdeOpCreateUserProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestar/api_op_DeleteProject.go b/service/codestar/api_op_DeleteProject.go index fe6a1cdf837..49467f03591 100644 --- a/service/codestar/api_op_DeleteProject.go +++ b/service/codestar/api_op_DeleteProject.go @@ -5,7 +5,6 @@ package codestar import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteProject(ctx context.Context, params *DeleteProjectInput, addawsAwsjson11_serdeOpDeleteProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestar/api_op_DeleteUserProfile.go b/service/codestar/api_op_DeleteUserProfile.go index 78dade35ce1..cdc02da6ebc 100644 --- a/service/codestar/api_op_DeleteUserProfile.go +++ b/service/codestar/api_op_DeleteUserProfile.go @@ -5,7 +5,6 @@ package codestar import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteUserProfile(ctx context.Context, params *DeleteUserProfil addawsAwsjson11_serdeOpDeleteUserProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestar/api_op_DescribeProject.go b/service/codestar/api_op_DescribeProject.go index 4fd230118b9..1a12c22c646 100644 --- a/service/codestar/api_op_DescribeProject.go +++ b/service/codestar/api_op_DescribeProject.go @@ -5,7 +5,6 @@ package codestar import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestar/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeProject(ctx context.Context, params *DescribeProjectInp addawsAwsjson11_serdeOpDescribeProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestar/api_op_DescribeUserProfile.go b/service/codestar/api_op_DescribeUserProfile.go index 62080f5fb49..e7dbbae4d2f 100644 --- a/service/codestar/api_op_DescribeUserProfile.go +++ b/service/codestar/api_op_DescribeUserProfile.go @@ -5,7 +5,6 @@ package codestar import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DescribeUserProfile(ctx context.Context, params *DescribeUserPr addawsAwsjson11_serdeOpDescribeUserProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestar/api_op_DisassociateTeamMember.go b/service/codestar/api_op_DisassociateTeamMember.go index f5fcbb8433f..18bb9c9fd10 100644 --- a/service/codestar/api_op_DisassociateTeamMember.go +++ b/service/codestar/api_op_DisassociateTeamMember.go @@ -5,7 +5,6 @@ package codestar import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DisassociateTeamMember(ctx context.Context, params *Disassociat addawsAwsjson11_serdeOpDisassociateTeamMemberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestar/api_op_ListProjects.go b/service/codestar/api_op_ListProjects.go index 13a4d75f84a..a76ebadbfd7 100644 --- a/service/codestar/api_op_ListProjects.go +++ b/service/codestar/api_op_ListProjects.go @@ -5,7 +5,6 @@ package codestar import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestar/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListProjects(ctx context.Context, params *ListProjectsInput, op addawsAwsjson11_serdeOpListProjectsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestar/api_op_ListResources.go b/service/codestar/api_op_ListResources.go index 816632e815e..88e2758688c 100644 --- a/service/codestar/api_op_ListResources.go +++ b/service/codestar/api_op_ListResources.go @@ -5,7 +5,6 @@ package codestar import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestar/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListResources(ctx context.Context, params *ListResourcesInput, addawsAwsjson11_serdeOpListResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestar/api_op_ListTagsForProject.go b/service/codestar/api_op_ListTagsForProject.go index 3ec2da7cdc1..ae5f05c2373 100644 --- a/service/codestar/api_op_ListTagsForProject.go +++ b/service/codestar/api_op_ListTagsForProject.go @@ -5,7 +5,6 @@ package codestar import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForProject(ctx context.Context, params *ListTagsForProj addawsAwsjson11_serdeOpListTagsForProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestar/api_op_ListTeamMembers.go b/service/codestar/api_op_ListTeamMembers.go index aa8dfb07492..d3ea9bbc9d6 100644 --- a/service/codestar/api_op_ListTeamMembers.go +++ b/service/codestar/api_op_ListTeamMembers.go @@ -5,7 +5,6 @@ package codestar import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestar/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTeamMembers(ctx context.Context, params *ListTeamMembersInp addawsAwsjson11_serdeOpListTeamMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestar/api_op_ListUserProfiles.go b/service/codestar/api_op_ListUserProfiles.go index c16c034315c..5f590c9bc03 100644 --- a/service/codestar/api_op_ListUserProfiles.go +++ b/service/codestar/api_op_ListUserProfiles.go @@ -5,7 +5,6 @@ package codestar import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestar/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListUserProfiles(ctx context.Context, params *ListUserProfilesI addawsAwsjson11_serdeOpListUserProfilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestar/api_op_TagProject.go b/service/codestar/api_op_TagProject.go index a98840e909d..09685a0cc84 100644 --- a/service/codestar/api_op_TagProject.go +++ b/service/codestar/api_op_TagProject.go @@ -5,7 +5,6 @@ package codestar import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagProject(ctx context.Context, params *TagProjectInput, optFns addawsAwsjson11_serdeOpTagProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestar/api_op_UntagProject.go b/service/codestar/api_op_UntagProject.go index 23b2946ff78..d7acf49d175 100644 --- a/service/codestar/api_op_UntagProject.go +++ b/service/codestar/api_op_UntagProject.go @@ -5,7 +5,6 @@ package codestar import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagProject(ctx context.Context, params *UntagProjectInput, op addawsAwsjson11_serdeOpUntagProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestar/api_op_UpdateProject.go b/service/codestar/api_op_UpdateProject.go index 1c6a94feb6d..a2d64f7e86a 100644 --- a/service/codestar/api_op_UpdateProject.go +++ b/service/codestar/api_op_UpdateProject.go @@ -5,7 +5,6 @@ package codestar import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateProject(ctx context.Context, params *UpdateProjectInput, addawsAwsjson11_serdeOpUpdateProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestar/api_op_UpdateTeamMember.go b/service/codestar/api_op_UpdateTeamMember.go index c1008e5c989..b02a698d731 100644 --- a/service/codestar/api_op_UpdateTeamMember.go +++ b/service/codestar/api_op_UpdateTeamMember.go @@ -5,7 +5,6 @@ package codestar import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) UpdateTeamMember(ctx context.Context, params *UpdateTeamMemberI addawsAwsjson11_serdeOpUpdateTeamMemberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestar/api_op_UpdateUserProfile.go b/service/codestar/api_op_UpdateUserProfile.go index 28adf8c4eeb..d85a2ae71ed 100644 --- a/service/codestar/api_op_UpdateUserProfile.go +++ b/service/codestar/api_op_UpdateUserProfile.go @@ -5,7 +5,6 @@ package codestar import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) UpdateUserProfile(ctx context.Context, params *UpdateUserProfil addawsAwsjson11_serdeOpUpdateUserProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestar/endpoints.go b/service/codestar/endpoints.go index 2365c607017..3ac2dae904a 100644 --- a/service/codestar/endpoints.go +++ b/service/codestar/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/codestarconnections/api_client.go b/service/codestarconnections/api_client.go index e7bb9d38337..6ff5f1c9c7e 100644 --- a/service/codestarconnections/api_client.go +++ b/service/codestarconnections/api_client.go @@ -139,30 +139,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -228,6 +204,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/codestarconnections/api_op_CreateConnection.go b/service/codestarconnections/api_op_CreateConnection.go index 095f7ad608f..dd3a6b411a5 100644 --- a/service/codestarconnections/api_op_CreateConnection.go +++ b/service/codestarconnections/api_op_CreateConnection.go @@ -5,7 +5,6 @@ package codestarconnections import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestarconnections/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateConnection(ctx context.Context, params *CreateConnectionI addawsAwsjson10_serdeOpCreateConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarconnections/api_op_CreateHost.go b/service/codestarconnections/api_op_CreateHost.go index bdf92768177..a0831a00556 100644 --- a/service/codestarconnections/api_op_CreateHost.go +++ b/service/codestarconnections/api_op_CreateHost.go @@ -5,7 +5,6 @@ package codestarconnections import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestarconnections/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateHost(ctx context.Context, params *CreateHostInput, optFns addawsAwsjson10_serdeOpCreateHostMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarconnections/api_op_DeleteConnection.go b/service/codestarconnections/api_op_DeleteConnection.go index 8c1ed24414a..6f56352f5ce 100644 --- a/service/codestarconnections/api_op_DeleteConnection.go +++ b/service/codestarconnections/api_op_DeleteConnection.go @@ -5,7 +5,6 @@ package codestarconnections import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteConnection(ctx context.Context, params *DeleteConnectionI addawsAwsjson10_serdeOpDeleteConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarconnections/api_op_DeleteHost.go b/service/codestarconnections/api_op_DeleteHost.go index 8b01987e99b..205f840b664 100644 --- a/service/codestarconnections/api_op_DeleteHost.go +++ b/service/codestarconnections/api_op_DeleteHost.go @@ -5,7 +5,6 @@ package codestarconnections import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteHost(ctx context.Context, params *DeleteHostInput, optFns addawsAwsjson10_serdeOpDeleteHostMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarconnections/api_op_GetConnection.go b/service/codestarconnections/api_op_GetConnection.go index 03cfa7d7363..5a5efd138a2 100644 --- a/service/codestarconnections/api_op_GetConnection.go +++ b/service/codestarconnections/api_op_GetConnection.go @@ -5,7 +5,6 @@ package codestarconnections import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestarconnections/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetConnection(ctx context.Context, params *GetConnectionInput, addawsAwsjson10_serdeOpGetConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarconnections/api_op_GetHost.go b/service/codestarconnections/api_op_GetHost.go index f58f637bf54..0b0065ffad2 100644 --- a/service/codestarconnections/api_op_GetHost.go +++ b/service/codestarconnections/api_op_GetHost.go @@ -5,7 +5,6 @@ package codestarconnections import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestarconnections/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetHost(ctx context.Context, params *GetHostInput, optFns ...fu addawsAwsjson10_serdeOpGetHostMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarconnections/api_op_ListConnections.go b/service/codestarconnections/api_op_ListConnections.go index d1420c79bf9..53933238916 100644 --- a/service/codestarconnections/api_op_ListConnections.go +++ b/service/codestarconnections/api_op_ListConnections.go @@ -5,7 +5,6 @@ package codestarconnections import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestarconnections/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListConnections(ctx context.Context, params *ListConnectionsInp addawsAwsjson10_serdeOpListConnectionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarconnections/api_op_ListHosts.go b/service/codestarconnections/api_op_ListHosts.go index e88ac4fe20f..693b3365f0b 100644 --- a/service/codestarconnections/api_op_ListHosts.go +++ b/service/codestarconnections/api_op_ListHosts.go @@ -5,7 +5,6 @@ package codestarconnections import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestarconnections/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListHosts(ctx context.Context, params *ListHostsInput, optFns . addawsAwsjson10_serdeOpListHostsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarconnections/api_op_ListTagsForResource.go b/service/codestarconnections/api_op_ListTagsForResource.go index 2cd6ba6fb90..1dd4c9e1197 100644 --- a/service/codestarconnections/api_op_ListTagsForResource.go +++ b/service/codestarconnections/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package codestarconnections import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestarconnections/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson10_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarconnections/api_op_TagResource.go b/service/codestarconnections/api_op_TagResource.go index dd6c44e018c..7e5250cb6fd 100644 --- a/service/codestarconnections/api_op_TagResource.go +++ b/service/codestarconnections/api_op_TagResource.go @@ -5,7 +5,6 @@ package codestarconnections import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestarconnections/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson10_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarconnections/api_op_UntagResource.go b/service/codestarconnections/api_op_UntagResource.go index e1ebe35275b..df46893d0b3 100644 --- a/service/codestarconnections/api_op_UntagResource.go +++ b/service/codestarconnections/api_op_UntagResource.go @@ -5,7 +5,6 @@ package codestarconnections import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson10_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarconnections/endpoints.go b/service/codestarconnections/endpoints.go index bba0545a1f0..a2c67bead35 100644 --- a/service/codestarconnections/endpoints.go +++ b/service/codestarconnections/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/codestarnotifications/api_client.go b/service/codestarnotifications/api_client.go index db4100b81f2..86ebc02fb7f 100644 --- a/service/codestarnotifications/api_client.go +++ b/service/codestarnotifications/api_client.go @@ -111,34 +111,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -211,6 +183,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/codestarnotifications/api_op_CreateNotificationRule.go b/service/codestarnotifications/api_op_CreateNotificationRule.go index d104fdc5668..3de30fc83bc 100644 --- a/service/codestarnotifications/api_op_CreateNotificationRule.go +++ b/service/codestarnotifications/api_op_CreateNotificationRule.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestarnotifications/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateNotificationRule(ctx context.Context, params *CreateNotif addawsRestjson1_serdeOpCreateNotificationRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarnotifications/api_op_DeleteNotificationRule.go b/service/codestarnotifications/api_op_DeleteNotificationRule.go index da2e20b39b6..0c889ab5b9d 100644 --- a/service/codestarnotifications/api_op_DeleteNotificationRule.go +++ b/service/codestarnotifications/api_op_DeleteNotificationRule.go @@ -5,7 +5,6 @@ package codestarnotifications import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteNotificationRule(ctx context.Context, params *DeleteNotif addawsRestjson1_serdeOpDeleteNotificationRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarnotifications/api_op_DeleteTarget.go b/service/codestarnotifications/api_op_DeleteTarget.go index 66688785878..3abfc2f905d 100644 --- a/service/codestarnotifications/api_op_DeleteTarget.go +++ b/service/codestarnotifications/api_op_DeleteTarget.go @@ -5,7 +5,6 @@ package codestarnotifications import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteTarget(ctx context.Context, params *DeleteTargetInput, op addawsRestjson1_serdeOpDeleteTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarnotifications/api_op_DescribeNotificationRule.go b/service/codestarnotifications/api_op_DescribeNotificationRule.go index 0abcbebfe18..0be1e8e64c4 100644 --- a/service/codestarnotifications/api_op_DescribeNotificationRule.go +++ b/service/codestarnotifications/api_op_DescribeNotificationRule.go @@ -5,7 +5,6 @@ package codestarnotifications import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestarnotifications/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeNotificationRule(ctx context.Context, params *DescribeN addawsRestjson1_serdeOpDescribeNotificationRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarnotifications/api_op_ListEventTypes.go b/service/codestarnotifications/api_op_ListEventTypes.go index ffff8da477f..d8bca910453 100644 --- a/service/codestarnotifications/api_op_ListEventTypes.go +++ b/service/codestarnotifications/api_op_ListEventTypes.go @@ -5,7 +5,6 @@ package codestarnotifications import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestarnotifications/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListEventTypes(ctx context.Context, params *ListEventTypesInput addawsRestjson1_serdeOpListEventTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarnotifications/api_op_ListNotificationRules.go b/service/codestarnotifications/api_op_ListNotificationRules.go index 4f1b107e367..fd0314e3011 100644 --- a/service/codestarnotifications/api_op_ListNotificationRules.go +++ b/service/codestarnotifications/api_op_ListNotificationRules.go @@ -5,7 +5,6 @@ package codestarnotifications import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestarnotifications/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListNotificationRules(ctx context.Context, params *ListNotifica addawsRestjson1_serdeOpListNotificationRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarnotifications/api_op_ListTagsForResource.go b/service/codestarnotifications/api_op_ListTagsForResource.go index 29a6bb06669..5beb01ed8e2 100644 --- a/service/codestarnotifications/api_op_ListTagsForResource.go +++ b/service/codestarnotifications/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package codestarnotifications import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarnotifications/api_op_ListTargets.go b/service/codestarnotifications/api_op_ListTargets.go index cc44e48e489..cda619f34d9 100644 --- a/service/codestarnotifications/api_op_ListTargets.go +++ b/service/codestarnotifications/api_op_ListTargets.go @@ -5,7 +5,6 @@ package codestarnotifications import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestarnotifications/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTargets(ctx context.Context, params *ListTargetsInput, optF addawsRestjson1_serdeOpListTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarnotifications/api_op_Subscribe.go b/service/codestarnotifications/api_op_Subscribe.go index 36eac7bb0d6..bd81481f971 100644 --- a/service/codestarnotifications/api_op_Subscribe.go +++ b/service/codestarnotifications/api_op_Subscribe.go @@ -5,7 +5,6 @@ package codestarnotifications import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestarnotifications/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) Subscribe(ctx context.Context, params *SubscribeInput, optFns . addawsRestjson1_serdeOpSubscribeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarnotifications/api_op_TagResource.go b/service/codestarnotifications/api_op_TagResource.go index b4193147597..d0dd3236b69 100644 --- a/service/codestarnotifications/api_op_TagResource.go +++ b/service/codestarnotifications/api_op_TagResource.go @@ -5,7 +5,6 @@ package codestarnotifications import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarnotifications/api_op_Unsubscribe.go b/service/codestarnotifications/api_op_Unsubscribe.go index 377c4403605..d9ecb25afb4 100644 --- a/service/codestarnotifications/api_op_Unsubscribe.go +++ b/service/codestarnotifications/api_op_Unsubscribe.go @@ -5,7 +5,6 @@ package codestarnotifications import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) Unsubscribe(ctx context.Context, params *UnsubscribeInput, optF addawsRestjson1_serdeOpUnsubscribeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarnotifications/api_op_UntagResource.go b/service/codestarnotifications/api_op_UntagResource.go index b8edb9837a2..870ffd9fc92 100644 --- a/service/codestarnotifications/api_op_UntagResource.go +++ b/service/codestarnotifications/api_op_UntagResource.go @@ -5,7 +5,6 @@ package codestarnotifications import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarnotifications/api_op_UpdateNotificationRule.go b/service/codestarnotifications/api_op_UpdateNotificationRule.go index abe034f39ab..760e001c0b6 100644 --- a/service/codestarnotifications/api_op_UpdateNotificationRule.go +++ b/service/codestarnotifications/api_op_UpdateNotificationRule.go @@ -5,7 +5,6 @@ package codestarnotifications import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/codestarnotifications/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateNotificationRule(ctx context.Context, params *UpdateNotif addawsRestjson1_serdeOpUpdateNotificationRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/codestarnotifications/endpoints.go b/service/codestarnotifications/endpoints.go index 89288016f4b..982ea742a6a 100644 --- a/service/codestarnotifications/endpoints.go +++ b/service/codestarnotifications/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/cognitoidentity/api_client.go b/service/cognitoidentity/api_client.go index d538250c7bc..2a0897c7970 100644 --- a/service/cognitoidentity/api_client.go +++ b/service/cognitoidentity/api_client.go @@ -91,30 +91,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -180,6 +156,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/cognitoidentity/api_op_CreateIdentityPool.go b/service/cognitoidentity/api_op_CreateIdentityPool.go index 2c0ef329330..02e50ae5157 100644 --- a/service/cognitoidentity/api_op_CreateIdentityPool.go +++ b/service/cognitoidentity/api_op_CreateIdentityPool.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentity/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateIdentityPool(ctx context.Context, params *CreateIdentityP addawsAwsjson11_serdeOpCreateIdentityPoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentity/api_op_DeleteIdentities.go b/service/cognitoidentity/api_op_DeleteIdentities.go index 04aedf08c3d..690c0238246 100644 --- a/service/cognitoidentity/api_op_DeleteIdentities.go +++ b/service/cognitoidentity/api_op_DeleteIdentities.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentity/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DeleteIdentities(ctx context.Context, params *DeleteIdentitiesI addawsAwsjson11_serdeOpDeleteIdentitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentity/api_op_DeleteIdentityPool.go b/service/cognitoidentity/api_op_DeleteIdentityPool.go index 6e5f9f1b115..b2203fed6d2 100644 --- a/service/cognitoidentity/api_op_DeleteIdentityPool.go +++ b/service/cognitoidentity/api_op_DeleteIdentityPool.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteIdentityPool(ctx context.Context, params *DeleteIdentityP addawsAwsjson11_serdeOpDeleteIdentityPoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentity/api_op_DescribeIdentity.go b/service/cognitoidentity/api_op_DescribeIdentity.go index 2d53556cdf6..ffb164aaefb 100644 --- a/service/cognitoidentity/api_op_DescribeIdentity.go +++ b/service/cognitoidentity/api_op_DescribeIdentity.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DescribeIdentity(ctx context.Context, params *DescribeIdentityI addawsAwsjson11_serdeOpDescribeIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentity/api_op_DescribeIdentityPool.go b/service/cognitoidentity/api_op_DescribeIdentityPool.go index a0164f93ed4..afb5526225b 100644 --- a/service/cognitoidentity/api_op_DescribeIdentityPool.go +++ b/service/cognitoidentity/api_op_DescribeIdentityPool.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentity/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeIdentityPool(ctx context.Context, params *DescribeIdent addawsAwsjson11_serdeOpDescribeIdentityPoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentity/api_op_GetCredentialsForIdentity.go b/service/cognitoidentity/api_op_GetCredentialsForIdentity.go index 87894134816..7ad80c3e650 100644 --- a/service/cognitoidentity/api_op_GetCredentialsForIdentity.go +++ b/service/cognitoidentity/api_op_GetCredentialsForIdentity.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/cognitoidentity/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,8 +25,8 @@ func (c *Client) GetCredentialsForIdentity(ctx context.Context, params *GetCrede addawsAwsjson11_serdeOpGetCredentialsForIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentity/api_op_GetId.go b/service/cognitoidentity/api_op_GetId.go index b450ef9641f..c3abc7f8fa6 100644 --- a/service/cognitoidentity/api_op_GetId.go +++ b/service/cognitoidentity/api_op_GetId.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) GetId(ctx context.Context, params *GetIdInput, optFns ...func(* addawsAwsjson11_serdeOpGetIdMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentity/api_op_GetIdentityPoolRoles.go b/service/cognitoidentity/api_op_GetIdentityPoolRoles.go index 2d54b4ca16c..65012822157 100644 --- a/service/cognitoidentity/api_op_GetIdentityPoolRoles.go +++ b/service/cognitoidentity/api_op_GetIdentityPoolRoles.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentity/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetIdentityPoolRoles(ctx context.Context, params *GetIdentityPo addawsAwsjson11_serdeOpGetIdentityPoolRolesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentity/api_op_GetOpenIdToken.go b/service/cognitoidentity/api_op_GetOpenIdToken.go index 2c889001902..14849f3ffbb 100644 --- a/service/cognitoidentity/api_op_GetOpenIdToken.go +++ b/service/cognitoidentity/api_op_GetOpenIdToken.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -25,8 +24,8 @@ func (c *Client) GetOpenIdToken(ctx context.Context, params *GetOpenIdTokenInput addawsAwsjson11_serdeOpGetOpenIdTokenMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentity/api_op_GetOpenIdTokenForDeveloperIdentity.go b/service/cognitoidentity/api_op_GetOpenIdTokenForDeveloperIdentity.go index 4d1d3db8ffe..feb6540e514 100644 --- a/service/cognitoidentity/api_op_GetOpenIdTokenForDeveloperIdentity.go +++ b/service/cognitoidentity/api_op_GetOpenIdTokenForDeveloperIdentity.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -34,9 +33,9 @@ func (c *Client) GetOpenIdTokenForDeveloperIdentity(ctx context.Context, params addawsAwsjson11_serdeOpGetOpenIdTokenForDeveloperIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentity/api_op_ListIdentities.go b/service/cognitoidentity/api_op_ListIdentities.go index d66fe534df6..1166f6f8670 100644 --- a/service/cognitoidentity/api_op_ListIdentities.go +++ b/service/cognitoidentity/api_op_ListIdentities.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentity/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListIdentities(ctx context.Context, params *ListIdentitiesInput addawsAwsjson11_serdeOpListIdentitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentity/api_op_ListIdentityPools.go b/service/cognitoidentity/api_op_ListIdentityPools.go index 227bb86e9b3..01051193ed0 100644 --- a/service/cognitoidentity/api_op_ListIdentityPools.go +++ b/service/cognitoidentity/api_op_ListIdentityPools.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentity/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListIdentityPools(ctx context.Context, params *ListIdentityPool addawsAwsjson11_serdeOpListIdentityPoolsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentity/api_op_ListTagsForResource.go b/service/cognitoidentity/api_op_ListTagsForResource.go index 0d58ae0c98d..dfc765f2c96 100644 --- a/service/cognitoidentity/api_op_ListTagsForResource.go +++ b/service/cognitoidentity/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentity/api_op_LookupDeveloperIdentity.go b/service/cognitoidentity/api_op_LookupDeveloperIdentity.go index be5edbf5088..9f5f3e8fac1 100644 --- a/service/cognitoidentity/api_op_LookupDeveloperIdentity.go +++ b/service/cognitoidentity/api_op_LookupDeveloperIdentity.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) LookupDeveloperIdentity(ctx context.Context, params *LookupDeve addawsAwsjson11_serdeOpLookupDeveloperIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentity/api_op_MergeDeveloperIdentities.go b/service/cognitoidentity/api_op_MergeDeveloperIdentities.go index 54ba8789707..3b268aa3164 100644 --- a/service/cognitoidentity/api_op_MergeDeveloperIdentities.go +++ b/service/cognitoidentity/api_op_MergeDeveloperIdentities.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) MergeDeveloperIdentities(ctx context.Context, params *MergeDeve addawsAwsjson11_serdeOpMergeDeveloperIdentitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentity/api_op_SetIdentityPoolRoles.go b/service/cognitoidentity/api_op_SetIdentityPoolRoles.go index 5278cc87a13..6047d6220a6 100644 --- a/service/cognitoidentity/api_op_SetIdentityPoolRoles.go +++ b/service/cognitoidentity/api_op_SetIdentityPoolRoles.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentity/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) SetIdentityPoolRoles(ctx context.Context, params *SetIdentityPo addawsAwsjson11_serdeOpSetIdentityPoolRolesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentity/api_op_TagResource.go b/service/cognitoidentity/api_op_TagResource.go index 0f8e0bad336..6340d772338 100644 --- a/service/cognitoidentity/api_op_TagResource.go +++ b/service/cognitoidentity/api_op_TagResource.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -34,9 +33,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentity/api_op_UnlinkDeveloperIdentity.go b/service/cognitoidentity/api_op_UnlinkDeveloperIdentity.go index ed6e74d9e78..643f8adc731 100644 --- a/service/cognitoidentity/api_op_UnlinkDeveloperIdentity.go +++ b/service/cognitoidentity/api_op_UnlinkDeveloperIdentity.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) UnlinkDeveloperIdentity(ctx context.Context, params *UnlinkDeve addawsAwsjson11_serdeOpUnlinkDeveloperIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentity/api_op_UnlinkIdentity.go b/service/cognitoidentity/api_op_UnlinkIdentity.go index 5a6a04ff914..f2b9adc571c 100644 --- a/service/cognitoidentity/api_op_UnlinkIdentity.go +++ b/service/cognitoidentity/api_op_UnlinkIdentity.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -24,8 +23,8 @@ func (c *Client) UnlinkIdentity(ctx context.Context, params *UnlinkIdentityInput addawsAwsjson11_serdeOpUnlinkIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentity/api_op_UntagResource.go b/service/cognitoidentity/api_op_UntagResource.go index 1c7b0a49f94..d6a2afecfd2 100644 --- a/service/cognitoidentity/api_op_UntagResource.go +++ b/service/cognitoidentity/api_op_UntagResource.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentity/api_op_UpdateIdentityPool.go b/service/cognitoidentity/api_op_UpdateIdentityPool.go index 9ec0a6959c4..116b53d7c41 100644 --- a/service/cognitoidentity/api_op_UpdateIdentityPool.go +++ b/service/cognitoidentity/api_op_UpdateIdentityPool.go @@ -5,7 +5,6 @@ package cognitoidentity import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentity/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateIdentityPool(ctx context.Context, params *UpdateIdentityP addawsAwsjson11_serdeOpUpdateIdentityPoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentity/endpoints.go b/service/cognitoidentity/endpoints.go index 9a4e73c65b8..4950d756010 100644 --- a/service/cognitoidentity/endpoints.go +++ b/service/cognitoidentity/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/cognitoidentityprovider/api_client.go b/service/cognitoidentityprovider/api_client.go index 8e11b005038..3abddae4ea7 100644 --- a/service/cognitoidentityprovider/api_client.go +++ b/service/cognitoidentityprovider/api_client.go @@ -81,30 +81,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -170,6 +146,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/cognitoidentityprovider/api_op_AddCustomAttributes.go b/service/cognitoidentityprovider/api_op_AddCustomAttributes.go index b040a0ced52..e2f43d2a78d 100644 --- a/service/cognitoidentityprovider/api_op_AddCustomAttributes.go +++ b/service/cognitoidentityprovider/api_op_AddCustomAttributes.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) AddCustomAttributes(ctx context.Context, params *AddCustomAttri addawsAwsjson11_serdeOpAddCustomAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminAddUserToGroup.go b/service/cognitoidentityprovider/api_op_AdminAddUserToGroup.go index 6864be7fe7c..4e473f374c6 100644 --- a/service/cognitoidentityprovider/api_op_AdminAddUserToGroup.go +++ b/service/cognitoidentityprovider/api_op_AdminAddUserToGroup.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AdminAddUserToGroup(ctx context.Context, params *AdminAddUserTo addawsAwsjson11_serdeOpAdminAddUserToGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminConfirmSignUp.go b/service/cognitoidentityprovider/api_op_AdminConfirmSignUp.go index c68e6571a58..cda7c5a12cc 100644 --- a/service/cognitoidentityprovider/api_op_AdminConfirmSignUp.go +++ b/service/cognitoidentityprovider/api_op_AdminConfirmSignUp.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AdminConfirmSignUp(ctx context.Context, params *AdminConfirmSig addawsAwsjson11_serdeOpAdminConfirmSignUpMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminCreateUser.go b/service/cognitoidentityprovider/api_op_AdminCreateUser.go index 74f372d76ce..fb7794677ee 100644 --- a/service/cognitoidentityprovider/api_op_AdminCreateUser.go +++ b/service/cognitoidentityprovider/api_op_AdminCreateUser.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) AdminCreateUser(ctx context.Context, params *AdminCreateUserInp addawsAwsjson11_serdeOpAdminCreateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminDeleteUser.go b/service/cognitoidentityprovider/api_op_AdminDeleteUser.go index 5bafda12c25..81678f10630 100644 --- a/service/cognitoidentityprovider/api_op_AdminDeleteUser.go +++ b/service/cognitoidentityprovider/api_op_AdminDeleteUser.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AdminDeleteUser(ctx context.Context, params *AdminDeleteUserInp addawsAwsjson11_serdeOpAdminDeleteUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminDeleteUserAttributes.go b/service/cognitoidentityprovider/api_op_AdminDeleteUserAttributes.go index 2a5b8766770..27e3f601ca1 100644 --- a/service/cognitoidentityprovider/api_op_AdminDeleteUserAttributes.go +++ b/service/cognitoidentityprovider/api_op_AdminDeleteUserAttributes.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AdminDeleteUserAttributes(ctx context.Context, params *AdminDel addawsAwsjson11_serdeOpAdminDeleteUserAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminDisableProviderForUser.go b/service/cognitoidentityprovider/api_op_AdminDisableProviderForUser.go index b63c71bb182..b962fee35a0 100644 --- a/service/cognitoidentityprovider/api_op_AdminDisableProviderForUser.go +++ b/service/cognitoidentityprovider/api_op_AdminDisableProviderForUser.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) AdminDisableProviderForUser(ctx context.Context, params *AdminD addawsAwsjson11_serdeOpAdminDisableProviderForUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminDisableUser.go b/service/cognitoidentityprovider/api_op_AdminDisableUser.go index f94653c6fbe..a3831ffe097 100644 --- a/service/cognitoidentityprovider/api_op_AdminDisableUser.go +++ b/service/cognitoidentityprovider/api_op_AdminDisableUser.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AdminDisableUser(ctx context.Context, params *AdminDisableUserI addawsAwsjson11_serdeOpAdminDisableUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminEnableUser.go b/service/cognitoidentityprovider/api_op_AdminEnableUser.go index b1f76253ddc..171af7f1eda 100644 --- a/service/cognitoidentityprovider/api_op_AdminEnableUser.go +++ b/service/cognitoidentityprovider/api_op_AdminEnableUser.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AdminEnableUser(ctx context.Context, params *AdminEnableUserInp addawsAwsjson11_serdeOpAdminEnableUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminForgetDevice.go b/service/cognitoidentityprovider/api_op_AdminForgetDevice.go index 4fee75971da..e5edb69859b 100644 --- a/service/cognitoidentityprovider/api_op_AdminForgetDevice.go +++ b/service/cognitoidentityprovider/api_op_AdminForgetDevice.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AdminForgetDevice(ctx context.Context, params *AdminForgetDevic addawsAwsjson11_serdeOpAdminForgetDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminGetDevice.go b/service/cognitoidentityprovider/api_op_AdminGetDevice.go index 4e6908f65fa..057d1d1b611 100644 --- a/service/cognitoidentityprovider/api_op_AdminGetDevice.go +++ b/service/cognitoidentityprovider/api_op_AdminGetDevice.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AdminGetDevice(ctx context.Context, params *AdminGetDeviceInput addawsAwsjson11_serdeOpAdminGetDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminGetUser.go b/service/cognitoidentityprovider/api_op_AdminGetUser.go index da56a173cc5..d07e64ced8e 100644 --- a/service/cognitoidentityprovider/api_op_AdminGetUser.go +++ b/service/cognitoidentityprovider/api_op_AdminGetUser.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) AdminGetUser(ctx context.Context, params *AdminGetUserInput, op addawsAwsjson11_serdeOpAdminGetUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminInitiateAuth.go b/service/cognitoidentityprovider/api_op_AdminInitiateAuth.go index 20590eaeb6a..d15334f11f6 100644 --- a/service/cognitoidentityprovider/api_op_AdminInitiateAuth.go +++ b/service/cognitoidentityprovider/api_op_AdminInitiateAuth.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AdminInitiateAuth(ctx context.Context, params *AdminInitiateAut addawsAwsjson11_serdeOpAdminInitiateAuthMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminLinkProviderForUser.go b/service/cognitoidentityprovider/api_op_AdminLinkProviderForUser.go index 4032ddbcf43..3d56b21274c 100644 --- a/service/cognitoidentityprovider/api_op_AdminLinkProviderForUser.go +++ b/service/cognitoidentityprovider/api_op_AdminLinkProviderForUser.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) AdminLinkProviderForUser(ctx context.Context, params *AdminLink addawsAwsjson11_serdeOpAdminLinkProviderForUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminListDevices.go b/service/cognitoidentityprovider/api_op_AdminListDevices.go index 71b57d84f64..0aadfd60bc7 100644 --- a/service/cognitoidentityprovider/api_op_AdminListDevices.go +++ b/service/cognitoidentityprovider/api_op_AdminListDevices.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AdminListDevices(ctx context.Context, params *AdminListDevicesI addawsAwsjson11_serdeOpAdminListDevicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminListGroupsForUser.go b/service/cognitoidentityprovider/api_op_AdminListGroupsForUser.go index dad5f947dc8..29129c64a2d 100644 --- a/service/cognitoidentityprovider/api_op_AdminListGroupsForUser.go +++ b/service/cognitoidentityprovider/api_op_AdminListGroupsForUser.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AdminListGroupsForUser(ctx context.Context, params *AdminListGr addawsAwsjson11_serdeOpAdminListGroupsForUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminListUserAuthEvents.go b/service/cognitoidentityprovider/api_op_AdminListUserAuthEvents.go index 81a35a452b3..55ee7894be0 100644 --- a/service/cognitoidentityprovider/api_op_AdminListUserAuthEvents.go +++ b/service/cognitoidentityprovider/api_op_AdminListUserAuthEvents.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AdminListUserAuthEvents(ctx context.Context, params *AdminListU addawsAwsjson11_serdeOpAdminListUserAuthEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminRemoveUserFromGroup.go b/service/cognitoidentityprovider/api_op_AdminRemoveUserFromGroup.go index 7746cad77c5..dac01ea0e0c 100644 --- a/service/cognitoidentityprovider/api_op_AdminRemoveUserFromGroup.go +++ b/service/cognitoidentityprovider/api_op_AdminRemoveUserFromGroup.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AdminRemoveUserFromGroup(ctx context.Context, params *AdminRemo addawsAwsjson11_serdeOpAdminRemoveUserFromGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminResetUserPassword.go b/service/cognitoidentityprovider/api_op_AdminResetUserPassword.go index 99bccee43e6..77e06551c1c 100644 --- a/service/cognitoidentityprovider/api_op_AdminResetUserPassword.go +++ b/service/cognitoidentityprovider/api_op_AdminResetUserPassword.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) AdminResetUserPassword(ctx context.Context, params *AdminResetU addawsAwsjson11_serdeOpAdminResetUserPasswordMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminRespondToAuthChallenge.go b/service/cognitoidentityprovider/api_op_AdminRespondToAuthChallenge.go index b947ce521c5..a70c0565736 100644 --- a/service/cognitoidentityprovider/api_op_AdminRespondToAuthChallenge.go +++ b/service/cognitoidentityprovider/api_op_AdminRespondToAuthChallenge.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AdminRespondToAuthChallenge(ctx context.Context, params *AdminR addawsAwsjson11_serdeOpAdminRespondToAuthChallengeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminSetUserMFAPreference.go b/service/cognitoidentityprovider/api_op_AdminSetUserMFAPreference.go index e558f899ff6..6f299c73089 100644 --- a/service/cognitoidentityprovider/api_op_AdminSetUserMFAPreference.go +++ b/service/cognitoidentityprovider/api_op_AdminSetUserMFAPreference.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) AdminSetUserMFAPreference(ctx context.Context, params *AdminSet addawsAwsjson11_serdeOpAdminSetUserMFAPreferenceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminSetUserPassword.go b/service/cognitoidentityprovider/api_op_AdminSetUserPassword.go index 5b0d1ecbfa5..a7745e2733c 100644 --- a/service/cognitoidentityprovider/api_op_AdminSetUserPassword.go +++ b/service/cognitoidentityprovider/api_op_AdminSetUserPassword.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) AdminSetUserPassword(ctx context.Context, params *AdminSetUserP addawsAwsjson11_serdeOpAdminSetUserPasswordMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminSetUserSettings.go b/service/cognitoidentityprovider/api_op_AdminSetUserSettings.go index 72ad67a700d..9c89ef7d8d8 100644 --- a/service/cognitoidentityprovider/api_op_AdminSetUserSettings.go +++ b/service/cognitoidentityprovider/api_op_AdminSetUserSettings.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) AdminSetUserSettings(ctx context.Context, params *AdminSetUserS addawsAwsjson11_serdeOpAdminSetUserSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminUpdateAuthEventFeedback.go b/service/cognitoidentityprovider/api_op_AdminUpdateAuthEventFeedback.go index c51991fa72c..9eadd3caf97 100644 --- a/service/cognitoidentityprovider/api_op_AdminUpdateAuthEventFeedback.go +++ b/service/cognitoidentityprovider/api_op_AdminUpdateAuthEventFeedback.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) AdminUpdateAuthEventFeedback(ctx context.Context, params *Admin addawsAwsjson11_serdeOpAdminUpdateAuthEventFeedbackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminUpdateDeviceStatus.go b/service/cognitoidentityprovider/api_op_AdminUpdateDeviceStatus.go index f63907aa826..8612203d6c6 100644 --- a/service/cognitoidentityprovider/api_op_AdminUpdateDeviceStatus.go +++ b/service/cognitoidentityprovider/api_op_AdminUpdateDeviceStatus.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AdminUpdateDeviceStatus(ctx context.Context, params *AdminUpdat addawsAwsjson11_serdeOpAdminUpdateDeviceStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminUpdateUserAttributes.go b/service/cognitoidentityprovider/api_op_AdminUpdateUserAttributes.go index 6ce10804b04..bcb46ac505f 100644 --- a/service/cognitoidentityprovider/api_op_AdminUpdateUserAttributes.go +++ b/service/cognitoidentityprovider/api_op_AdminUpdateUserAttributes.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) AdminUpdateUserAttributes(ctx context.Context, params *AdminUpd addawsAwsjson11_serdeOpAdminUpdateUserAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AdminUserGlobalSignOut.go b/service/cognitoidentityprovider/api_op_AdminUserGlobalSignOut.go index caec97980cd..168c48375c0 100644 --- a/service/cognitoidentityprovider/api_op_AdminUserGlobalSignOut.go +++ b/service/cognitoidentityprovider/api_op_AdminUserGlobalSignOut.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) AdminUserGlobalSignOut(ctx context.Context, params *AdminUserGl addawsAwsjson11_serdeOpAdminUserGlobalSignOutMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_AssociateSoftwareToken.go b/service/cognitoidentityprovider/api_op_AssociateSoftwareToken.go index 66ae9f4180c..1da874f921c 100644 --- a/service/cognitoidentityprovider/api_op_AssociateSoftwareToken.go +++ b/service/cognitoidentityprovider/api_op_AssociateSoftwareToken.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AssociateSoftwareToken(ctx context.Context, params *AssociateSo addawsAwsjson11_serdeOpAssociateSoftwareTokenMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_ChangePassword.go b/service/cognitoidentityprovider/api_op_ChangePassword.go index 98154b88eb0..d68c70ed46f 100644 --- a/service/cognitoidentityprovider/api_op_ChangePassword.go +++ b/service/cognitoidentityprovider/api_op_ChangePassword.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) ChangePassword(ctx context.Context, params *ChangePasswordInput addawsAwsjson11_serdeOpChangePasswordMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentityprovider/api_op_ConfirmDevice.go b/service/cognitoidentityprovider/api_op_ConfirmDevice.go index 87e3f6ac110..1236039911f 100644 --- a/service/cognitoidentityprovider/api_op_ConfirmDevice.go +++ b/service/cognitoidentityprovider/api_op_ConfirmDevice.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ConfirmDevice(ctx context.Context, params *ConfirmDeviceInput, addawsAwsjson11_serdeOpConfirmDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_ConfirmForgotPassword.go b/service/cognitoidentityprovider/api_op_ConfirmForgotPassword.go index 1e52ca3539a..dbc32693ece 100644 --- a/service/cognitoidentityprovider/api_op_ConfirmForgotPassword.go +++ b/service/cognitoidentityprovider/api_op_ConfirmForgotPassword.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) ConfirmForgotPassword(ctx context.Context, params *ConfirmForgo addawsAwsjson11_serdeOpConfirmForgotPasswordMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentityprovider/api_op_ConfirmSignUp.go b/service/cognitoidentityprovider/api_op_ConfirmSignUp.go index ff1f4185425..66f788bfe8e 100644 --- a/service/cognitoidentityprovider/api_op_ConfirmSignUp.go +++ b/service/cognitoidentityprovider/api_op_ConfirmSignUp.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,8 +22,8 @@ func (c *Client) ConfirmSignUp(ctx context.Context, params *ConfirmSignUpInput, addawsAwsjson11_serdeOpConfirmSignUpMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentityprovider/api_op_CreateGroup.go b/service/cognitoidentityprovider/api_op_CreateGroup.go index be796446c0f..2b352bb4e3d 100644 --- a/service/cognitoidentityprovider/api_op_CreateGroup.go +++ b/service/cognitoidentityprovider/api_op_CreateGroup.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateGroup(ctx context.Context, params *CreateGroupInput, optF addawsAwsjson11_serdeOpCreateGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_CreateIdentityProvider.go b/service/cognitoidentityprovider/api_op_CreateIdentityProvider.go index 8368cace708..233dc06dbe6 100644 --- a/service/cognitoidentityprovider/api_op_CreateIdentityProvider.go +++ b/service/cognitoidentityprovider/api_op_CreateIdentityProvider.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateIdentityProvider(ctx context.Context, params *CreateIdent addawsAwsjson11_serdeOpCreateIdentityProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_CreateResourceServer.go b/service/cognitoidentityprovider/api_op_CreateResourceServer.go index ed79ce7dcf2..d50a939af73 100644 --- a/service/cognitoidentityprovider/api_op_CreateResourceServer.go +++ b/service/cognitoidentityprovider/api_op_CreateResourceServer.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateResourceServer(ctx context.Context, params *CreateResourc addawsAwsjson11_serdeOpCreateResourceServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_CreateUserImportJob.go b/service/cognitoidentityprovider/api_op_CreateUserImportJob.go index be8b5cd13f0..9a8c2e00b83 100644 --- a/service/cognitoidentityprovider/api_op_CreateUserImportJob.go +++ b/service/cognitoidentityprovider/api_op_CreateUserImportJob.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateUserImportJob(ctx context.Context, params *CreateUserImpo addawsAwsjson11_serdeOpCreateUserImportJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_CreateUserPool.go b/service/cognitoidentityprovider/api_op_CreateUserPool.go index 0ac2413672a..f90d14bfe78 100644 --- a/service/cognitoidentityprovider/api_op_CreateUserPool.go +++ b/service/cognitoidentityprovider/api_op_CreateUserPool.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateUserPool(ctx context.Context, params *CreateUserPoolInput addawsAwsjson11_serdeOpCreateUserPoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_CreateUserPoolClient.go b/service/cognitoidentityprovider/api_op_CreateUserPoolClient.go index ee53d6e0c9f..39a9576ef21 100644 --- a/service/cognitoidentityprovider/api_op_CreateUserPoolClient.go +++ b/service/cognitoidentityprovider/api_op_CreateUserPoolClient.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateUserPoolClient(ctx context.Context, params *CreateUserPoo addawsAwsjson11_serdeOpCreateUserPoolClientMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_CreateUserPoolDomain.go b/service/cognitoidentityprovider/api_op_CreateUserPoolDomain.go index 9249784a6fb..2ad8f32bd69 100644 --- a/service/cognitoidentityprovider/api_op_CreateUserPoolDomain.go +++ b/service/cognitoidentityprovider/api_op_CreateUserPoolDomain.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateUserPoolDomain(ctx context.Context, params *CreateUserPoo addawsAwsjson11_serdeOpCreateUserPoolDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_DeleteGroup.go b/service/cognitoidentityprovider/api_op_DeleteGroup.go index f21a17c525c..21fa327a6ea 100644 --- a/service/cognitoidentityprovider/api_op_DeleteGroup.go +++ b/service/cognitoidentityprovider/api_op_DeleteGroup.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteGroup(ctx context.Context, params *DeleteGroupInput, optF addawsAwsjson11_serdeOpDeleteGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_DeleteIdentityProvider.go b/service/cognitoidentityprovider/api_op_DeleteIdentityProvider.go index ca5744990a3..ff66b863c19 100644 --- a/service/cognitoidentityprovider/api_op_DeleteIdentityProvider.go +++ b/service/cognitoidentityprovider/api_op_DeleteIdentityProvider.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteIdentityProvider(ctx context.Context, params *DeleteIdent addawsAwsjson11_serdeOpDeleteIdentityProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_DeleteResourceServer.go b/service/cognitoidentityprovider/api_op_DeleteResourceServer.go index 1945d2a5f73..32549df0fa4 100644 --- a/service/cognitoidentityprovider/api_op_DeleteResourceServer.go +++ b/service/cognitoidentityprovider/api_op_DeleteResourceServer.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteResourceServer(ctx context.Context, params *DeleteResourc addawsAwsjson11_serdeOpDeleteResourceServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_DeleteUser.go b/service/cognitoidentityprovider/api_op_DeleteUser.go index 84ccc9927c0..e1823092476 100644 --- a/service/cognitoidentityprovider/api_op_DeleteUser.go +++ b/service/cognitoidentityprovider/api_op_DeleteUser.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) DeleteUser(ctx context.Context, params *DeleteUserInput, optFns addawsAwsjson11_serdeOpDeleteUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentityprovider/api_op_DeleteUserAttributes.go b/service/cognitoidentityprovider/api_op_DeleteUserAttributes.go index 602a5529f6d..762b98e50fd 100644 --- a/service/cognitoidentityprovider/api_op_DeleteUserAttributes.go +++ b/service/cognitoidentityprovider/api_op_DeleteUserAttributes.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) DeleteUserAttributes(ctx context.Context, params *DeleteUserAtt addawsAwsjson11_serdeOpDeleteUserAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentityprovider/api_op_DeleteUserPool.go b/service/cognitoidentityprovider/api_op_DeleteUserPool.go index 4e196e5f775..0185764d682 100644 --- a/service/cognitoidentityprovider/api_op_DeleteUserPool.go +++ b/service/cognitoidentityprovider/api_op_DeleteUserPool.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteUserPool(ctx context.Context, params *DeleteUserPoolInput addawsAwsjson11_serdeOpDeleteUserPoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_DeleteUserPoolClient.go b/service/cognitoidentityprovider/api_op_DeleteUserPoolClient.go index 064b400be2d..7d92b72a067 100644 --- a/service/cognitoidentityprovider/api_op_DeleteUserPoolClient.go +++ b/service/cognitoidentityprovider/api_op_DeleteUserPoolClient.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteUserPoolClient(ctx context.Context, params *DeleteUserPoo addawsAwsjson11_serdeOpDeleteUserPoolClientMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_DeleteUserPoolDomain.go b/service/cognitoidentityprovider/api_op_DeleteUserPoolDomain.go index 2c657836ee4..08b6007a8a5 100644 --- a/service/cognitoidentityprovider/api_op_DeleteUserPoolDomain.go +++ b/service/cognitoidentityprovider/api_op_DeleteUserPoolDomain.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteUserPoolDomain(ctx context.Context, params *DeleteUserPoo addawsAwsjson11_serdeOpDeleteUserPoolDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_DescribeIdentityProvider.go b/service/cognitoidentityprovider/api_op_DescribeIdentityProvider.go index bc005dfcfea..4b36d52f222 100644 --- a/service/cognitoidentityprovider/api_op_DescribeIdentityProvider.go +++ b/service/cognitoidentityprovider/api_op_DescribeIdentityProvider.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeIdentityProvider(ctx context.Context, params *DescribeI addawsAwsjson11_serdeOpDescribeIdentityProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_DescribeResourceServer.go b/service/cognitoidentityprovider/api_op_DescribeResourceServer.go index ed9fae6ee1d..5ff103253aa 100644 --- a/service/cognitoidentityprovider/api_op_DescribeResourceServer.go +++ b/service/cognitoidentityprovider/api_op_DescribeResourceServer.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeResourceServer(ctx context.Context, params *DescribeRes addawsAwsjson11_serdeOpDescribeResourceServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_DescribeRiskConfiguration.go b/service/cognitoidentityprovider/api_op_DescribeRiskConfiguration.go index b6a8d452f59..5c87db6cb96 100644 --- a/service/cognitoidentityprovider/api_op_DescribeRiskConfiguration.go +++ b/service/cognitoidentityprovider/api_op_DescribeRiskConfiguration.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeRiskConfiguration(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeRiskConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_DescribeUserImportJob.go b/service/cognitoidentityprovider/api_op_DescribeUserImportJob.go index ede9e791f5d..9a31227760e 100644 --- a/service/cognitoidentityprovider/api_op_DescribeUserImportJob.go +++ b/service/cognitoidentityprovider/api_op_DescribeUserImportJob.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeUserImportJob(ctx context.Context, params *DescribeUser addawsAwsjson11_serdeOpDescribeUserImportJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_DescribeUserPool.go b/service/cognitoidentityprovider/api_op_DescribeUserPool.go index 7f579d9068a..70440d19e1f 100644 --- a/service/cognitoidentityprovider/api_op_DescribeUserPool.go +++ b/service/cognitoidentityprovider/api_op_DescribeUserPool.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeUserPool(ctx context.Context, params *DescribeUserPoolI addawsAwsjson11_serdeOpDescribeUserPoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_DescribeUserPoolClient.go b/service/cognitoidentityprovider/api_op_DescribeUserPoolClient.go index ae574938282..d7ce9519122 100644 --- a/service/cognitoidentityprovider/api_op_DescribeUserPoolClient.go +++ b/service/cognitoidentityprovider/api_op_DescribeUserPoolClient.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeUserPoolClient(ctx context.Context, params *DescribeUse addawsAwsjson11_serdeOpDescribeUserPoolClientMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_DescribeUserPoolDomain.go b/service/cognitoidentityprovider/api_op_DescribeUserPoolDomain.go index 3fabb30c614..137ea893468 100644 --- a/service/cognitoidentityprovider/api_op_DescribeUserPoolDomain.go +++ b/service/cognitoidentityprovider/api_op_DescribeUserPoolDomain.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeUserPoolDomain(ctx context.Context, params *DescribeUse addawsAwsjson11_serdeOpDescribeUserPoolDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_ForgetDevice.go b/service/cognitoidentityprovider/api_op_ForgetDevice.go index db86a656591..7c291ae36b7 100644 --- a/service/cognitoidentityprovider/api_op_ForgetDevice.go +++ b/service/cognitoidentityprovider/api_op_ForgetDevice.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ForgetDevice(ctx context.Context, params *ForgetDeviceInput, op addawsAwsjson11_serdeOpForgetDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_ForgotPassword.go b/service/cognitoidentityprovider/api_op_ForgotPassword.go index 5dfd01ef3f6..35dfca4c12f 100644 --- a/service/cognitoidentityprovider/api_op_ForgotPassword.go +++ b/service/cognitoidentityprovider/api_op_ForgotPassword.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,8 +28,8 @@ func (c *Client) ForgotPassword(ctx context.Context, params *ForgotPasswordInput addawsAwsjson11_serdeOpForgotPasswordMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentityprovider/api_op_GetCSVHeader.go b/service/cognitoidentityprovider/api_op_GetCSVHeader.go index cfc4eced422..5c2b44f7823 100644 --- a/service/cognitoidentityprovider/api_op_GetCSVHeader.go +++ b/service/cognitoidentityprovider/api_op_GetCSVHeader.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetCSVHeader(ctx context.Context, params *GetCSVHeaderInput, op addawsAwsjson11_serdeOpGetCSVHeaderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_GetDevice.go b/service/cognitoidentityprovider/api_op_GetDevice.go index 802a36755e0..0389b4f929f 100644 --- a/service/cognitoidentityprovider/api_op_GetDevice.go +++ b/service/cognitoidentityprovider/api_op_GetDevice.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDevice(ctx context.Context, params *GetDeviceInput, optFns . addawsAwsjson11_serdeOpGetDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_GetGroup.go b/service/cognitoidentityprovider/api_op_GetGroup.go index bc73ce5274f..930f3fecd0d 100644 --- a/service/cognitoidentityprovider/api_op_GetGroup.go +++ b/service/cognitoidentityprovider/api_op_GetGroup.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetGroup(ctx context.Context, params *GetGroupInput, optFns ... addawsAwsjson11_serdeOpGetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_GetIdentityProviderByIdentifier.go b/service/cognitoidentityprovider/api_op_GetIdentityProviderByIdentifier.go index 39d8d6b94b1..e6f83f9f5a5 100644 --- a/service/cognitoidentityprovider/api_op_GetIdentityProviderByIdentifier.go +++ b/service/cognitoidentityprovider/api_op_GetIdentityProviderByIdentifier.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetIdentityProviderByIdentifier(ctx context.Context, params *Ge addawsAwsjson11_serdeOpGetIdentityProviderByIdentifierMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_GetSigningCertificate.go b/service/cognitoidentityprovider/api_op_GetSigningCertificate.go index 4e666125186..4f8b234020e 100644 --- a/service/cognitoidentityprovider/api_op_GetSigningCertificate.go +++ b/service/cognitoidentityprovider/api_op_GetSigningCertificate.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetSigningCertificate(ctx context.Context, params *GetSigningCe addawsAwsjson11_serdeOpGetSigningCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_GetUICustomization.go b/service/cognitoidentityprovider/api_op_GetUICustomization.go index b0cd994376f..9d83cd7465f 100644 --- a/service/cognitoidentityprovider/api_op_GetUICustomization.go +++ b/service/cognitoidentityprovider/api_op_GetUICustomization.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetUICustomization(ctx context.Context, params *GetUICustomizat addawsAwsjson11_serdeOpGetUICustomizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_GetUser.go b/service/cognitoidentityprovider/api_op_GetUser.go index 83a844d880d..904eb3b1aed 100644 --- a/service/cognitoidentityprovider/api_op_GetUser.go +++ b/service/cognitoidentityprovider/api_op_GetUser.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) GetUser(ctx context.Context, params *GetUserInput, optFns ...fu addawsAwsjson11_serdeOpGetUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentityprovider/api_op_GetUserAttributeVerificationCode.go b/service/cognitoidentityprovider/api_op_GetUserAttributeVerificationCode.go index a8d2acf97ee..fd50ff38ebe 100644 --- a/service/cognitoidentityprovider/api_op_GetUserAttributeVerificationCode.go +++ b/service/cognitoidentityprovider/api_op_GetUserAttributeVerificationCode.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) GetUserAttributeVerificationCode(ctx context.Context, params *G addawsAwsjson11_serdeOpGetUserAttributeVerificationCodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentityprovider/api_op_GetUserPoolMfaConfig.go b/service/cognitoidentityprovider/api_op_GetUserPoolMfaConfig.go index ecd57e1a77e..314000bdf2c 100644 --- a/service/cognitoidentityprovider/api_op_GetUserPoolMfaConfig.go +++ b/service/cognitoidentityprovider/api_op_GetUserPoolMfaConfig.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetUserPoolMfaConfig(ctx context.Context, params *GetUserPoolMf addawsAwsjson11_serdeOpGetUserPoolMfaConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_GlobalSignOut.go b/service/cognitoidentityprovider/api_op_GlobalSignOut.go index 6395d1d55c7..bab99af4b95 100644 --- a/service/cognitoidentityprovider/api_op_GlobalSignOut.go +++ b/service/cognitoidentityprovider/api_op_GlobalSignOut.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) GlobalSignOut(ctx context.Context, params *GlobalSignOutInput, addawsAwsjson11_serdeOpGlobalSignOutMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_InitiateAuth.go b/service/cognitoidentityprovider/api_op_InitiateAuth.go index 7c1fbffb445..5b2176bc2cd 100644 --- a/service/cognitoidentityprovider/api_op_InitiateAuth.go +++ b/service/cognitoidentityprovider/api_op_InitiateAuth.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) InitiateAuth(ctx context.Context, params *InitiateAuthInput, op addawsAwsjson11_serdeOpInitiateAuthMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentityprovider/api_op_ListDevices.go b/service/cognitoidentityprovider/api_op_ListDevices.go index ec70c30c7a4..5d40307b9fb 100644 --- a/service/cognitoidentityprovider/api_op_ListDevices.go +++ b/service/cognitoidentityprovider/api_op_ListDevices.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDevices(ctx context.Context, params *ListDevicesInput, optF addawsAwsjson11_serdeOpListDevicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_ListGroups.go b/service/cognitoidentityprovider/api_op_ListGroups.go index ddc02dcc968..19c7393deee 100644 --- a/service/cognitoidentityprovider/api_op_ListGroups.go +++ b/service/cognitoidentityprovider/api_op_ListGroups.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListGroups(ctx context.Context, params *ListGroupsInput, optFns addawsAwsjson11_serdeOpListGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_ListIdentityProviders.go b/service/cognitoidentityprovider/api_op_ListIdentityProviders.go index ef18824466c..bf3e1cd9d5b 100644 --- a/service/cognitoidentityprovider/api_op_ListIdentityProviders.go +++ b/service/cognitoidentityprovider/api_op_ListIdentityProviders.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListIdentityProviders(ctx context.Context, params *ListIdentity addawsAwsjson11_serdeOpListIdentityProvidersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_ListResourceServers.go b/service/cognitoidentityprovider/api_op_ListResourceServers.go index 2a7d6d3514b..b2a5ad3fa89 100644 --- a/service/cognitoidentityprovider/api_op_ListResourceServers.go +++ b/service/cognitoidentityprovider/api_op_ListResourceServers.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListResourceServers(ctx context.Context, params *ListResourceSe addawsAwsjson11_serdeOpListResourceServersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_ListTagsForResource.go b/service/cognitoidentityprovider/api_op_ListTagsForResource.go index 72651424668..49d660f0a94 100644 --- a/service/cognitoidentityprovider/api_op_ListTagsForResource.go +++ b/service/cognitoidentityprovider/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_ListUserImportJobs.go b/service/cognitoidentityprovider/api_op_ListUserImportJobs.go index 046991e4d76..9cf2c08ad84 100644 --- a/service/cognitoidentityprovider/api_op_ListUserImportJobs.go +++ b/service/cognitoidentityprovider/api_op_ListUserImportJobs.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListUserImportJobs(ctx context.Context, params *ListUserImportJ addawsAwsjson11_serdeOpListUserImportJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_ListUserPoolClients.go b/service/cognitoidentityprovider/api_op_ListUserPoolClients.go index 1786808aa40..2a569d3c207 100644 --- a/service/cognitoidentityprovider/api_op_ListUserPoolClients.go +++ b/service/cognitoidentityprovider/api_op_ListUserPoolClients.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListUserPoolClients(ctx context.Context, params *ListUserPoolCl addawsAwsjson11_serdeOpListUserPoolClientsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_ListUserPools.go b/service/cognitoidentityprovider/api_op_ListUserPools.go index ef211052e2d..4b10e8fda11 100644 --- a/service/cognitoidentityprovider/api_op_ListUserPools.go +++ b/service/cognitoidentityprovider/api_op_ListUserPools.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListUserPools(ctx context.Context, params *ListUserPoolsInput, addawsAwsjson11_serdeOpListUserPoolsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_ListUsers.go b/service/cognitoidentityprovider/api_op_ListUsers.go index 33acf90c44a..640594e5ee6 100644 --- a/service/cognitoidentityprovider/api_op_ListUsers.go +++ b/service/cognitoidentityprovider/api_op_ListUsers.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListUsers(ctx context.Context, params *ListUsersInput, optFns . addawsAwsjson11_serdeOpListUsersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_ListUsersInGroup.go b/service/cognitoidentityprovider/api_op_ListUsersInGroup.go index 85dcf141c45..d4a9761a012 100644 --- a/service/cognitoidentityprovider/api_op_ListUsersInGroup.go +++ b/service/cognitoidentityprovider/api_op_ListUsersInGroup.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListUsersInGroup(ctx context.Context, params *ListUsersInGroupI addawsAwsjson11_serdeOpListUsersInGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_ResendConfirmationCode.go b/service/cognitoidentityprovider/api_op_ResendConfirmationCode.go index 55626998a3e..c5666ee188e 100644 --- a/service/cognitoidentityprovider/api_op_ResendConfirmationCode.go +++ b/service/cognitoidentityprovider/api_op_ResendConfirmationCode.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,8 +22,8 @@ func (c *Client) ResendConfirmationCode(ctx context.Context, params *ResendConfi addawsAwsjson11_serdeOpResendConfirmationCodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentityprovider/api_op_RespondToAuthChallenge.go b/service/cognitoidentityprovider/api_op_RespondToAuthChallenge.go index bbd5fc37cdf..13abbb9ec24 100644 --- a/service/cognitoidentityprovider/api_op_RespondToAuthChallenge.go +++ b/service/cognitoidentityprovider/api_op_RespondToAuthChallenge.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) RespondToAuthChallenge(ctx context.Context, params *RespondToAu addawsAwsjson11_serdeOpRespondToAuthChallengeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentityprovider/api_op_SetRiskConfiguration.go b/service/cognitoidentityprovider/api_op_SetRiskConfiguration.go index 167badd9b74..d2891fadad6 100644 --- a/service/cognitoidentityprovider/api_op_SetRiskConfiguration.go +++ b/service/cognitoidentityprovider/api_op_SetRiskConfiguration.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) SetRiskConfiguration(ctx context.Context, params *SetRiskConfig addawsAwsjson11_serdeOpSetRiskConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_SetUICustomization.go b/service/cognitoidentityprovider/api_op_SetUICustomization.go index 744e9167b2a..7f42b1ef509 100644 --- a/service/cognitoidentityprovider/api_op_SetUICustomization.go +++ b/service/cognitoidentityprovider/api_op_SetUICustomization.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) SetUICustomization(ctx context.Context, params *SetUICustomizat addawsAwsjson11_serdeOpSetUICustomizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_SetUserMFAPreference.go b/service/cognitoidentityprovider/api_op_SetUserMFAPreference.go index 1891a210636..2569be23059 100644 --- a/service/cognitoidentityprovider/api_op_SetUserMFAPreference.go +++ b/service/cognitoidentityprovider/api_op_SetUserMFAPreference.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) SetUserMFAPreference(ctx context.Context, params *SetUserMFAPre addawsAwsjson11_serdeOpSetUserMFAPreferenceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_SetUserPoolMfaConfig.go b/service/cognitoidentityprovider/api_op_SetUserPoolMfaConfig.go index ac11f7517a3..25beda0da8d 100644 --- a/service/cognitoidentityprovider/api_op_SetUserPoolMfaConfig.go +++ b/service/cognitoidentityprovider/api_op_SetUserPoolMfaConfig.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SetUserPoolMfaConfig(ctx context.Context, params *SetUserPoolMf addawsAwsjson11_serdeOpSetUserPoolMfaConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_SetUserSettings.go b/service/cognitoidentityprovider/api_op_SetUserSettings.go index 691b5dad40e..d129134e7e4 100644 --- a/service/cognitoidentityprovider/api_op_SetUserSettings.go +++ b/service/cognitoidentityprovider/api_op_SetUserSettings.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,8 +23,8 @@ func (c *Client) SetUserSettings(ctx context.Context, params *SetUserSettingsInp addawsAwsjson11_serdeOpSetUserSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentityprovider/api_op_SignUp.go b/service/cognitoidentityprovider/api_op_SignUp.go index 3354dad8b2d..dd94f8d810d 100644 --- a/service/cognitoidentityprovider/api_op_SignUp.go +++ b/service/cognitoidentityprovider/api_op_SignUp.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,8 +22,8 @@ func (c *Client) SignUp(ctx context.Context, params *SignUpInput, optFns ...func addawsAwsjson11_serdeOpSignUpMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentityprovider/api_op_StartUserImportJob.go b/service/cognitoidentityprovider/api_op_StartUserImportJob.go index c6ad456d7fe..de73e984c6a 100644 --- a/service/cognitoidentityprovider/api_op_StartUserImportJob.go +++ b/service/cognitoidentityprovider/api_op_StartUserImportJob.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StartUserImportJob(ctx context.Context, params *StartUserImport addawsAwsjson11_serdeOpStartUserImportJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_StopUserImportJob.go b/service/cognitoidentityprovider/api_op_StopUserImportJob.go index 47a00a14810..330fb02c499 100644 --- a/service/cognitoidentityprovider/api_op_StopUserImportJob.go +++ b/service/cognitoidentityprovider/api_op_StopUserImportJob.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StopUserImportJob(ctx context.Context, params *StopUserImportJo addawsAwsjson11_serdeOpStopUserImportJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_TagResource.go b/service/cognitoidentityprovider/api_op_TagResource.go index cd04ce755e2..b8f1efa10ff 100644 --- a/service/cognitoidentityprovider/api_op_TagResource.go +++ b/service/cognitoidentityprovider/api_op_TagResource.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -34,9 +33,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_UntagResource.go b/service/cognitoidentityprovider/api_op_UntagResource.go index 70552d26814..292bfe9503d 100644 --- a/service/cognitoidentityprovider/api_op_UntagResource.go +++ b/service/cognitoidentityprovider/api_op_UntagResource.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_UpdateAuthEventFeedback.go b/service/cognitoidentityprovider/api_op_UpdateAuthEventFeedback.go index 037e43d1cf6..8dd8ddfc557 100644 --- a/service/cognitoidentityprovider/api_op_UpdateAuthEventFeedback.go +++ b/service/cognitoidentityprovider/api_op_UpdateAuthEventFeedback.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateAuthEventFeedback(ctx context.Context, params *UpdateAuth addawsAwsjson11_serdeOpUpdateAuthEventFeedbackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_UpdateDeviceStatus.go b/service/cognitoidentityprovider/api_op_UpdateDeviceStatus.go index 501488ded8a..4bf7bf3f189 100644 --- a/service/cognitoidentityprovider/api_op_UpdateDeviceStatus.go +++ b/service/cognitoidentityprovider/api_op_UpdateDeviceStatus.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDeviceStatus(ctx context.Context, params *UpdateDeviceSta addawsAwsjson11_serdeOpUpdateDeviceStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_UpdateGroup.go b/service/cognitoidentityprovider/api_op_UpdateGroup.go index fac5754bee8..6e229f9bd18 100644 --- a/service/cognitoidentityprovider/api_op_UpdateGroup.go +++ b/service/cognitoidentityprovider/api_op_UpdateGroup.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateGroup(ctx context.Context, params *UpdateGroupInput, optF addawsAwsjson11_serdeOpUpdateGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_UpdateIdentityProvider.go b/service/cognitoidentityprovider/api_op_UpdateIdentityProvider.go index 9c4cbfcaa90..20d63a9f279 100644 --- a/service/cognitoidentityprovider/api_op_UpdateIdentityProvider.go +++ b/service/cognitoidentityprovider/api_op_UpdateIdentityProvider.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateIdentityProvider(ctx context.Context, params *UpdateIdent addawsAwsjson11_serdeOpUpdateIdentityProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_UpdateResourceServer.go b/service/cognitoidentityprovider/api_op_UpdateResourceServer.go index 07dbfce4904..7185511d604 100644 --- a/service/cognitoidentityprovider/api_op_UpdateResourceServer.go +++ b/service/cognitoidentityprovider/api_op_UpdateResourceServer.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateResourceServer(ctx context.Context, params *UpdateResourc addawsAwsjson11_serdeOpUpdateResourceServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_UpdateUserAttributes.go b/service/cognitoidentityprovider/api_op_UpdateUserAttributes.go index 77d8f56e09d..f234534e346 100644 --- a/service/cognitoidentityprovider/api_op_UpdateUserAttributes.go +++ b/service/cognitoidentityprovider/api_op_UpdateUserAttributes.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) UpdateUserAttributes(ctx context.Context, params *UpdateUserAtt addawsAwsjson11_serdeOpUpdateUserAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentityprovider/api_op_UpdateUserPool.go b/service/cognitoidentityprovider/api_op_UpdateUserPool.go index 5fc66c2329d..810ee215cef 100644 --- a/service/cognitoidentityprovider/api_op_UpdateUserPool.go +++ b/service/cognitoidentityprovider/api_op_UpdateUserPool.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateUserPool(ctx context.Context, params *UpdateUserPoolInput addawsAwsjson11_serdeOpUpdateUserPoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_UpdateUserPoolClient.go b/service/cognitoidentityprovider/api_op_UpdateUserPoolClient.go index 1875483e2aa..934bca5ce23 100644 --- a/service/cognitoidentityprovider/api_op_UpdateUserPoolClient.go +++ b/service/cognitoidentityprovider/api_op_UpdateUserPoolClient.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateUserPoolClient(ctx context.Context, params *UpdateUserPoo addawsAwsjson11_serdeOpUpdateUserPoolClientMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_UpdateUserPoolDomain.go b/service/cognitoidentityprovider/api_op_UpdateUserPoolDomain.go index a65ae1dd1f5..973a771a6e0 100644 --- a/service/cognitoidentityprovider/api_op_UpdateUserPoolDomain.go +++ b/service/cognitoidentityprovider/api_op_UpdateUserPoolDomain.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) UpdateUserPoolDomain(ctx context.Context, params *UpdateUserPoo addawsAwsjson11_serdeOpUpdateUserPoolDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_VerifySoftwareToken.go b/service/cognitoidentityprovider/api_op_VerifySoftwareToken.go index f2feccfa731..9d5e9fe2d82 100644 --- a/service/cognitoidentityprovider/api_op_VerifySoftwareToken.go +++ b/service/cognitoidentityprovider/api_op_VerifySoftwareToken.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) VerifySoftwareToken(ctx context.Context, params *VerifySoftware addawsAwsjson11_serdeOpVerifySoftwareTokenMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitoidentityprovider/api_op_VerifyUserAttribute.go b/service/cognitoidentityprovider/api_op_VerifyUserAttribute.go index 49fbb418b21..6a21998fb17 100644 --- a/service/cognitoidentityprovider/api_op_VerifyUserAttribute.go +++ b/service/cognitoidentityprovider/api_op_VerifyUserAttribute.go @@ -5,7 +5,6 @@ package cognitoidentityprovider import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) VerifyUserAttribute(ctx context.Context, params *VerifyUserAttr addawsAwsjson11_serdeOpVerifyUserAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/cognitoidentityprovider/endpoints.go b/service/cognitoidentityprovider/endpoints.go index 37ede99b88a..4b3e04c1c75 100644 --- a/service/cognitoidentityprovider/endpoints.go +++ b/service/cognitoidentityprovider/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/cognitosync/api_client.go b/service/cognitosync/api_client.go index 06f982e7c36..5d7569cfc10 100644 --- a/service/cognitosync/api_client.go +++ b/service/cognitosync/api_client.go @@ -95,30 +95,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -184,6 +160,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/cognitosync/api_op_BulkPublish.go b/service/cognitosync/api_op_BulkPublish.go index d780dd74931..7777c353185 100644 --- a/service/cognitosync/api_op_BulkPublish.go +++ b/service/cognitosync/api_op_BulkPublish.go @@ -5,7 +5,6 @@ package cognitosync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) BulkPublish(ctx context.Context, params *BulkPublishInput, optF addawsRestjson1_serdeOpBulkPublishMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitosync/api_op_DeleteDataset.go b/service/cognitosync/api_op_DeleteDataset.go index f7f86e8e204..a62ae9c5f26 100644 --- a/service/cognitosync/api_op_DeleteDataset.go +++ b/service/cognitosync/api_op_DeleteDataset.go @@ -5,7 +5,6 @@ package cognitosync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitosync/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeleteDataset(ctx context.Context, params *DeleteDatasetInput, addawsRestjson1_serdeOpDeleteDatasetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitosync/api_op_DescribeDataset.go b/service/cognitosync/api_op_DescribeDataset.go index ab29c8e0a3f..d1e2f6cfc2b 100644 --- a/service/cognitosync/api_op_DescribeDataset.go +++ b/service/cognitosync/api_op_DescribeDataset.go @@ -5,7 +5,6 @@ package cognitosync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitosync/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeDataset(ctx context.Context, params *DescribeDatasetInp addawsRestjson1_serdeOpDescribeDatasetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitosync/api_op_DescribeIdentityPoolUsage.go b/service/cognitosync/api_op_DescribeIdentityPoolUsage.go index c81999a4c88..55c8912cc62 100644 --- a/service/cognitosync/api_op_DescribeIdentityPoolUsage.go +++ b/service/cognitosync/api_op_DescribeIdentityPoolUsage.go @@ -5,7 +5,6 @@ package cognitosync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitosync/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeIdentityPoolUsage(ctx context.Context, params *Describe addawsRestjson1_serdeOpDescribeIdentityPoolUsageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitosync/api_op_DescribeIdentityUsage.go b/service/cognitosync/api_op_DescribeIdentityUsage.go index 6abc2c0be01..1ad4f261547 100644 --- a/service/cognitosync/api_op_DescribeIdentityUsage.go +++ b/service/cognitosync/api_op_DescribeIdentityUsage.go @@ -5,7 +5,6 @@ package cognitosync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitosync/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeIdentityUsage(ctx context.Context, params *DescribeIden addawsRestjson1_serdeOpDescribeIdentityUsageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitosync/api_op_GetBulkPublishDetails.go b/service/cognitosync/api_op_GetBulkPublishDetails.go index 7f98d4bef62..fceadc95823 100644 --- a/service/cognitosync/api_op_GetBulkPublishDetails.go +++ b/service/cognitosync/api_op_GetBulkPublishDetails.go @@ -5,7 +5,6 @@ package cognitosync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitosync/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetBulkPublishDetails(ctx context.Context, params *GetBulkPubli addawsRestjson1_serdeOpGetBulkPublishDetailsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitosync/api_op_GetCognitoEvents.go b/service/cognitosync/api_op_GetCognitoEvents.go index 1f6a828f903..416984d5bfd 100644 --- a/service/cognitosync/api_op_GetCognitoEvents.go +++ b/service/cognitosync/api_op_GetCognitoEvents.go @@ -5,7 +5,6 @@ package cognitosync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) GetCognitoEvents(ctx context.Context, params *GetCognitoEventsI addawsRestjson1_serdeOpGetCognitoEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitosync/api_op_GetIdentityPoolConfiguration.go b/service/cognitosync/api_op_GetIdentityPoolConfiguration.go index 76e8297a450..c90571c5f19 100644 --- a/service/cognitosync/api_op_GetIdentityPoolConfiguration.go +++ b/service/cognitosync/api_op_GetIdentityPoolConfiguration.go @@ -5,7 +5,6 @@ package cognitosync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitosync/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetIdentityPoolConfiguration(ctx context.Context, params *GetId addawsRestjson1_serdeOpGetIdentityPoolConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitosync/api_op_ListDatasets.go b/service/cognitosync/api_op_ListDatasets.go index 3d367d707d1..73720f10da3 100644 --- a/service/cognitosync/api_op_ListDatasets.go +++ b/service/cognitosync/api_op_ListDatasets.go @@ -5,7 +5,6 @@ package cognitosync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitosync/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListDatasets(ctx context.Context, params *ListDatasetsInput, op addawsRestjson1_serdeOpListDatasetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitosync/api_op_ListIdentityPoolUsage.go b/service/cognitosync/api_op_ListIdentityPoolUsage.go index 9b29201b1ae..5cd0d0f524e 100644 --- a/service/cognitosync/api_op_ListIdentityPoolUsage.go +++ b/service/cognitosync/api_op_ListIdentityPoolUsage.go @@ -5,7 +5,6 @@ package cognitosync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitosync/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListIdentityPoolUsage(ctx context.Context, params *ListIdentity addawsRestjson1_serdeOpListIdentityPoolUsageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitosync/api_op_ListRecords.go b/service/cognitosync/api_op_ListRecords.go index aa7fdf02b11..6dd26ae661f 100644 --- a/service/cognitosync/api_op_ListRecords.go +++ b/service/cognitosync/api_op_ListRecords.go @@ -5,7 +5,6 @@ package cognitosync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitosync/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListRecords(ctx context.Context, params *ListRecordsInput, optF addawsRestjson1_serdeOpListRecordsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitosync/api_op_RegisterDevice.go b/service/cognitosync/api_op_RegisterDevice.go index 08ba345bc4c..573cd6fc12c 100644 --- a/service/cognitosync/api_op_RegisterDevice.go +++ b/service/cognitosync/api_op_RegisterDevice.go @@ -5,7 +5,6 @@ package cognitosync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitosync/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) RegisterDevice(ctx context.Context, params *RegisterDeviceInput addawsRestjson1_serdeOpRegisterDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitosync/api_op_SetCognitoEvents.go b/service/cognitosync/api_op_SetCognitoEvents.go index 957f068d53c..e8eda47bce8 100644 --- a/service/cognitosync/api_op_SetCognitoEvents.go +++ b/service/cognitosync/api_op_SetCognitoEvents.go @@ -5,7 +5,6 @@ package cognitosync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) SetCognitoEvents(ctx context.Context, params *SetCognitoEventsI addawsRestjson1_serdeOpSetCognitoEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitosync/api_op_SetIdentityPoolConfiguration.go b/service/cognitosync/api_op_SetIdentityPoolConfiguration.go index 77c04d2d6ed..fb41d62d5f1 100644 --- a/service/cognitosync/api_op_SetIdentityPoolConfiguration.go +++ b/service/cognitosync/api_op_SetIdentityPoolConfiguration.go @@ -5,7 +5,6 @@ package cognitosync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitosync/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) SetIdentityPoolConfiguration(ctx context.Context, params *SetId addawsRestjson1_serdeOpSetIdentityPoolConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitosync/api_op_SubscribeToDataset.go b/service/cognitosync/api_op_SubscribeToDataset.go index 621bcd6bdeb..a421f21760f 100644 --- a/service/cognitosync/api_op_SubscribeToDataset.go +++ b/service/cognitosync/api_op_SubscribeToDataset.go @@ -5,7 +5,6 @@ package cognitosync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) SubscribeToDataset(ctx context.Context, params *SubscribeToData addawsRestjson1_serdeOpSubscribeToDatasetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitosync/api_op_UnsubscribeFromDataset.go b/service/cognitosync/api_op_UnsubscribeFromDataset.go index da5fbebb5e0..a6c7dd4f928 100644 --- a/service/cognitosync/api_op_UnsubscribeFromDataset.go +++ b/service/cognitosync/api_op_UnsubscribeFromDataset.go @@ -5,7 +5,6 @@ package cognitosync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) UnsubscribeFromDataset(ctx context.Context, params *Unsubscribe addawsRestjson1_serdeOpUnsubscribeFromDatasetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitosync/api_op_UpdateRecords.go b/service/cognitosync/api_op_UpdateRecords.go index ce1e3d08e57..355b7672bf6 100644 --- a/service/cognitosync/api_op_UpdateRecords.go +++ b/service/cognitosync/api_op_UpdateRecords.go @@ -5,7 +5,6 @@ package cognitosync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/cognitosync/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) UpdateRecords(ctx context.Context, params *UpdateRecordsInput, addawsRestjson1_serdeOpUpdateRecordsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/cognitosync/endpoints.go b/service/cognitosync/endpoints.go index 4c07d9cc21d..f8daaff83d0 100644 --- a/service/cognitosync/endpoints.go +++ b/service/cognitosync/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/comprehend/api_client.go b/service/comprehend/api_client.go index 8e024e722ac..b64cee9f315 100644 --- a/service/comprehend/api_client.go +++ b/service/comprehend/api_client.go @@ -88,34 +88,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -188,6 +160,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/comprehend/api_op_BatchDetectDominantLanguage.go b/service/comprehend/api_op_BatchDetectDominantLanguage.go index e2f7e35040e..5ee0c3dbc98 100644 --- a/service/comprehend/api_op_BatchDetectDominantLanguage.go +++ b/service/comprehend/api_op_BatchDetectDominantLanguage.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) BatchDetectDominantLanguage(ctx context.Context, params *BatchD addawsAwsjson11_serdeOpBatchDetectDominantLanguageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_BatchDetectEntities.go b/service/comprehend/api_op_BatchDetectEntities.go index 14b5f4027a3..633c805add5 100644 --- a/service/comprehend/api_op_BatchDetectEntities.go +++ b/service/comprehend/api_op_BatchDetectEntities.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) BatchDetectEntities(ctx context.Context, params *BatchDetectEnt addawsAwsjson11_serdeOpBatchDetectEntitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_BatchDetectKeyPhrases.go b/service/comprehend/api_op_BatchDetectKeyPhrases.go index 0eb6fb02245..a2186ad2e34 100644 --- a/service/comprehend/api_op_BatchDetectKeyPhrases.go +++ b/service/comprehend/api_op_BatchDetectKeyPhrases.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchDetectKeyPhrases(ctx context.Context, params *BatchDetectK addawsAwsjson11_serdeOpBatchDetectKeyPhrasesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_BatchDetectSentiment.go b/service/comprehend/api_op_BatchDetectSentiment.go index 9b0f23a6f0e..c4165adaa62 100644 --- a/service/comprehend/api_op_BatchDetectSentiment.go +++ b/service/comprehend/api_op_BatchDetectSentiment.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) BatchDetectSentiment(ctx context.Context, params *BatchDetectSe addawsAwsjson11_serdeOpBatchDetectSentimentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_BatchDetectSyntax.go b/service/comprehend/api_op_BatchDetectSyntax.go index 597830d9ac8..b62146030c5 100644 --- a/service/comprehend/api_op_BatchDetectSyntax.go +++ b/service/comprehend/api_op_BatchDetectSyntax.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) BatchDetectSyntax(ctx context.Context, params *BatchDetectSynta addawsAwsjson11_serdeOpBatchDetectSyntaxMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_ClassifyDocument.go b/service/comprehend/api_op_ClassifyDocument.go index 896f39cbd4d..35e13920911 100644 --- a/service/comprehend/api_op_ClassifyDocument.go +++ b/service/comprehend/api_op_ClassifyDocument.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ClassifyDocument(ctx context.Context, params *ClassifyDocumentI addawsAwsjson11_serdeOpClassifyDocumentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_CreateDocumentClassifier.go b/service/comprehend/api_op_CreateDocumentClassifier.go index 1be34074ddf..b8ec2e7d56d 100644 --- a/service/comprehend/api_op_CreateDocumentClassifier.go +++ b/service/comprehend/api_op_CreateDocumentClassifier.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateDocumentClassifier(ctx context.Context, params *CreateDoc addawsAwsjson11_serdeOpCreateDocumentClassifierMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_CreateEndpoint.go b/service/comprehend/api_op_CreateEndpoint.go index a52431957e8..e3a99eacb6d 100644 --- a/service/comprehend/api_op_CreateEndpoint.go +++ b/service/comprehend/api_op_CreateEndpoint.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateEndpoint(ctx context.Context, params *CreateEndpointInput addawsAwsjson11_serdeOpCreateEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_CreateEntityRecognizer.go b/service/comprehend/api_op_CreateEntityRecognizer.go index a267f7f16af..8c91649c606 100644 --- a/service/comprehend/api_op_CreateEntityRecognizer.go +++ b/service/comprehend/api_op_CreateEntityRecognizer.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateEntityRecognizer(ctx context.Context, params *CreateEntit addawsAwsjson11_serdeOpCreateEntityRecognizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_DeleteDocumentClassifier.go b/service/comprehend/api_op_DeleteDocumentClassifier.go index 0ba6556643c..363ce718925 100644 --- a/service/comprehend/api_op_DeleteDocumentClassifier.go +++ b/service/comprehend/api_op_DeleteDocumentClassifier.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteDocumentClassifier(ctx context.Context, params *DeleteDoc addawsAwsjson11_serdeOpDeleteDocumentClassifierMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_DeleteEndpoint.go b/service/comprehend/api_op_DeleteEndpoint.go index dbcd7afb852..3ebf5caef1a 100644 --- a/service/comprehend/api_op_DeleteEndpoint.go +++ b/service/comprehend/api_op_DeleteEndpoint.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteEndpoint(ctx context.Context, params *DeleteEndpointInput addawsAwsjson11_serdeOpDeleteEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_DeleteEntityRecognizer.go b/service/comprehend/api_op_DeleteEntityRecognizer.go index 06ea69e1eec..c093c78fc64 100644 --- a/service/comprehend/api_op_DeleteEntityRecognizer.go +++ b/service/comprehend/api_op_DeleteEntityRecognizer.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteEntityRecognizer(ctx context.Context, params *DeleteEntit addawsAwsjson11_serdeOpDeleteEntityRecognizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_DescribeDocumentClassificationJob.go b/service/comprehend/api_op_DescribeDocumentClassificationJob.go index 06d4f9aa817..eb60e2ae8db 100644 --- a/service/comprehend/api_op_DescribeDocumentClassificationJob.go +++ b/service/comprehend/api_op_DescribeDocumentClassificationJob.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDocumentClassificationJob(ctx context.Context, params * addawsAwsjson11_serdeOpDescribeDocumentClassificationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_DescribeDocumentClassifier.go b/service/comprehend/api_op_DescribeDocumentClassifier.go index 0f524a0021d..118ed986b9c 100644 --- a/service/comprehend/api_op_DescribeDocumentClassifier.go +++ b/service/comprehend/api_op_DescribeDocumentClassifier.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDocumentClassifier(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeDocumentClassifierMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_DescribeDominantLanguageDetectionJob.go b/service/comprehend/api_op_DescribeDominantLanguageDetectionJob.go index 53f849f0d06..1e3347c2a11 100644 --- a/service/comprehend/api_op_DescribeDominantLanguageDetectionJob.go +++ b/service/comprehend/api_op_DescribeDominantLanguageDetectionJob.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDominantLanguageDetectionJob(ctx context.Context, param addawsAwsjson11_serdeOpDescribeDominantLanguageDetectionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_DescribeEndpoint.go b/service/comprehend/api_op_DescribeEndpoint.go index 334021add24..4ea9cee2fc0 100644 --- a/service/comprehend/api_op_DescribeEndpoint.go +++ b/service/comprehend/api_op_DescribeEndpoint.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEndpoint(ctx context.Context, params *DescribeEndpointI addawsAwsjson11_serdeOpDescribeEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_DescribeEntitiesDetectionJob.go b/service/comprehend/api_op_DescribeEntitiesDetectionJob.go index 760fe9a8bdc..b060c7b08bf 100644 --- a/service/comprehend/api_op_DescribeEntitiesDetectionJob.go +++ b/service/comprehend/api_op_DescribeEntitiesDetectionJob.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEntitiesDetectionJob(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribeEntitiesDetectionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_DescribeEntityRecognizer.go b/service/comprehend/api_op_DescribeEntityRecognizer.go index a05ab804e96..36f937f674b 100644 --- a/service/comprehend/api_op_DescribeEntityRecognizer.go +++ b/service/comprehend/api_op_DescribeEntityRecognizer.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEntityRecognizer(ctx context.Context, params *DescribeE addawsAwsjson11_serdeOpDescribeEntityRecognizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_DescribeKeyPhrasesDetectionJob.go b/service/comprehend/api_op_DescribeKeyPhrasesDetectionJob.go index 40a3a86edb2..c72ac5e03f6 100644 --- a/service/comprehend/api_op_DescribeKeyPhrasesDetectionJob.go +++ b/service/comprehend/api_op_DescribeKeyPhrasesDetectionJob.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeKeyPhrasesDetectionJob(ctx context.Context, params *Des addawsAwsjson11_serdeOpDescribeKeyPhrasesDetectionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_DescribeSentimentDetectionJob.go b/service/comprehend/api_op_DescribeSentimentDetectionJob.go index d6fb9cd67a9..a9eb4e1668a 100644 --- a/service/comprehend/api_op_DescribeSentimentDetectionJob.go +++ b/service/comprehend/api_op_DescribeSentimentDetectionJob.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeSentimentDetectionJob(ctx context.Context, params *Desc addawsAwsjson11_serdeOpDescribeSentimentDetectionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_DescribeTopicsDetectionJob.go b/service/comprehend/api_op_DescribeTopicsDetectionJob.go index bc7e5925048..baec30e9f3a 100644 --- a/service/comprehend/api_op_DescribeTopicsDetectionJob.go +++ b/service/comprehend/api_op_DescribeTopicsDetectionJob.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeTopicsDetectionJob(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeTopicsDetectionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_DetectDominantLanguage.go b/service/comprehend/api_op_DetectDominantLanguage.go index 0c1344eb225..679c3e0ae1c 100644 --- a/service/comprehend/api_op_DetectDominantLanguage.go +++ b/service/comprehend/api_op_DetectDominantLanguage.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DetectDominantLanguage(ctx context.Context, params *DetectDomin addawsAwsjson11_serdeOpDetectDominantLanguageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_DetectEntities.go b/service/comprehend/api_op_DetectEntities.go index 50723356013..0d4d400bc1c 100644 --- a/service/comprehend/api_op_DetectEntities.go +++ b/service/comprehend/api_op_DetectEntities.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DetectEntities(ctx context.Context, params *DetectEntitiesInput addawsAwsjson11_serdeOpDetectEntitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_DetectKeyPhrases.go b/service/comprehend/api_op_DetectKeyPhrases.go index a934eaf45ea..20a98831ff4 100644 --- a/service/comprehend/api_op_DetectKeyPhrases.go +++ b/service/comprehend/api_op_DetectKeyPhrases.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DetectKeyPhrases(ctx context.Context, params *DetectKeyPhrasesI addawsAwsjson11_serdeOpDetectKeyPhrasesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_DetectSentiment.go b/service/comprehend/api_op_DetectSentiment.go index 1ccb03d3d2d..37e2fa355b2 100644 --- a/service/comprehend/api_op_DetectSentiment.go +++ b/service/comprehend/api_op_DetectSentiment.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DetectSentiment(ctx context.Context, params *DetectSentimentInp addawsAwsjson11_serdeOpDetectSentimentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_DetectSyntax.go b/service/comprehend/api_op_DetectSyntax.go index 5ef0738a0d2..5d6fd99df51 100644 --- a/service/comprehend/api_op_DetectSyntax.go +++ b/service/comprehend/api_op_DetectSyntax.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DetectSyntax(ctx context.Context, params *DetectSyntaxInput, op addawsAwsjson11_serdeOpDetectSyntaxMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_ListDocumentClassificationJobs.go b/service/comprehend/api_op_ListDocumentClassificationJobs.go index 1d90d9eaf33..f37c9356ae6 100644 --- a/service/comprehend/api_op_ListDocumentClassificationJobs.go +++ b/service/comprehend/api_op_ListDocumentClassificationJobs.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDocumentClassificationJobs(ctx context.Context, params *Lis addawsAwsjson11_serdeOpListDocumentClassificationJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_ListDocumentClassifiers.go b/service/comprehend/api_op_ListDocumentClassifiers.go index d965992811f..2a755aa801c 100644 --- a/service/comprehend/api_op_ListDocumentClassifiers.go +++ b/service/comprehend/api_op_ListDocumentClassifiers.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDocumentClassifiers(ctx context.Context, params *ListDocume addawsAwsjson11_serdeOpListDocumentClassifiersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_ListDominantLanguageDetectionJobs.go b/service/comprehend/api_op_ListDominantLanguageDetectionJobs.go index 198081b5e95..ca975797f93 100644 --- a/service/comprehend/api_op_ListDominantLanguageDetectionJobs.go +++ b/service/comprehend/api_op_ListDominantLanguageDetectionJobs.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDominantLanguageDetectionJobs(ctx context.Context, params * addawsAwsjson11_serdeOpListDominantLanguageDetectionJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_ListEndpoints.go b/service/comprehend/api_op_ListEndpoints.go index 5653ac806ea..5d42aca7107 100644 --- a/service/comprehend/api_op_ListEndpoints.go +++ b/service/comprehend/api_op_ListEndpoints.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListEndpoints(ctx context.Context, params *ListEndpointsInput, addawsAwsjson11_serdeOpListEndpointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_ListEntitiesDetectionJobs.go b/service/comprehend/api_op_ListEntitiesDetectionJobs.go index 85d27c611ec..43c53b4222c 100644 --- a/service/comprehend/api_op_ListEntitiesDetectionJobs.go +++ b/service/comprehend/api_op_ListEntitiesDetectionJobs.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListEntitiesDetectionJobs(ctx context.Context, params *ListEnti addawsAwsjson11_serdeOpListEntitiesDetectionJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_ListEntityRecognizers.go b/service/comprehend/api_op_ListEntityRecognizers.go index 6d8cc71db70..9409d5cf96c 100644 --- a/service/comprehend/api_op_ListEntityRecognizers.go +++ b/service/comprehend/api_op_ListEntityRecognizers.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListEntityRecognizers(ctx context.Context, params *ListEntityRe addawsAwsjson11_serdeOpListEntityRecognizersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_ListKeyPhrasesDetectionJobs.go b/service/comprehend/api_op_ListKeyPhrasesDetectionJobs.go index 247678dee23..b7e5447eb2e 100644 --- a/service/comprehend/api_op_ListKeyPhrasesDetectionJobs.go +++ b/service/comprehend/api_op_ListKeyPhrasesDetectionJobs.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListKeyPhrasesDetectionJobs(ctx context.Context, params *ListKe addawsAwsjson11_serdeOpListKeyPhrasesDetectionJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_ListSentimentDetectionJobs.go b/service/comprehend/api_op_ListSentimentDetectionJobs.go index 997374c8e0e..9dd37e4bc00 100644 --- a/service/comprehend/api_op_ListSentimentDetectionJobs.go +++ b/service/comprehend/api_op_ListSentimentDetectionJobs.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListSentimentDetectionJobs(ctx context.Context, params *ListSen addawsAwsjson11_serdeOpListSentimentDetectionJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_ListTagsForResource.go b/service/comprehend/api_op_ListTagsForResource.go index a7bab461367..4791532a380 100644 --- a/service/comprehend/api_op_ListTagsForResource.go +++ b/service/comprehend/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_ListTopicsDetectionJobs.go b/service/comprehend/api_op_ListTopicsDetectionJobs.go index fa5c515281f..13cca1047fe 100644 --- a/service/comprehend/api_op_ListTopicsDetectionJobs.go +++ b/service/comprehend/api_op_ListTopicsDetectionJobs.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTopicsDetectionJobs(ctx context.Context, params *ListTopics addawsAwsjson11_serdeOpListTopicsDetectionJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_StartDocumentClassificationJob.go b/service/comprehend/api_op_StartDocumentClassificationJob.go index 0a645f50c93..3e533bcb7b8 100644 --- a/service/comprehend/api_op_StartDocumentClassificationJob.go +++ b/service/comprehend/api_op_StartDocumentClassificationJob.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) StartDocumentClassificationJob(ctx context.Context, params *Sta addawsAwsjson11_serdeOpStartDocumentClassificationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_StartDominantLanguageDetectionJob.go b/service/comprehend/api_op_StartDominantLanguageDetectionJob.go index bc361fbaf86..a56954b9afc 100644 --- a/service/comprehend/api_op_StartDominantLanguageDetectionJob.go +++ b/service/comprehend/api_op_StartDominantLanguageDetectionJob.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) StartDominantLanguageDetectionJob(ctx context.Context, params * addawsAwsjson11_serdeOpStartDominantLanguageDetectionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_StartEntitiesDetectionJob.go b/service/comprehend/api_op_StartEntitiesDetectionJob.go index 874f5fb96b9..f1c1a0ba21a 100644 --- a/service/comprehend/api_op_StartEntitiesDetectionJob.go +++ b/service/comprehend/api_op_StartEntitiesDetectionJob.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) StartEntitiesDetectionJob(ctx context.Context, params *StartEnt addawsAwsjson11_serdeOpStartEntitiesDetectionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_StartKeyPhrasesDetectionJob.go b/service/comprehend/api_op_StartKeyPhrasesDetectionJob.go index 87eb7cf3a75..30b8b62aa58 100644 --- a/service/comprehend/api_op_StartKeyPhrasesDetectionJob.go +++ b/service/comprehend/api_op_StartKeyPhrasesDetectionJob.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) StartKeyPhrasesDetectionJob(ctx context.Context, params *StartK addawsAwsjson11_serdeOpStartKeyPhrasesDetectionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_StartSentimentDetectionJob.go b/service/comprehend/api_op_StartSentimentDetectionJob.go index 86815a12bc8..385fcd72a77 100644 --- a/service/comprehend/api_op_StartSentimentDetectionJob.go +++ b/service/comprehend/api_op_StartSentimentDetectionJob.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) StartSentimentDetectionJob(ctx context.Context, params *StartSe addawsAwsjson11_serdeOpStartSentimentDetectionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_StartTopicsDetectionJob.go b/service/comprehend/api_op_StartTopicsDetectionJob.go index 9b0433ccd08..8746ca2dbd2 100644 --- a/service/comprehend/api_op_StartTopicsDetectionJob.go +++ b/service/comprehend/api_op_StartTopicsDetectionJob.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) StartTopicsDetectionJob(ctx context.Context, params *StartTopic addawsAwsjson11_serdeOpStartTopicsDetectionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_StopDominantLanguageDetectionJob.go b/service/comprehend/api_op_StopDominantLanguageDetectionJob.go index fababcabbb7..1aa46ff308e 100644 --- a/service/comprehend/api_op_StopDominantLanguageDetectionJob.go +++ b/service/comprehend/api_op_StopDominantLanguageDetectionJob.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) StopDominantLanguageDetectionJob(ctx context.Context, params *S addawsAwsjson11_serdeOpStopDominantLanguageDetectionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_StopEntitiesDetectionJob.go b/service/comprehend/api_op_StopEntitiesDetectionJob.go index 3a9a7e87282..c4ca5497368 100644 --- a/service/comprehend/api_op_StopEntitiesDetectionJob.go +++ b/service/comprehend/api_op_StopEntitiesDetectionJob.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) StopEntitiesDetectionJob(ctx context.Context, params *StopEntit addawsAwsjson11_serdeOpStopEntitiesDetectionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_StopKeyPhrasesDetectionJob.go b/service/comprehend/api_op_StopKeyPhrasesDetectionJob.go index b093f58ae78..76834f3feee 100644 --- a/service/comprehend/api_op_StopKeyPhrasesDetectionJob.go +++ b/service/comprehend/api_op_StopKeyPhrasesDetectionJob.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) StopKeyPhrasesDetectionJob(ctx context.Context, params *StopKey addawsAwsjson11_serdeOpStopKeyPhrasesDetectionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_StopSentimentDetectionJob.go b/service/comprehend/api_op_StopSentimentDetectionJob.go index 5b4744d049f..13383f52dc9 100644 --- a/service/comprehend/api_op_StopSentimentDetectionJob.go +++ b/service/comprehend/api_op_StopSentimentDetectionJob.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) StopSentimentDetectionJob(ctx context.Context, params *StopSent addawsAwsjson11_serdeOpStopSentimentDetectionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_StopTrainingDocumentClassifier.go b/service/comprehend/api_op_StopTrainingDocumentClassifier.go index f4f54fb05f4..791fe20703f 100644 --- a/service/comprehend/api_op_StopTrainingDocumentClassifier.go +++ b/service/comprehend/api_op_StopTrainingDocumentClassifier.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) StopTrainingDocumentClassifier(ctx context.Context, params *Sto addawsAwsjson11_serdeOpStopTrainingDocumentClassifierMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_StopTrainingEntityRecognizer.go b/service/comprehend/api_op_StopTrainingEntityRecognizer.go index 6fe5a72c2b1..22986a6e0bd 100644 --- a/service/comprehend/api_op_StopTrainingEntityRecognizer.go +++ b/service/comprehend/api_op_StopTrainingEntityRecognizer.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) StopTrainingEntityRecognizer(ctx context.Context, params *StopT addawsAwsjson11_serdeOpStopTrainingEntityRecognizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_TagResource.go b/service/comprehend/api_op_TagResource.go index 5b65c717fe2..864aef01bb5 100644 --- a/service/comprehend/api_op_TagResource.go +++ b/service/comprehend/api_op_TagResource.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehend/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_UntagResource.go b/service/comprehend/api_op_UntagResource.go index f8f4ad5542c..4437773a8c4 100644 --- a/service/comprehend/api_op_UntagResource.go +++ b/service/comprehend/api_op_UntagResource.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/api_op_UpdateEndpoint.go b/service/comprehend/api_op_UpdateEndpoint.go index 7377861a93a..e44c00fca5d 100644 --- a/service/comprehend/api_op_UpdateEndpoint.go +++ b/service/comprehend/api_op_UpdateEndpoint.go @@ -5,7 +5,6 @@ package comprehend import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateEndpoint(ctx context.Context, params *UpdateEndpointInput addawsAwsjson11_serdeOpUpdateEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehend/endpoints.go b/service/comprehend/endpoints.go index e56249dc9a6..53067c16ddc 100644 --- a/service/comprehend/endpoints.go +++ b/service/comprehend/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/comprehendmedical/api_client.go b/service/comprehendmedical/api_client.go index 76a5ff5bd0d..eca3d48174b 100644 --- a/service/comprehendmedical/api_client.go +++ b/service/comprehendmedical/api_client.go @@ -86,34 +86,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -186,6 +158,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/comprehendmedical/api_op_DescribeEntitiesDetectionV2Job.go b/service/comprehendmedical/api_op_DescribeEntitiesDetectionV2Job.go index d2b3243ce3d..357f9b539a5 100644 --- a/service/comprehendmedical/api_op_DescribeEntitiesDetectionV2Job.go +++ b/service/comprehendmedical/api_op_DescribeEntitiesDetectionV2Job.go @@ -5,7 +5,6 @@ package comprehendmedical import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehendmedical/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEntitiesDetectionV2Job(ctx context.Context, params *Des addawsAwsjson11_serdeOpDescribeEntitiesDetectionV2JobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_DescribeICD10CMInferenceJob.go b/service/comprehendmedical/api_op_DescribeICD10CMInferenceJob.go index 379e2a738fa..c1178bf5afd 100644 --- a/service/comprehendmedical/api_op_DescribeICD10CMInferenceJob.go +++ b/service/comprehendmedical/api_op_DescribeICD10CMInferenceJob.go @@ -5,7 +5,6 @@ package comprehendmedical import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehendmedical/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeICD10CMInferenceJob(ctx context.Context, params *Descri addawsAwsjson11_serdeOpDescribeICD10CMInferenceJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_DescribePHIDetectionJob.go b/service/comprehendmedical/api_op_DescribePHIDetectionJob.go index eb738e3cce8..c8423ce3e1d 100644 --- a/service/comprehendmedical/api_op_DescribePHIDetectionJob.go +++ b/service/comprehendmedical/api_op_DescribePHIDetectionJob.go @@ -5,7 +5,6 @@ package comprehendmedical import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehendmedical/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribePHIDetectionJob(ctx context.Context, params *DescribePH addawsAwsjson11_serdeOpDescribePHIDetectionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_DescribeRxNormInferenceJob.go b/service/comprehendmedical/api_op_DescribeRxNormInferenceJob.go index f53ef0af154..60c693dcb3e 100644 --- a/service/comprehendmedical/api_op_DescribeRxNormInferenceJob.go +++ b/service/comprehendmedical/api_op_DescribeRxNormInferenceJob.go @@ -5,7 +5,6 @@ package comprehendmedical import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehendmedical/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeRxNormInferenceJob(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeRxNormInferenceJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_DetectEntities.go b/service/comprehendmedical/api_op_DetectEntities.go index a04776a34d9..2c20c0898c4 100644 --- a/service/comprehendmedical/api_op_DetectEntities.go +++ b/service/comprehendmedical/api_op_DetectEntities.go @@ -5,7 +5,6 @@ package comprehendmedical import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehendmedical/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DetectEntities(ctx context.Context, params *DetectEntitiesInput addawsAwsjson11_serdeOpDetectEntitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_DetectEntitiesV2.go b/service/comprehendmedical/api_op_DetectEntitiesV2.go index e8502c55656..b48ac3fd72e 100644 --- a/service/comprehendmedical/api_op_DetectEntitiesV2.go +++ b/service/comprehendmedical/api_op_DetectEntitiesV2.go @@ -5,7 +5,6 @@ package comprehendmedical import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehendmedical/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DetectEntitiesV2(ctx context.Context, params *DetectEntitiesV2I addawsAwsjson11_serdeOpDetectEntitiesV2Middlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_DetectPHI.go b/service/comprehendmedical/api_op_DetectPHI.go index 338060e4afd..18d42ff376e 100644 --- a/service/comprehendmedical/api_op_DetectPHI.go +++ b/service/comprehendmedical/api_op_DetectPHI.go @@ -5,7 +5,6 @@ package comprehendmedical import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehendmedical/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DetectPHI(ctx context.Context, params *DetectPHIInput, optFns . addawsAwsjson11_serdeOpDetectPHIMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_InferICD10CM.go b/service/comprehendmedical/api_op_InferICD10CM.go index 243d5a5c7aa..5fbc94ca4e3 100644 --- a/service/comprehendmedical/api_op_InferICD10CM.go +++ b/service/comprehendmedical/api_op_InferICD10CM.go @@ -5,7 +5,6 @@ package comprehendmedical import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehendmedical/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) InferICD10CM(ctx context.Context, params *InferICD10CMInput, op addawsAwsjson11_serdeOpInferICD10CMMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_InferRxNorm.go b/service/comprehendmedical/api_op_InferRxNorm.go index d5351abd53b..70dcb4986fc 100644 --- a/service/comprehendmedical/api_op_InferRxNorm.go +++ b/service/comprehendmedical/api_op_InferRxNorm.go @@ -5,7 +5,6 @@ package comprehendmedical import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehendmedical/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) InferRxNorm(ctx context.Context, params *InferRxNormInput, optF addawsAwsjson11_serdeOpInferRxNormMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_ListEntitiesDetectionV2Jobs.go b/service/comprehendmedical/api_op_ListEntitiesDetectionV2Jobs.go index 23a2c9ae37a..a175ffc5269 100644 --- a/service/comprehendmedical/api_op_ListEntitiesDetectionV2Jobs.go +++ b/service/comprehendmedical/api_op_ListEntitiesDetectionV2Jobs.go @@ -5,7 +5,6 @@ package comprehendmedical import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehendmedical/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListEntitiesDetectionV2Jobs(ctx context.Context, params *ListEn addawsAwsjson11_serdeOpListEntitiesDetectionV2JobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_ListICD10CMInferenceJobs.go b/service/comprehendmedical/api_op_ListICD10CMInferenceJobs.go index 32135108f9d..805f2d98eca 100644 --- a/service/comprehendmedical/api_op_ListICD10CMInferenceJobs.go +++ b/service/comprehendmedical/api_op_ListICD10CMInferenceJobs.go @@ -5,7 +5,6 @@ package comprehendmedical import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehendmedical/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListICD10CMInferenceJobs(ctx context.Context, params *ListICD10 addawsAwsjson11_serdeOpListICD10CMInferenceJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_ListPHIDetectionJobs.go b/service/comprehendmedical/api_op_ListPHIDetectionJobs.go index e3a670a0601..9c6b2f33d08 100644 --- a/service/comprehendmedical/api_op_ListPHIDetectionJobs.go +++ b/service/comprehendmedical/api_op_ListPHIDetectionJobs.go @@ -5,7 +5,6 @@ package comprehendmedical import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehendmedical/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListPHIDetectionJobs(ctx context.Context, params *ListPHIDetect addawsAwsjson11_serdeOpListPHIDetectionJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_ListRxNormInferenceJobs.go b/service/comprehendmedical/api_op_ListRxNormInferenceJobs.go index eb34a3bc154..7823553fd62 100644 --- a/service/comprehendmedical/api_op_ListRxNormInferenceJobs.go +++ b/service/comprehendmedical/api_op_ListRxNormInferenceJobs.go @@ -5,7 +5,6 @@ package comprehendmedical import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehendmedical/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListRxNormInferenceJobs(ctx context.Context, params *ListRxNorm addawsAwsjson11_serdeOpListRxNormInferenceJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_StartEntitiesDetectionV2Job.go b/service/comprehendmedical/api_op_StartEntitiesDetectionV2Job.go index 6b8cce513fa..3fc4437ee60 100644 --- a/service/comprehendmedical/api_op_StartEntitiesDetectionV2Job.go +++ b/service/comprehendmedical/api_op_StartEntitiesDetectionV2Job.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehendmedical/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) StartEntitiesDetectionV2Job(ctx context.Context, params *StartE addawsAwsjson11_serdeOpStartEntitiesDetectionV2JobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_StartICD10CMInferenceJob.go b/service/comprehendmedical/api_op_StartICD10CMInferenceJob.go index 2d6d97a2735..768095935a2 100644 --- a/service/comprehendmedical/api_op_StartICD10CMInferenceJob.go +++ b/service/comprehendmedical/api_op_StartICD10CMInferenceJob.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehendmedical/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) StartICD10CMInferenceJob(ctx context.Context, params *StartICD1 addawsAwsjson11_serdeOpStartICD10CMInferenceJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_StartPHIDetectionJob.go b/service/comprehendmedical/api_op_StartPHIDetectionJob.go index 63ba80f0983..92e7da2ad3e 100644 --- a/service/comprehendmedical/api_op_StartPHIDetectionJob.go +++ b/service/comprehendmedical/api_op_StartPHIDetectionJob.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehendmedical/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) StartPHIDetectionJob(ctx context.Context, params *StartPHIDetec addawsAwsjson11_serdeOpStartPHIDetectionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_StartRxNormInferenceJob.go b/service/comprehendmedical/api_op_StartRxNormInferenceJob.go index 18c60815201..415f04209e5 100644 --- a/service/comprehendmedical/api_op_StartRxNormInferenceJob.go +++ b/service/comprehendmedical/api_op_StartRxNormInferenceJob.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/comprehendmedical/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) StartRxNormInferenceJob(ctx context.Context, params *StartRxNor addawsAwsjson11_serdeOpStartRxNormInferenceJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_StopEntitiesDetectionV2Job.go b/service/comprehendmedical/api_op_StopEntitiesDetectionV2Job.go index 2895863bf5f..82156d6d92a 100644 --- a/service/comprehendmedical/api_op_StopEntitiesDetectionV2Job.go +++ b/service/comprehendmedical/api_op_StopEntitiesDetectionV2Job.go @@ -5,7 +5,6 @@ package comprehendmedical import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StopEntitiesDetectionV2Job(ctx context.Context, params *StopEnt addawsAwsjson11_serdeOpStopEntitiesDetectionV2JobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_StopICD10CMInferenceJob.go b/service/comprehendmedical/api_op_StopICD10CMInferenceJob.go index 36d076dfcb1..5232c799da9 100644 --- a/service/comprehendmedical/api_op_StopICD10CMInferenceJob.go +++ b/service/comprehendmedical/api_op_StopICD10CMInferenceJob.go @@ -5,7 +5,6 @@ package comprehendmedical import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StopICD10CMInferenceJob(ctx context.Context, params *StopICD10C addawsAwsjson11_serdeOpStopICD10CMInferenceJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_StopPHIDetectionJob.go b/service/comprehendmedical/api_op_StopPHIDetectionJob.go index b73c68d7820..0b1526b82a8 100644 --- a/service/comprehendmedical/api_op_StopPHIDetectionJob.go +++ b/service/comprehendmedical/api_op_StopPHIDetectionJob.go @@ -5,7 +5,6 @@ package comprehendmedical import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StopPHIDetectionJob(ctx context.Context, params *StopPHIDetecti addawsAwsjson11_serdeOpStopPHIDetectionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/api_op_StopRxNormInferenceJob.go b/service/comprehendmedical/api_op_StopRxNormInferenceJob.go index 87e4b119ae3..f6813a9987a 100644 --- a/service/comprehendmedical/api_op_StopRxNormInferenceJob.go +++ b/service/comprehendmedical/api_op_StopRxNormInferenceJob.go @@ -5,7 +5,6 @@ package comprehendmedical import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StopRxNormInferenceJob(ctx context.Context, params *StopRxNormI addawsAwsjson11_serdeOpStopRxNormInferenceJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/comprehendmedical/endpoints.go b/service/comprehendmedical/endpoints.go index 5e047d98000..4d340f02cf1 100644 --- a/service/comprehendmedical/endpoints.go +++ b/service/comprehendmedical/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/computeoptimizer/api_client.go b/service/computeoptimizer/api_client.go index 368b9b24dd9..8bf40c94e57 100644 --- a/service/computeoptimizer/api_client.go +++ b/service/computeoptimizer/api_client.go @@ -88,30 +88,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -177,6 +153,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/computeoptimizer/api_op_DescribeRecommendationExportJobs.go b/service/computeoptimizer/api_op_DescribeRecommendationExportJobs.go index 5fc9ad08059..f0780067840 100644 --- a/service/computeoptimizer/api_op_DescribeRecommendationExportJobs.go +++ b/service/computeoptimizer/api_op_DescribeRecommendationExportJobs.go @@ -5,7 +5,6 @@ package computeoptimizer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/computeoptimizer/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeRecommendationExportJobs(ctx context.Context, params *D addawsAwsjson10_serdeOpDescribeRecommendationExportJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/computeoptimizer/api_op_ExportAutoScalingGroupRecommendations.go b/service/computeoptimizer/api_op_ExportAutoScalingGroupRecommendations.go index 6cc17f93c9d..be602f6aa4d 100644 --- a/service/computeoptimizer/api_op_ExportAutoScalingGroupRecommendations.go +++ b/service/computeoptimizer/api_op_ExportAutoScalingGroupRecommendations.go @@ -5,7 +5,6 @@ package computeoptimizer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/computeoptimizer/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ExportAutoScalingGroupRecommendations(ctx context.Context, para addawsAwsjson10_serdeOpExportAutoScalingGroupRecommendationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/computeoptimizer/api_op_ExportEC2InstanceRecommendations.go b/service/computeoptimizer/api_op_ExportEC2InstanceRecommendations.go index 13528bb6597..dca54b2f266 100644 --- a/service/computeoptimizer/api_op_ExportEC2InstanceRecommendations.go +++ b/service/computeoptimizer/api_op_ExportEC2InstanceRecommendations.go @@ -5,7 +5,6 @@ package computeoptimizer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/computeoptimizer/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ExportEC2InstanceRecommendations(ctx context.Context, params *E addawsAwsjson10_serdeOpExportEC2InstanceRecommendationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/computeoptimizer/api_op_GetAutoScalingGroupRecommendations.go b/service/computeoptimizer/api_op_GetAutoScalingGroupRecommendations.go index b227a13194b..b9b915830d1 100644 --- a/service/computeoptimizer/api_op_GetAutoScalingGroupRecommendations.go +++ b/service/computeoptimizer/api_op_GetAutoScalingGroupRecommendations.go @@ -5,7 +5,6 @@ package computeoptimizer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/computeoptimizer/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) GetAutoScalingGroupRecommendations(ctx context.Context, params addawsAwsjson10_serdeOpGetAutoScalingGroupRecommendationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/computeoptimizer/api_op_GetEC2InstanceRecommendations.go b/service/computeoptimizer/api_op_GetEC2InstanceRecommendations.go index e3964b78c85..d476e803cff 100644 --- a/service/computeoptimizer/api_op_GetEC2InstanceRecommendations.go +++ b/service/computeoptimizer/api_op_GetEC2InstanceRecommendations.go @@ -5,7 +5,6 @@ package computeoptimizer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/computeoptimizer/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetEC2InstanceRecommendations(ctx context.Context, params *GetE addawsAwsjson10_serdeOpGetEC2InstanceRecommendationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/computeoptimizer/api_op_GetEC2RecommendationProjectedMetrics.go b/service/computeoptimizer/api_op_GetEC2RecommendationProjectedMetrics.go index 82bb0b20b46..30afd3966a4 100644 --- a/service/computeoptimizer/api_op_GetEC2RecommendationProjectedMetrics.go +++ b/service/computeoptimizer/api_op_GetEC2RecommendationProjectedMetrics.go @@ -5,7 +5,6 @@ package computeoptimizer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/computeoptimizer/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetEC2RecommendationProjectedMetrics(ctx context.Context, param addawsAwsjson10_serdeOpGetEC2RecommendationProjectedMetricsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/computeoptimizer/api_op_GetEnrollmentStatus.go b/service/computeoptimizer/api_op_GetEnrollmentStatus.go index 9b797a101da..d76cf32abe4 100644 --- a/service/computeoptimizer/api_op_GetEnrollmentStatus.go +++ b/service/computeoptimizer/api_op_GetEnrollmentStatus.go @@ -5,7 +5,6 @@ package computeoptimizer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/computeoptimizer/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetEnrollmentStatus(ctx context.Context, params *GetEnrollmentS addawsAwsjson10_serdeOpGetEnrollmentStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/computeoptimizer/api_op_GetRecommendationSummaries.go b/service/computeoptimizer/api_op_GetRecommendationSummaries.go index 6be0c1a7c22..7d694975bdd 100644 --- a/service/computeoptimizer/api_op_GetRecommendationSummaries.go +++ b/service/computeoptimizer/api_op_GetRecommendationSummaries.go @@ -5,7 +5,6 @@ package computeoptimizer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/computeoptimizer/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetRecommendationSummaries(ctx context.Context, params *GetReco addawsAwsjson10_serdeOpGetRecommendationSummariesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/computeoptimizer/api_op_UpdateEnrollmentStatus.go b/service/computeoptimizer/api_op_UpdateEnrollmentStatus.go index a7e121edebb..2f1c7abe73f 100644 --- a/service/computeoptimizer/api_op_UpdateEnrollmentStatus.go +++ b/service/computeoptimizer/api_op_UpdateEnrollmentStatus.go @@ -5,7 +5,6 @@ package computeoptimizer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/computeoptimizer/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateEnrollmentStatus(ctx context.Context, params *UpdateEnrol addawsAwsjson10_serdeOpUpdateEnrollmentStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/computeoptimizer/endpoints.go b/service/computeoptimizer/endpoints.go index 0bf72c2ab44..7cdce420845 100644 --- a/service/computeoptimizer/endpoints.go +++ b/service/computeoptimizer/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/configservice/api_client.go b/service/configservice/api_client.go index 7beb42d9af3..2791dbe903d 100644 --- a/service/configservice/api_client.go +++ b/service/configservice/api_client.go @@ -97,30 +97,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -186,6 +162,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/configservice/api_op_BatchGetAggregateResourceConfig.go b/service/configservice/api_op_BatchGetAggregateResourceConfig.go index a68c0f9a837..192793f9f35 100644 --- a/service/configservice/api_op_BatchGetAggregateResourceConfig.go +++ b/service/configservice/api_op_BatchGetAggregateResourceConfig.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) BatchGetAggregateResourceConfig(ctx context.Context, params *Ba addawsAwsjson11_serdeOpBatchGetAggregateResourceConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_BatchGetResourceConfig.go b/service/configservice/api_op_BatchGetResourceConfig.go index 899010dba5e..2aa5d6b51bb 100644 --- a/service/configservice/api_op_BatchGetResourceConfig.go +++ b/service/configservice/api_op_BatchGetResourceConfig.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) BatchGetResourceConfig(ctx context.Context, params *BatchGetRes addawsAwsjson11_serdeOpBatchGetResourceConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DeleteAggregationAuthorization.go b/service/configservice/api_op_DeleteAggregationAuthorization.go index 689b47178d6..1b2ec163d69 100644 --- a/service/configservice/api_op_DeleteAggregationAuthorization.go +++ b/service/configservice/api_op_DeleteAggregationAuthorization.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteAggregationAuthorization(ctx context.Context, params *Del addawsAwsjson11_serdeOpDeleteAggregationAuthorizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DeleteConfigRule.go b/service/configservice/api_op_DeleteConfigRule.go index 69386aa82f9..8427705ce1c 100644 --- a/service/configservice/api_op_DeleteConfigRule.go +++ b/service/configservice/api_op_DeleteConfigRule.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteConfigRule(ctx context.Context, params *DeleteConfigRuleI addawsAwsjson11_serdeOpDeleteConfigRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DeleteConfigurationAggregator.go b/service/configservice/api_op_DeleteConfigurationAggregator.go index bc2cf4ad479..2903c2f4d51 100644 --- a/service/configservice/api_op_DeleteConfigurationAggregator.go +++ b/service/configservice/api_op_DeleteConfigurationAggregator.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteConfigurationAggregator(ctx context.Context, params *Dele addawsAwsjson11_serdeOpDeleteConfigurationAggregatorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DeleteConfigurationRecorder.go b/service/configservice/api_op_DeleteConfigurationRecorder.go index 8d9a44b9e66..551112e6c9b 100644 --- a/service/configservice/api_op_DeleteConfigurationRecorder.go +++ b/service/configservice/api_op_DeleteConfigurationRecorder.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeleteConfigurationRecorder(ctx context.Context, params *Delete addawsAwsjson11_serdeOpDeleteConfigurationRecorderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DeleteConformancePack.go b/service/configservice/api_op_DeleteConformancePack.go index 663cb8167cb..f1b5a18c378 100644 --- a/service/configservice/api_op_DeleteConformancePack.go +++ b/service/configservice/api_op_DeleteConformancePack.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteConformancePack(ctx context.Context, params *DeleteConfor addawsAwsjson11_serdeOpDeleteConformancePackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DeleteDeliveryChannel.go b/service/configservice/api_op_DeleteDeliveryChannel.go index 2a88a441dde..1682e3d3f58 100644 --- a/service/configservice/api_op_DeleteDeliveryChannel.go +++ b/service/configservice/api_op_DeleteDeliveryChannel.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteDeliveryChannel(ctx context.Context, params *DeleteDelive addawsAwsjson11_serdeOpDeleteDeliveryChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DeleteEvaluationResults.go b/service/configservice/api_op_DeleteEvaluationResults.go index ad7ecbd6b76..b7202eb3a9c 100644 --- a/service/configservice/api_op_DeleteEvaluationResults.go +++ b/service/configservice/api_op_DeleteEvaluationResults.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteEvaluationResults(ctx context.Context, params *DeleteEval addawsAwsjson11_serdeOpDeleteEvaluationResultsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DeleteOrganizationConfigRule.go b/service/configservice/api_op_DeleteOrganizationConfigRule.go index 67aa033d621..7fa3bac712b 100644 --- a/service/configservice/api_op_DeleteOrganizationConfigRule.go +++ b/service/configservice/api_op_DeleteOrganizationConfigRule.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeleteOrganizationConfigRule(ctx context.Context, params *Delet addawsAwsjson11_serdeOpDeleteOrganizationConfigRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DeleteOrganizationConformancePack.go b/service/configservice/api_op_DeleteOrganizationConformancePack.go index d13d7b196ec..24f6ab7eae5 100644 --- a/service/configservice/api_op_DeleteOrganizationConformancePack.go +++ b/service/configservice/api_op_DeleteOrganizationConformancePack.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DeleteOrganizationConformancePack(ctx context.Context, params * addawsAwsjson11_serdeOpDeleteOrganizationConformancePackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DeletePendingAggregationRequest.go b/service/configservice/api_op_DeletePendingAggregationRequest.go index 909ac9782dc..db7ac278b1c 100644 --- a/service/configservice/api_op_DeletePendingAggregationRequest.go +++ b/service/configservice/api_op_DeletePendingAggregationRequest.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeletePendingAggregationRequest(ctx context.Context, params *De addawsAwsjson11_serdeOpDeletePendingAggregationRequestMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DeleteRemediationConfiguration.go b/service/configservice/api_op_DeleteRemediationConfiguration.go index 67f3a6b4535..0c3245576c5 100644 --- a/service/configservice/api_op_DeleteRemediationConfiguration.go +++ b/service/configservice/api_op_DeleteRemediationConfiguration.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRemediationConfiguration(ctx context.Context, params *Del addawsAwsjson11_serdeOpDeleteRemediationConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DeleteRemediationExceptions.go b/service/configservice/api_op_DeleteRemediationExceptions.go index 66cb35e5f1f..2c248671ed7 100644 --- a/service/configservice/api_op_DeleteRemediationExceptions.go +++ b/service/configservice/api_op_DeleteRemediationExceptions.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteRemediationExceptions(ctx context.Context, params *Delete addawsAwsjson11_serdeOpDeleteRemediationExceptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DeleteResourceConfig.go b/service/configservice/api_op_DeleteResourceConfig.go index 90940103aac..fa6b3e77c65 100644 --- a/service/configservice/api_op_DeleteResourceConfig.go +++ b/service/configservice/api_op_DeleteResourceConfig.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteResourceConfig(ctx context.Context, params *DeleteResourc addawsAwsjson11_serdeOpDeleteResourceConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DeleteRetentionConfiguration.go b/service/configservice/api_op_DeleteRetentionConfiguration.go index 54e9e32b79f..e088b4316cc 100644 --- a/service/configservice/api_op_DeleteRetentionConfiguration.go +++ b/service/configservice/api_op_DeleteRetentionConfiguration.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRetentionConfiguration(ctx context.Context, params *Delet addawsAwsjson11_serdeOpDeleteRetentionConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DeliverConfigSnapshot.go b/service/configservice/api_op_DeliverConfigSnapshot.go index 9359e472030..2db30d01789 100644 --- a/service/configservice/api_op_DeliverConfigSnapshot.go +++ b/service/configservice/api_op_DeliverConfigSnapshot.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) DeliverConfigSnapshot(ctx context.Context, params *DeliverConfi addawsAwsjson11_serdeOpDeliverConfigSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeAggregateComplianceByConfigRules.go b/service/configservice/api_op_DescribeAggregateComplianceByConfigRules.go index 5c262de4bfe..bd69fb6525e 100644 --- a/service/configservice/api_op_DescribeAggregateComplianceByConfigRules.go +++ b/service/configservice/api_op_DescribeAggregateComplianceByConfigRules.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeAggregateComplianceByConfigRules(ctx context.Context, p addawsAwsjson11_serdeOpDescribeAggregateComplianceByConfigRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeAggregationAuthorizations.go b/service/configservice/api_op_DescribeAggregationAuthorizations.go index 501b3a21115..445a79538c8 100644 --- a/service/configservice/api_op_DescribeAggregationAuthorizations.go +++ b/service/configservice/api_op_DescribeAggregationAuthorizations.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAggregationAuthorizations(ctx context.Context, params * addawsAwsjson11_serdeOpDescribeAggregationAuthorizationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeComplianceByConfigRule.go b/service/configservice/api_op_DescribeComplianceByConfigRule.go index 67235f58e4f..c0d4a223f1e 100644 --- a/service/configservice/api_op_DescribeComplianceByConfigRule.go +++ b/service/configservice/api_op_DescribeComplianceByConfigRule.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) DescribeComplianceByConfigRule(ctx context.Context, params *Des addawsAwsjson11_serdeOpDescribeComplianceByConfigRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeComplianceByResource.go b/service/configservice/api_op_DescribeComplianceByResource.go index 29ff7a26420..23538790700 100644 --- a/service/configservice/api_op_DescribeComplianceByResource.go +++ b/service/configservice/api_op_DescribeComplianceByResource.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) DescribeComplianceByResource(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribeComplianceByResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeConfigRuleEvaluationStatus.go b/service/configservice/api_op_DescribeConfigRuleEvaluationStatus.go index 3cf609a875c..5d80c3979a7 100644 --- a/service/configservice/api_op_DescribeConfigRuleEvaluationStatus.go +++ b/service/configservice/api_op_DescribeConfigRuleEvaluationStatus.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeConfigRuleEvaluationStatus(ctx context.Context, params addawsAwsjson11_serdeOpDescribeConfigRuleEvaluationStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeConfigRules.go b/service/configservice/api_op_DescribeConfigRules.go index 596e4d71744..73bf774775d 100644 --- a/service/configservice/api_op_DescribeConfigRules.go +++ b/service/configservice/api_op_DescribeConfigRules.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeConfigRules(ctx context.Context, params *DescribeConfig addawsAwsjson11_serdeOpDescribeConfigRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeConfigurationAggregatorSourcesStatus.go b/service/configservice/api_op_DescribeConfigurationAggregatorSourcesStatus.go index f62145619f8..1e5b8a2d7ee 100644 --- a/service/configservice/api_op_DescribeConfigurationAggregatorSourcesStatus.go +++ b/service/configservice/api_op_DescribeConfigurationAggregatorSourcesStatus.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeConfigurationAggregatorSourcesStatus(ctx context.Contex addawsAwsjson11_serdeOpDescribeConfigurationAggregatorSourcesStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeConfigurationAggregators.go b/service/configservice/api_op_DescribeConfigurationAggregators.go index 820d9ebb478..9223e540bf6 100644 --- a/service/configservice/api_op_DescribeConfigurationAggregators.go +++ b/service/configservice/api_op_DescribeConfigurationAggregators.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeConfigurationAggregators(ctx context.Context, params *D addawsAwsjson11_serdeOpDescribeConfigurationAggregatorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeConfigurationRecorderStatus.go b/service/configservice/api_op_DescribeConfigurationRecorderStatus.go index 182e7f714f1..03e54f58577 100644 --- a/service/configservice/api_op_DescribeConfigurationRecorderStatus.go +++ b/service/configservice/api_op_DescribeConfigurationRecorderStatus.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeConfigurationRecorderStatus(ctx context.Context, params addawsAwsjson11_serdeOpDescribeConfigurationRecorderStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeConfigurationRecorders.go b/service/configservice/api_op_DescribeConfigurationRecorders.go index 5eeba6e0b87..5fc781da942 100644 --- a/service/configservice/api_op_DescribeConfigurationRecorders.go +++ b/service/configservice/api_op_DescribeConfigurationRecorders.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeConfigurationRecorders(ctx context.Context, params *Des addawsAwsjson11_serdeOpDescribeConfigurationRecordersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeConformancePackCompliance.go b/service/configservice/api_op_DescribeConformancePackCompliance.go index d5f8180c93e..4121227f944 100644 --- a/service/configservice/api_op_DescribeConformancePackCompliance.go +++ b/service/configservice/api_op_DescribeConformancePackCompliance.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeConformancePackCompliance(ctx context.Context, params * addawsAwsjson11_serdeOpDescribeConformancePackComplianceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeConformancePackStatus.go b/service/configservice/api_op_DescribeConformancePackStatus.go index 3a6898bc295..cb977763a1d 100644 --- a/service/configservice/api_op_DescribeConformancePackStatus.go +++ b/service/configservice/api_op_DescribeConformancePackStatus.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeConformancePackStatus(ctx context.Context, params *Desc addawsAwsjson11_serdeOpDescribeConformancePackStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeConformancePacks.go b/service/configservice/api_op_DescribeConformancePacks.go index 59d99b079af..b81dedb27d2 100644 --- a/service/configservice/api_op_DescribeConformancePacks.go +++ b/service/configservice/api_op_DescribeConformancePacks.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeConformancePacks(ctx context.Context, params *DescribeC addawsAwsjson11_serdeOpDescribeConformancePacksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeDeliveryChannelStatus.go b/service/configservice/api_op_DescribeDeliveryChannelStatus.go index 3d857aa612c..0ac35c97ddf 100644 --- a/service/configservice/api_op_DescribeDeliveryChannelStatus.go +++ b/service/configservice/api_op_DescribeDeliveryChannelStatus.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeDeliveryChannelStatus(ctx context.Context, params *Desc addawsAwsjson11_serdeOpDescribeDeliveryChannelStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeDeliveryChannels.go b/service/configservice/api_op_DescribeDeliveryChannels.go index d5a64e136b2..70b1950ec8f 100644 --- a/service/configservice/api_op_DescribeDeliveryChannels.go +++ b/service/configservice/api_op_DescribeDeliveryChannels.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeDeliveryChannels(ctx context.Context, params *DescribeD addawsAwsjson11_serdeOpDescribeDeliveryChannelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeOrganizationConfigRuleStatuses.go b/service/configservice/api_op_DescribeOrganizationConfigRuleStatuses.go index daa66b5362b..c6f8fa78d9a 100644 --- a/service/configservice/api_op_DescribeOrganizationConfigRuleStatuses.go +++ b/service/configservice/api_op_DescribeOrganizationConfigRuleStatuses.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) DescribeOrganizationConfigRuleStatuses(ctx context.Context, par addawsAwsjson11_serdeOpDescribeOrganizationConfigRuleStatusesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeOrganizationConfigRules.go b/service/configservice/api_op_DescribeOrganizationConfigRules.go index cd7f70ebefa..ea2126b07ec 100644 --- a/service/configservice/api_op_DescribeOrganizationConfigRules.go +++ b/service/configservice/api_op_DescribeOrganizationConfigRules.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeOrganizationConfigRules(ctx context.Context, params *De addawsAwsjson11_serdeOpDescribeOrganizationConfigRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeOrganizationConformancePackStatuses.go b/service/configservice/api_op_DescribeOrganizationConformancePackStatuses.go index bbb7f049e69..8927f26436b 100644 --- a/service/configservice/api_op_DescribeOrganizationConformancePackStatuses.go +++ b/service/configservice/api_op_DescribeOrganizationConformancePackStatuses.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) DescribeOrganizationConformancePackStatuses(ctx context.Context addawsAwsjson11_serdeOpDescribeOrganizationConformancePackStatusesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeOrganizationConformancePacks.go b/service/configservice/api_op_DescribeOrganizationConformancePacks.go index 9167f4b0e39..fd25db9727e 100644 --- a/service/configservice/api_op_DescribeOrganizationConformancePacks.go +++ b/service/configservice/api_op_DescribeOrganizationConformancePacks.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeOrganizationConformancePacks(ctx context.Context, param addawsAwsjson11_serdeOpDescribeOrganizationConformancePacksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribePendingAggregationRequests.go b/service/configservice/api_op_DescribePendingAggregationRequests.go index 2c7775ff147..cb4b3e96403 100644 --- a/service/configservice/api_op_DescribePendingAggregationRequests.go +++ b/service/configservice/api_op_DescribePendingAggregationRequests.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribePendingAggregationRequests(ctx context.Context, params addawsAwsjson11_serdeOpDescribePendingAggregationRequestsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeRemediationConfigurations.go b/service/configservice/api_op_DescribeRemediationConfigurations.go index 00f5e325a4f..03ff888ae79 100644 --- a/service/configservice/api_op_DescribeRemediationConfigurations.go +++ b/service/configservice/api_op_DescribeRemediationConfigurations.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeRemediationConfigurations(ctx context.Context, params * addawsAwsjson11_serdeOpDescribeRemediationConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeRemediationExceptions.go b/service/configservice/api_op_DescribeRemediationExceptions.go index cf864bc896f..8f45b857f71 100644 --- a/service/configservice/api_op_DescribeRemediationExceptions.go +++ b/service/configservice/api_op_DescribeRemediationExceptions.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DescribeRemediationExceptions(ctx context.Context, params *Desc addawsAwsjson11_serdeOpDescribeRemediationExceptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeRemediationExecutionStatus.go b/service/configservice/api_op_DescribeRemediationExecutionStatus.go index e7e21f220ec..ac734d69194 100644 --- a/service/configservice/api_op_DescribeRemediationExecutionStatus.go +++ b/service/configservice/api_op_DescribeRemediationExecutionStatus.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeRemediationExecutionStatus(ctx context.Context, params addawsAwsjson11_serdeOpDescribeRemediationExecutionStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_DescribeRetentionConfigurations.go b/service/configservice/api_op_DescribeRetentionConfigurations.go index 71d2449fa0a..4ab633588cf 100644 --- a/service/configservice/api_op_DescribeRetentionConfigurations.go +++ b/service/configservice/api_op_DescribeRetentionConfigurations.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeRetentionConfigurations(ctx context.Context, params *De addawsAwsjson11_serdeOpDescribeRetentionConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_GetAggregateComplianceDetailsByConfigRule.go b/service/configservice/api_op_GetAggregateComplianceDetailsByConfigRule.go index 6911fd4a5e8..fefaa188e59 100644 --- a/service/configservice/api_op_GetAggregateComplianceDetailsByConfigRule.go +++ b/service/configservice/api_op_GetAggregateComplianceDetailsByConfigRule.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetAggregateComplianceDetailsByConfigRule(ctx context.Context, addawsAwsjson11_serdeOpGetAggregateComplianceDetailsByConfigRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_GetAggregateConfigRuleComplianceSummary.go b/service/configservice/api_op_GetAggregateConfigRuleComplianceSummary.go index f8f09ce778c..5d59ef7a77d 100644 --- a/service/configservice/api_op_GetAggregateConfigRuleComplianceSummary.go +++ b/service/configservice/api_op_GetAggregateConfigRuleComplianceSummary.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetAggregateConfigRuleComplianceSummary(ctx context.Context, pa addawsAwsjson11_serdeOpGetAggregateConfigRuleComplianceSummaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_GetAggregateDiscoveredResourceCounts.go b/service/configservice/api_op_GetAggregateDiscoveredResourceCounts.go index 266ae6eca01..94fd6348d87 100644 --- a/service/configservice/api_op_GetAggregateDiscoveredResourceCounts.go +++ b/service/configservice/api_op_GetAggregateDiscoveredResourceCounts.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetAggregateDiscoveredResourceCounts(ctx context.Context, param addawsAwsjson11_serdeOpGetAggregateDiscoveredResourceCountsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_GetAggregateResourceConfig.go b/service/configservice/api_op_GetAggregateResourceConfig.go index 7e9d811ac20..09500ea4c07 100644 --- a/service/configservice/api_op_GetAggregateResourceConfig.go +++ b/service/configservice/api_op_GetAggregateResourceConfig.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetAggregateResourceConfig(ctx context.Context, params *GetAggr addawsAwsjson11_serdeOpGetAggregateResourceConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_GetComplianceDetailsByConfigRule.go b/service/configservice/api_op_GetComplianceDetailsByConfigRule.go index 00bcd089430..ddb0832a7a4 100644 --- a/service/configservice/api_op_GetComplianceDetailsByConfigRule.go +++ b/service/configservice/api_op_GetComplianceDetailsByConfigRule.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetComplianceDetailsByConfigRule(ctx context.Context, params *G addawsAwsjson11_serdeOpGetComplianceDetailsByConfigRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_GetComplianceDetailsByResource.go b/service/configservice/api_op_GetComplianceDetailsByResource.go index bcf47e3ce2f..3a08780f413 100644 --- a/service/configservice/api_op_GetComplianceDetailsByResource.go +++ b/service/configservice/api_op_GetComplianceDetailsByResource.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetComplianceDetailsByResource(ctx context.Context, params *Get addawsAwsjson11_serdeOpGetComplianceDetailsByResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_GetComplianceSummaryByConfigRule.go b/service/configservice/api_op_GetComplianceSummaryByConfigRule.go index 0dedd5754a8..078db4a071a 100644 --- a/service/configservice/api_op_GetComplianceSummaryByConfigRule.go +++ b/service/configservice/api_op_GetComplianceSummaryByConfigRule.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetComplianceSummaryByConfigRule(ctx context.Context, params *G addawsAwsjson11_serdeOpGetComplianceSummaryByConfigRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_GetComplianceSummaryByResourceType.go b/service/configservice/api_op_GetComplianceSummaryByResourceType.go index c010cd63c74..06207e0785f 100644 --- a/service/configservice/api_op_GetComplianceSummaryByResourceType.go +++ b/service/configservice/api_op_GetComplianceSummaryByResourceType.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetComplianceSummaryByResourceType(ctx context.Context, params addawsAwsjson11_serdeOpGetComplianceSummaryByResourceTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_GetConformancePackComplianceDetails.go b/service/configservice/api_op_GetConformancePackComplianceDetails.go index 041437a2aac..45593c7ec37 100644 --- a/service/configservice/api_op_GetConformancePackComplianceDetails.go +++ b/service/configservice/api_op_GetConformancePackComplianceDetails.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetConformancePackComplianceDetails(ctx context.Context, params addawsAwsjson11_serdeOpGetConformancePackComplianceDetailsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_GetConformancePackComplianceSummary.go b/service/configservice/api_op_GetConformancePackComplianceSummary.go index 400ac2b85ec..2a6ef8cbfa1 100644 --- a/service/configservice/api_op_GetConformancePackComplianceSummary.go +++ b/service/configservice/api_op_GetConformancePackComplianceSummary.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetConformancePackComplianceSummary(ctx context.Context, params addawsAwsjson11_serdeOpGetConformancePackComplianceSummaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_GetDiscoveredResourceCounts.go b/service/configservice/api_op_GetDiscoveredResourceCounts.go index adf5eaf4446..825356a7106 100644 --- a/service/configservice/api_op_GetDiscoveredResourceCounts.go +++ b/service/configservice/api_op_GetDiscoveredResourceCounts.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -48,9 +47,9 @@ func (c *Client) GetDiscoveredResourceCounts(ctx context.Context, params *GetDis addawsAwsjson11_serdeOpGetDiscoveredResourceCountsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_GetOrganizationConfigRuleDetailedStatus.go b/service/configservice/api_op_GetOrganizationConfigRuleDetailedStatus.go index a24ece72d4e..6da80293c79 100644 --- a/service/configservice/api_op_GetOrganizationConfigRuleDetailedStatus.go +++ b/service/configservice/api_op_GetOrganizationConfigRuleDetailedStatus.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetOrganizationConfigRuleDetailedStatus(ctx context.Context, pa addawsAwsjson11_serdeOpGetOrganizationConfigRuleDetailedStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_GetOrganizationConformancePackDetailedStatus.go b/service/configservice/api_op_GetOrganizationConformancePackDetailedStatus.go index bdf1f2ad696..db45efa5b63 100644 --- a/service/configservice/api_op_GetOrganizationConformancePackDetailedStatus.go +++ b/service/configservice/api_op_GetOrganizationConformancePackDetailedStatus.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetOrganizationConformancePackDetailedStatus(ctx context.Contex addawsAwsjson11_serdeOpGetOrganizationConformancePackDetailedStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_GetResourceConfigHistory.go b/service/configservice/api_op_GetResourceConfigHistory.go index 79e70268a84..4aadda337cf 100644 --- a/service/configservice/api_op_GetResourceConfigHistory.go +++ b/service/configservice/api_op_GetResourceConfigHistory.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) GetResourceConfigHistory(ctx context.Context, params *GetResour addawsAwsjson11_serdeOpGetResourceConfigHistoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_ListAggregateDiscoveredResources.go b/service/configservice/api_op_ListAggregateDiscoveredResources.go index 5f051b69601..d47b117a55d 100644 --- a/service/configservice/api_op_ListAggregateDiscoveredResources.go +++ b/service/configservice/api_op_ListAggregateDiscoveredResources.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) ListAggregateDiscoveredResources(ctx context.Context, params *L addawsAwsjson11_serdeOpListAggregateDiscoveredResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_ListDiscoveredResources.go b/service/configservice/api_op_ListDiscoveredResources.go index 277c6d593d3..1df85c9fd09 100644 --- a/service/configservice/api_op_ListDiscoveredResources.go +++ b/service/configservice/api_op_ListDiscoveredResources.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) ListDiscoveredResources(ctx context.Context, params *ListDiscov addawsAwsjson11_serdeOpListDiscoveredResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_ListTagsForResource.go b/service/configservice/api_op_ListTagsForResource.go index 32506b286c9..4d155e459af 100644 --- a/service/configservice/api_op_ListTagsForResource.go +++ b/service/configservice/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_PutAggregationAuthorization.go b/service/configservice/api_op_PutAggregationAuthorization.go index 88e746cfcdd..e9182e54f12 100644 --- a/service/configservice/api_op_PutAggregationAuthorization.go +++ b/service/configservice/api_op_PutAggregationAuthorization.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutAggregationAuthorization(ctx context.Context, params *PutAgg addawsAwsjson11_serdeOpPutAggregationAuthorizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_PutConfigRule.go b/service/configservice/api_op_PutConfigRule.go index 57dcd4db6b1..a059a5a3dc4 100644 --- a/service/configservice/api_op_PutConfigRule.go +++ b/service/configservice/api_op_PutConfigRule.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -49,9 +48,9 @@ func (c *Client) PutConfigRule(ctx context.Context, params *PutConfigRuleInput, addawsAwsjson11_serdeOpPutConfigRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_PutConfigurationAggregator.go b/service/configservice/api_op_PutConfigurationAggregator.go index ac98aeca171..f7550b72147 100644 --- a/service/configservice/api_op_PutConfigurationAggregator.go +++ b/service/configservice/api_op_PutConfigurationAggregator.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) PutConfigurationAggregator(ctx context.Context, params *PutConf addawsAwsjson11_serdeOpPutConfigurationAggregatorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_PutConfigurationRecorder.go b/service/configservice/api_op_PutConfigurationRecorder.go index ecc2efde57f..d8d6f05d864 100644 --- a/service/configservice/api_op_PutConfigurationRecorder.go +++ b/service/configservice/api_op_PutConfigurationRecorder.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) PutConfigurationRecorder(ctx context.Context, params *PutConfig addawsAwsjson11_serdeOpPutConfigurationRecorderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_PutConformancePack.go b/service/configservice/api_op_PutConformancePack.go index 6a98a972467..161c695b2fe 100644 --- a/service/configservice/api_op_PutConformancePack.go +++ b/service/configservice/api_op_PutConformancePack.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) PutConformancePack(ctx context.Context, params *PutConformanceP addawsAwsjson11_serdeOpPutConformancePackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_PutDeliveryChannel.go b/service/configservice/api_op_PutDeliveryChannel.go index 3837feaa704..3ab3ea957df 100644 --- a/service/configservice/api_op_PutDeliveryChannel.go +++ b/service/configservice/api_op_PutDeliveryChannel.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) PutDeliveryChannel(ctx context.Context, params *PutDeliveryChan addawsAwsjson11_serdeOpPutDeliveryChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_PutEvaluations.go b/service/configservice/api_op_PutEvaluations.go index 57d28f26150..8b9d45e5ca9 100644 --- a/service/configservice/api_op_PutEvaluations.go +++ b/service/configservice/api_op_PutEvaluations.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) PutEvaluations(ctx context.Context, params *PutEvaluationsInput addawsAwsjson11_serdeOpPutEvaluationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_PutOrganizationConfigRule.go b/service/configservice/api_op_PutOrganizationConfigRule.go index 009b220eafc..6cabcb44ac2 100644 --- a/service/configservice/api_op_PutOrganizationConfigRule.go +++ b/service/configservice/api_op_PutOrganizationConfigRule.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) PutOrganizationConfigRule(ctx context.Context, params *PutOrgan addawsAwsjson11_serdeOpPutOrganizationConfigRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_PutOrganizationConformancePack.go b/service/configservice/api_op_PutOrganizationConformancePack.go index 71c2c0635a3..971b9ec8ff9 100644 --- a/service/configservice/api_op_PutOrganizationConformancePack.go +++ b/service/configservice/api_op_PutOrganizationConformancePack.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) PutOrganizationConformancePack(ctx context.Context, params *Put addawsAwsjson11_serdeOpPutOrganizationConformancePackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_PutRemediationConfigurations.go b/service/configservice/api_op_PutRemediationConfigurations.go index 7fbd974bb1f..5e721a22db0 100644 --- a/service/configservice/api_op_PutRemediationConfigurations.go +++ b/service/configservice/api_op_PutRemediationConfigurations.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) PutRemediationConfigurations(ctx context.Context, params *PutRe addawsAwsjson11_serdeOpPutRemediationConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_PutRemediationExceptions.go b/service/configservice/api_op_PutRemediationExceptions.go index ef8b0d9bf69..e4f40284e36 100644 --- a/service/configservice/api_op_PutRemediationExceptions.go +++ b/service/configservice/api_op_PutRemediationExceptions.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) PutRemediationExceptions(ctx context.Context, params *PutRemedi addawsAwsjson11_serdeOpPutRemediationExceptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_PutResourceConfig.go b/service/configservice/api_op_PutResourceConfig.go index bb938e2c425..16cc94de1f8 100644 --- a/service/configservice/api_op_PutResourceConfig.go +++ b/service/configservice/api_op_PutResourceConfig.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) PutResourceConfig(ctx context.Context, params *PutResourceConfi addawsAwsjson11_serdeOpPutResourceConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_PutRetentionConfiguration.go b/service/configservice/api_op_PutRetentionConfiguration.go index 7722015ffcf..f7f3eda01ec 100644 --- a/service/configservice/api_op_PutRetentionConfiguration.go +++ b/service/configservice/api_op_PutRetentionConfiguration.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) PutRetentionConfiguration(ctx context.Context, params *PutReten addawsAwsjson11_serdeOpPutRetentionConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_SelectAggregateResourceConfig.go b/service/configservice/api_op_SelectAggregateResourceConfig.go index 2d58603ad62..3688485786f 100644 --- a/service/configservice/api_op_SelectAggregateResourceConfig.go +++ b/service/configservice/api_op_SelectAggregateResourceConfig.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) SelectAggregateResourceConfig(ctx context.Context, params *Sele addawsAwsjson11_serdeOpSelectAggregateResourceConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_SelectResourceConfig.go b/service/configservice/api_op_SelectResourceConfig.go index fd12c611ff9..aa46fee5586 100644 --- a/service/configservice/api_op_SelectResourceConfig.go +++ b/service/configservice/api_op_SelectResourceConfig.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) SelectResourceConfig(ctx context.Context, params *SelectResourc addawsAwsjson11_serdeOpSelectResourceConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_StartConfigRulesEvaluation.go b/service/configservice/api_op_StartConfigRulesEvaluation.go index e5355d76e66..d426bd4c0f0 100644 --- a/service/configservice/api_op_StartConfigRulesEvaluation.go +++ b/service/configservice/api_op_StartConfigRulesEvaluation.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -44,9 +43,9 @@ func (c *Client) StartConfigRulesEvaluation(ctx context.Context, params *StartCo addawsAwsjson11_serdeOpStartConfigRulesEvaluationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_StartConfigurationRecorder.go b/service/configservice/api_op_StartConfigurationRecorder.go index 0b6a65005c6..2b8d7024994 100644 --- a/service/configservice/api_op_StartConfigurationRecorder.go +++ b/service/configservice/api_op_StartConfigurationRecorder.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) StartConfigurationRecorder(ctx context.Context, params *StartCo addawsAwsjson11_serdeOpStartConfigurationRecorderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_StartRemediationExecution.go b/service/configservice/api_op_StartRemediationExecution.go index 2d3d73b9c28..3feb3258100 100644 --- a/service/configservice/api_op_StartRemediationExecution.go +++ b/service/configservice/api_op_StartRemediationExecution.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) StartRemediationExecution(ctx context.Context, params *StartRem addawsAwsjson11_serdeOpStartRemediationExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_StopConfigurationRecorder.go b/service/configservice/api_op_StopConfigurationRecorder.go index 2e4222d0aca..348b0ee30d0 100644 --- a/service/configservice/api_op_StopConfigurationRecorder.go +++ b/service/configservice/api_op_StopConfigurationRecorder.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) StopConfigurationRecorder(ctx context.Context, params *StopConf addawsAwsjson11_serdeOpStopConfigurationRecorderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_TagResource.go b/service/configservice/api_op_TagResource.go index 2abb4e5b27a..d74f1beca06 100644 --- a/service/configservice/api_op_TagResource.go +++ b/service/configservice/api_op_TagResource.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/configservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/api_op_UntagResource.go b/service/configservice/api_op_UntagResource.go index c329137c71b..38d644b0338 100644 --- a/service/configservice/api_op_UntagResource.go +++ b/service/configservice/api_op_UntagResource.go @@ -5,7 +5,6 @@ package configservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/configservice/endpoints.go b/service/configservice/endpoints.go index fa861d2698f..d9e3af31022 100644 --- a/service/configservice/endpoints.go +++ b/service/configservice/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/connect/api_client.go b/service/connect/api_client.go index 6ce698feffc..c119dbd10bb 100644 --- a/service/connect/api_client.go +++ b/service/connect/api_client.go @@ -94,34 +94,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -194,6 +166,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/connect/api_op_CreateUser.go b/service/connect/api_op_CreateUser.go index 0fbffafcf08..9a1b5efca43 100644 --- a/service/connect/api_op_CreateUser.go +++ b/service/connect/api_op_CreateUser.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateUser(ctx context.Context, params *CreateUserInput, optFns addawsRestjson1_serdeOpCreateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_DeleteUser.go b/service/connect/api_op_DeleteUser.go index 8ddc665294e..36c0858d662 100644 --- a/service/connect/api_op_DeleteUser.go +++ b/service/connect/api_op_DeleteUser.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteUser(ctx context.Context, params *DeleteUserInput, optFns addawsRestjson1_serdeOpDeleteUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_DescribeUser.go b/service/connect/api_op_DescribeUser.go index c363992114a..43e6225cc1b 100644 --- a/service/connect/api_op_DescribeUser.go +++ b/service/connect/api_op_DescribeUser.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeUser(ctx context.Context, params *DescribeUserInput, op addawsRestjson1_serdeOpDescribeUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_DescribeUserHierarchyGroup.go b/service/connect/api_op_DescribeUserHierarchyGroup.go index e940e6e54ca..431e6f1e858 100644 --- a/service/connect/api_op_DescribeUserHierarchyGroup.go +++ b/service/connect/api_op_DescribeUserHierarchyGroup.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeUserHierarchyGroup(ctx context.Context, params *Describ addawsRestjson1_serdeOpDescribeUserHierarchyGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_DescribeUserHierarchyStructure.go b/service/connect/api_op_DescribeUserHierarchyStructure.go index c20100958fc..ada75110584 100644 --- a/service/connect/api_op_DescribeUserHierarchyStructure.go +++ b/service/connect/api_op_DescribeUserHierarchyStructure.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeUserHierarchyStructure(ctx context.Context, params *Des addawsRestjson1_serdeOpDescribeUserHierarchyStructureMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_GetContactAttributes.go b/service/connect/api_op_GetContactAttributes.go index 7995029c7cc..452f40c26f9 100644 --- a/service/connect/api_op_GetContactAttributes.go +++ b/service/connect/api_op_GetContactAttributes.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetContactAttributes(ctx context.Context, params *GetContactAtt addawsRestjson1_serdeOpGetContactAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_GetCurrentMetricData.go b/service/connect/api_op_GetCurrentMetricData.go index be9e71d5074..b8a97c877c8 100644 --- a/service/connect/api_op_GetCurrentMetricData.go +++ b/service/connect/api_op_GetCurrentMetricData.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetCurrentMetricData(ctx context.Context, params *GetCurrentMet addawsRestjson1_serdeOpGetCurrentMetricDataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_GetFederationToken.go b/service/connect/api_op_GetFederationToken.go index 7505f4e0823..202b6eb02df 100644 --- a/service/connect/api_op_GetFederationToken.go +++ b/service/connect/api_op_GetFederationToken.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetFederationToken(ctx context.Context, params *GetFederationTo addawsRestjson1_serdeOpGetFederationTokenMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_GetMetricData.go b/service/connect/api_op_GetMetricData.go index e18f88ddd51..4aa658657e1 100644 --- a/service/connect/api_op_GetMetricData.go +++ b/service/connect/api_op_GetMetricData.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetMetricData(ctx context.Context, params *GetMetricDataInput, addawsRestjson1_serdeOpGetMetricDataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_ListContactFlows.go b/service/connect/api_op_ListContactFlows.go index 636a2880da6..c9d3a7c978d 100644 --- a/service/connect/api_op_ListContactFlows.go +++ b/service/connect/api_op_ListContactFlows.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListContactFlows(ctx context.Context, params *ListContactFlowsI addawsRestjson1_serdeOpListContactFlowsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_ListHoursOfOperations.go b/service/connect/api_op_ListHoursOfOperations.go index 954c2311ac9..c1e64f133fe 100644 --- a/service/connect/api_op_ListHoursOfOperations.go +++ b/service/connect/api_op_ListHoursOfOperations.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListHoursOfOperations(ctx context.Context, params *ListHoursOfO addawsRestjson1_serdeOpListHoursOfOperationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_ListPhoneNumbers.go b/service/connect/api_op_ListPhoneNumbers.go index 75b56e53a63..ded70dec4e3 100644 --- a/service/connect/api_op_ListPhoneNumbers.go +++ b/service/connect/api_op_ListPhoneNumbers.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListPhoneNumbers(ctx context.Context, params *ListPhoneNumbersI addawsRestjson1_serdeOpListPhoneNumbersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_ListQueues.go b/service/connect/api_op_ListQueues.go index 75f181db663..61fb9878529 100644 --- a/service/connect/api_op_ListQueues.go +++ b/service/connect/api_op_ListQueues.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListQueues(ctx context.Context, params *ListQueuesInput, optFns addawsRestjson1_serdeOpListQueuesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_ListRoutingProfiles.go b/service/connect/api_op_ListRoutingProfiles.go index a18575a7e29..accb55a6773 100644 --- a/service/connect/api_op_ListRoutingProfiles.go +++ b/service/connect/api_op_ListRoutingProfiles.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListRoutingProfiles(ctx context.Context, params *ListRoutingPro addawsRestjson1_serdeOpListRoutingProfilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_ListSecurityProfiles.go b/service/connect/api_op_ListSecurityProfiles.go index 44c883e8197..6e11429e13a 100644 --- a/service/connect/api_op_ListSecurityProfiles.go +++ b/service/connect/api_op_ListSecurityProfiles.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListSecurityProfiles(ctx context.Context, params *ListSecurityP addawsRestjson1_serdeOpListSecurityProfilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_ListTagsForResource.go b/service/connect/api_op_ListTagsForResource.go index 021c6c89459..5b3ddab2877 100644 --- a/service/connect/api_op_ListTagsForResource.go +++ b/service/connect/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_ListUserHierarchyGroups.go b/service/connect/api_op_ListUserHierarchyGroups.go index 613261b3f15..f30feca41ed 100644 --- a/service/connect/api_op_ListUserHierarchyGroups.go +++ b/service/connect/api_op_ListUserHierarchyGroups.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListUserHierarchyGroups(ctx context.Context, params *ListUserHi addawsRestjson1_serdeOpListUserHierarchyGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_ListUsers.go b/service/connect/api_op_ListUsers.go index 450eb27c77c..dfed9e57d03 100644 --- a/service/connect/api_op_ListUsers.go +++ b/service/connect/api_op_ListUsers.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListUsers(ctx context.Context, params *ListUsersInput, optFns . addawsRestjson1_serdeOpListUsersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_ResumeContactRecording.go b/service/connect/api_op_ResumeContactRecording.go index 4fbea14c534..274cb05b428 100644 --- a/service/connect/api_op_ResumeContactRecording.go +++ b/service/connect/api_op_ResumeContactRecording.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ResumeContactRecording(ctx context.Context, params *ResumeConta addawsRestjson1_serdeOpResumeContactRecordingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_StartChatContact.go b/service/connect/api_op_StartChatContact.go index 91801b6a1cc..802220accc4 100644 --- a/service/connect/api_op_StartChatContact.go +++ b/service/connect/api_op_StartChatContact.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) StartChatContact(ctx context.Context, params *StartChatContactI addawsRestjson1_serdeOpStartChatContactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_StartContactRecording.go b/service/connect/api_op_StartContactRecording.go index d5dcaa28867..e78dfd3bafe 100644 --- a/service/connect/api_op_StartContactRecording.go +++ b/service/connect/api_op_StartContactRecording.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) StartContactRecording(ctx context.Context, params *StartContact addawsRestjson1_serdeOpStartContactRecordingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_StartOutboundVoiceContact.go b/service/connect/api_op_StartOutboundVoiceContact.go index c4e104ecfeb..32c01e0f812 100644 --- a/service/connect/api_op_StartOutboundVoiceContact.go +++ b/service/connect/api_op_StartOutboundVoiceContact.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) StartOutboundVoiceContact(ctx context.Context, params *StartOut addawsRestjson1_serdeOpStartOutboundVoiceContactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_StopContact.go b/service/connect/api_op_StopContact.go index d912a9ce173..22884b680d3 100644 --- a/service/connect/api_op_StopContact.go +++ b/service/connect/api_op_StopContact.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StopContact(ctx context.Context, params *StopContactInput, optF addawsRestjson1_serdeOpStopContactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_StopContactRecording.go b/service/connect/api_op_StopContactRecording.go index e99b6b12d2b..1563041061d 100644 --- a/service/connect/api_op_StopContactRecording.go +++ b/service/connect/api_op_StopContactRecording.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) StopContactRecording(ctx context.Context, params *StopContactRe addawsRestjson1_serdeOpStopContactRecordingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_SuspendContactRecording.go b/service/connect/api_op_SuspendContactRecording.go index bdc5d1301ab..288d97d2191 100644 --- a/service/connect/api_op_SuspendContactRecording.go +++ b/service/connect/api_op_SuspendContactRecording.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) SuspendContactRecording(ctx context.Context, params *SuspendCon addawsRestjson1_serdeOpSuspendContactRecordingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_TagResource.go b/service/connect/api_op_TagResource.go index 19773d8d377..d815c0c05ff 100644 --- a/service/connect/api_op_TagResource.go +++ b/service/connect/api_op_TagResource.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_UntagResource.go b/service/connect/api_op_UntagResource.go index 653d2fda38b..4d5ce12ed17 100644 --- a/service/connect/api_op_UntagResource.go +++ b/service/connect/api_op_UntagResource.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_UpdateContactAttributes.go b/service/connect/api_op_UpdateContactAttributes.go index 00721f4fadc..aa874708881 100644 --- a/service/connect/api_op_UpdateContactAttributes.go +++ b/service/connect/api_op_UpdateContactAttributes.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -37,9 +36,9 @@ func (c *Client) UpdateContactAttributes(ctx context.Context, params *UpdateCont addawsRestjson1_serdeOpUpdateContactAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_UpdateUserHierarchy.go b/service/connect/api_op_UpdateUserHierarchy.go index 36227df105a..f9c267779b6 100644 --- a/service/connect/api_op_UpdateUserHierarchy.go +++ b/service/connect/api_op_UpdateUserHierarchy.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateUserHierarchy(ctx context.Context, params *UpdateUserHier addawsRestjson1_serdeOpUpdateUserHierarchyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_UpdateUserIdentityInfo.go b/service/connect/api_op_UpdateUserIdentityInfo.go index 131d7419af9..fc9eaee0a9b 100644 --- a/service/connect/api_op_UpdateUserIdentityInfo.go +++ b/service/connect/api_op_UpdateUserIdentityInfo.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateUserIdentityInfo(ctx context.Context, params *UpdateUserI addawsRestjson1_serdeOpUpdateUserIdentityInfoMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_UpdateUserPhoneConfig.go b/service/connect/api_op_UpdateUserPhoneConfig.go index 4cd4118c499..e4f4b651d8a 100644 --- a/service/connect/api_op_UpdateUserPhoneConfig.go +++ b/service/connect/api_op_UpdateUserPhoneConfig.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateUserPhoneConfig(ctx context.Context, params *UpdateUserPh addawsRestjson1_serdeOpUpdateUserPhoneConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_UpdateUserRoutingProfile.go b/service/connect/api_op_UpdateUserRoutingProfile.go index a60c0294bbe..03803933cc9 100644 --- a/service/connect/api_op_UpdateUserRoutingProfile.go +++ b/service/connect/api_op_UpdateUserRoutingProfile.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateUserRoutingProfile(ctx context.Context, params *UpdateUse addawsRestjson1_serdeOpUpdateUserRoutingProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/api_op_UpdateUserSecurityProfiles.go b/service/connect/api_op_UpdateUserSecurityProfiles.go index 5e3695b2f25..2216a57eede 100644 --- a/service/connect/api_op_UpdateUserSecurityProfiles.go +++ b/service/connect/api_op_UpdateUserSecurityProfiles.go @@ -5,7 +5,6 @@ package connect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateUserSecurityProfiles(ctx context.Context, params *UpdateU addawsRestjson1_serdeOpUpdateUserSecurityProfilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connect/endpoints.go b/service/connect/endpoints.go index b78e2c867d5..2b74bed9966 100644 --- a/service/connect/endpoints.go +++ b/service/connect/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/connectparticipant/api_client.go b/service/connectparticipant/api_client.go index 42f1daa36fe..71c77c8a153 100644 --- a/service/connectparticipant/api_client.go +++ b/service/connectparticipant/api_client.go @@ -89,34 +89,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -189,6 +161,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/connectparticipant/api_op_CreateParticipantConnection.go b/service/connectparticipant/api_op_CreateParticipantConnection.go index 53e90d9cf55..ec8978f134d 100644 --- a/service/connectparticipant/api_op_CreateParticipantConnection.go +++ b/service/connectparticipant/api_op_CreateParticipantConnection.go @@ -5,7 +5,6 @@ package connectparticipant import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connectparticipant/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) CreateParticipantConnection(ctx context.Context, params *Create addawsRestjson1_serdeOpCreateParticipantConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connectparticipant/api_op_DisconnectParticipant.go b/service/connectparticipant/api_op_DisconnectParticipant.go index a84367830dc..b2155db49e3 100644 --- a/service/connectparticipant/api_op_DisconnectParticipant.go +++ b/service/connectparticipant/api_op_DisconnectParticipant.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DisconnectParticipant(ctx context.Context, params *DisconnectPa addawsRestjson1_serdeOpDisconnectParticipantMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connectparticipant/api_op_GetTranscript.go b/service/connectparticipant/api_op_GetTranscript.go index 5f77e796729..fc1ff7844b0 100644 --- a/service/connectparticipant/api_op_GetTranscript.go +++ b/service/connectparticipant/api_op_GetTranscript.go @@ -5,7 +5,6 @@ package connectparticipant import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/connectparticipant/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetTranscript(ctx context.Context, params *GetTranscriptInput, addawsRestjson1_serdeOpGetTranscriptMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connectparticipant/api_op_SendEvent.go b/service/connectparticipant/api_op_SendEvent.go index aa2a5d60fde..537be9aa0d7 100644 --- a/service/connectparticipant/api_op_SendEvent.go +++ b/service/connectparticipant/api_op_SendEvent.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) SendEvent(ctx context.Context, params *SendEventInput, optFns . addawsRestjson1_serdeOpSendEventMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connectparticipant/api_op_SendMessage.go b/service/connectparticipant/api_op_SendMessage.go index 1b64de041a3..1b2dee35e3f 100644 --- a/service/connectparticipant/api_op_SendMessage.go +++ b/service/connectparticipant/api_op_SendMessage.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) SendMessage(ctx context.Context, params *SendMessageInput, optF addawsRestjson1_serdeOpSendMessageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/connectparticipant/endpoints.go b/service/connectparticipant/endpoints.go index 07f5a2ad1e4..02a6221a374 100644 --- a/service/connectparticipant/endpoints.go +++ b/service/connectparticipant/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/costandusagereportservice/api_client.go b/service/costandusagereportservice/api_client.go index 1aaa7832810..5895f67a380 100644 --- a/service/costandusagereportservice/api_client.go +++ b/service/costandusagereportservice/api_client.go @@ -85,30 +85,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -174,6 +150,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/costandusagereportservice/api_op_DeleteReportDefinition.go b/service/costandusagereportservice/api_op_DeleteReportDefinition.go index ff57b8b11c9..5044cb2b466 100644 --- a/service/costandusagereportservice/api_op_DeleteReportDefinition.go +++ b/service/costandusagereportservice/api_op_DeleteReportDefinition.go @@ -5,7 +5,6 @@ package costandusagereportservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteReportDefinition(ctx context.Context, params *DeleteRepor addawsAwsjson11_serdeOpDeleteReportDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costandusagereportservice/api_op_DescribeReportDefinitions.go b/service/costandusagereportservice/api_op_DescribeReportDefinitions.go index 31b9fe5ae86..4e6ac9224a9 100644 --- a/service/costandusagereportservice/api_op_DescribeReportDefinitions.go +++ b/service/costandusagereportservice/api_op_DescribeReportDefinitions.go @@ -5,7 +5,6 @@ package costandusagereportservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costandusagereportservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeReportDefinitions(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeReportDefinitionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costandusagereportservice/api_op_ModifyReportDefinition.go b/service/costandusagereportservice/api_op_ModifyReportDefinition.go index 006ef8e90a9..9b4edbf74a2 100644 --- a/service/costandusagereportservice/api_op_ModifyReportDefinition.go +++ b/service/costandusagereportservice/api_op_ModifyReportDefinition.go @@ -5,7 +5,6 @@ package costandusagereportservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costandusagereportservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifyReportDefinition(ctx context.Context, params *ModifyRepor addawsAwsjson11_serdeOpModifyReportDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costandusagereportservice/api_op_PutReportDefinition.go b/service/costandusagereportservice/api_op_PutReportDefinition.go index a7a417bb42c..a55bbeee082 100644 --- a/service/costandusagereportservice/api_op_PutReportDefinition.go +++ b/service/costandusagereportservice/api_op_PutReportDefinition.go @@ -5,7 +5,6 @@ package costandusagereportservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costandusagereportservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutReportDefinition(ctx context.Context, params *PutReportDefin addawsAwsjson11_serdeOpPutReportDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costandusagereportservice/endpoints.go b/service/costandusagereportservice/endpoints.go index 8a7042b93f4..b8449fbf6ae 100644 --- a/service/costandusagereportservice/endpoints.go +++ b/service/costandusagereportservice/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/costexplorer/api_client.go b/service/costexplorer/api_client.go index 687e46788c4..f29e50449a4 100644 --- a/service/costexplorer/api_client.go +++ b/service/costexplorer/api_client.go @@ -88,30 +88,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -177,6 +153,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/costexplorer/api_op_CreateCostCategoryDefinition.go b/service/costexplorer/api_op_CreateCostCategoryDefinition.go index c5add9559c9..3fc97b4723c 100644 --- a/service/costexplorer/api_op_CreateCostCategoryDefinition.go +++ b/service/costexplorer/api_op_CreateCostCategoryDefinition.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateCostCategoryDefinition(ctx context.Context, params *Creat addawsAwsjson11_serdeOpCreateCostCategoryDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/api_op_DeleteCostCategoryDefinition.go b/service/costexplorer/api_op_DeleteCostCategoryDefinition.go index b37eb562460..931b54fa7b0 100644 --- a/service/costexplorer/api_op_DeleteCostCategoryDefinition.go +++ b/service/costexplorer/api_op_DeleteCostCategoryDefinition.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteCostCategoryDefinition(ctx context.Context, params *Delet addawsAwsjson11_serdeOpDeleteCostCategoryDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/api_op_DescribeCostCategoryDefinition.go b/service/costexplorer/api_op_DescribeCostCategoryDefinition.go index 7a109a4c7e1..26469268719 100644 --- a/service/costexplorer/api_op_DescribeCostCategoryDefinition.go +++ b/service/costexplorer/api_op_DescribeCostCategoryDefinition.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeCostCategoryDefinition(ctx context.Context, params *Des addawsAwsjson11_serdeOpDescribeCostCategoryDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/api_op_GetCostAndUsage.go b/service/costexplorer/api_op_GetCostAndUsage.go index 3ca280c9c21..fcd95bbc805 100644 --- a/service/costexplorer/api_op_GetCostAndUsage.go +++ b/service/costexplorer/api_op_GetCostAndUsage.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetCostAndUsage(ctx context.Context, params *GetCostAndUsageInp addawsAwsjson11_serdeOpGetCostAndUsageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/api_op_GetCostAndUsageWithResources.go b/service/costexplorer/api_op_GetCostAndUsageWithResources.go index b881111826f..13d569f157d 100644 --- a/service/costexplorer/api_op_GetCostAndUsageWithResources.go +++ b/service/costexplorer/api_op_GetCostAndUsageWithResources.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) GetCostAndUsageWithResources(ctx context.Context, params *GetCo addawsAwsjson11_serdeOpGetCostAndUsageWithResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/api_op_GetCostForecast.go b/service/costexplorer/api_op_GetCostForecast.go index 4cbfcd9a013..4121c5cf7b3 100644 --- a/service/costexplorer/api_op_GetCostForecast.go +++ b/service/costexplorer/api_op_GetCostForecast.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetCostForecast(ctx context.Context, params *GetCostForecastInp addawsAwsjson11_serdeOpGetCostForecastMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/api_op_GetDimensionValues.go b/service/costexplorer/api_op_GetDimensionValues.go index c3598bc79d2..c2efb75b5e4 100644 --- a/service/costexplorer/api_op_GetDimensionValues.go +++ b/service/costexplorer/api_op_GetDimensionValues.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetDimensionValues(ctx context.Context, params *GetDimensionVal addawsAwsjson11_serdeOpGetDimensionValuesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/api_op_GetReservationCoverage.go b/service/costexplorer/api_op_GetReservationCoverage.go index 704258f5ab1..b46d3abca5e 100644 --- a/service/costexplorer/api_op_GetReservationCoverage.go +++ b/service/costexplorer/api_op_GetReservationCoverage.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" smithy "github.com/awslabs/smithy-go" @@ -59,9 +58,9 @@ func (c *Client) GetReservationCoverage(ctx context.Context, params *GetReservat addawsAwsjson11_serdeOpGetReservationCoverageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/api_op_GetReservationPurchaseRecommendation.go b/service/costexplorer/api_op_GetReservationPurchaseRecommendation.go index 34747480f1c..9b59bae4e38 100644 --- a/service/costexplorer/api_op_GetReservationPurchaseRecommendation.go +++ b/service/costexplorer/api_op_GetReservationPurchaseRecommendation.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) GetReservationPurchaseRecommendation(ctx context.Context, param addawsAwsjson11_serdeOpGetReservationPurchaseRecommendationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/api_op_GetReservationUtilization.go b/service/costexplorer/api_op_GetReservationUtilization.go index 2fec17f91d9..d419d0b5248 100644 --- a/service/costexplorer/api_op_GetReservationUtilization.go +++ b/service/costexplorer/api_op_GetReservationUtilization.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetReservationUtilization(ctx context.Context, params *GetReser addawsAwsjson11_serdeOpGetReservationUtilizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/api_op_GetRightsizingRecommendation.go b/service/costexplorer/api_op_GetRightsizingRecommendation.go index 7d2d2a5a404..4066376c4da 100644 --- a/service/costexplorer/api_op_GetRightsizingRecommendation.go +++ b/service/costexplorer/api_op_GetRightsizingRecommendation.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetRightsizingRecommendation(ctx context.Context, params *GetRi addawsAwsjson11_serdeOpGetRightsizingRecommendationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/api_op_GetSavingsPlansCoverage.go b/service/costexplorer/api_op_GetSavingsPlansCoverage.go index 5358abe9b53..7806d6e958e 100644 --- a/service/costexplorer/api_op_GetSavingsPlansCoverage.go +++ b/service/costexplorer/api_op_GetSavingsPlansCoverage.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) GetSavingsPlansCoverage(ctx context.Context, params *GetSavings addawsAwsjson11_serdeOpGetSavingsPlansCoverageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/api_op_GetSavingsPlansPurchaseRecommendation.go b/service/costexplorer/api_op_GetSavingsPlansPurchaseRecommendation.go index b2964166a84..7581d25e70a 100644 --- a/service/costexplorer/api_op_GetSavingsPlansPurchaseRecommendation.go +++ b/service/costexplorer/api_op_GetSavingsPlansPurchaseRecommendation.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetSavingsPlansPurchaseRecommendation(ctx context.Context, para addawsAwsjson11_serdeOpGetSavingsPlansPurchaseRecommendationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/api_op_GetSavingsPlansUtilization.go b/service/costexplorer/api_op_GetSavingsPlansUtilization.go index bdfc691815f..6b2036bdf90 100644 --- a/service/costexplorer/api_op_GetSavingsPlansUtilization.go +++ b/service/costexplorer/api_op_GetSavingsPlansUtilization.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetSavingsPlansUtilization(ctx context.Context, params *GetSavi addawsAwsjson11_serdeOpGetSavingsPlansUtilizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/api_op_GetSavingsPlansUtilizationDetails.go b/service/costexplorer/api_op_GetSavingsPlansUtilizationDetails.go index 8e9c4eba782..70a62339078 100644 --- a/service/costexplorer/api_op_GetSavingsPlansUtilizationDetails.go +++ b/service/costexplorer/api_op_GetSavingsPlansUtilizationDetails.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetSavingsPlansUtilizationDetails(ctx context.Context, params * addawsAwsjson11_serdeOpGetSavingsPlansUtilizationDetailsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/api_op_GetTags.go b/service/costexplorer/api_op_GetTags.go index 5f4c93c2489..c16dcfa66ae 100644 --- a/service/costexplorer/api_op_GetTags.go +++ b/service/costexplorer/api_op_GetTags.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetTags(ctx context.Context, params *GetTagsInput, optFns ...fu addawsAwsjson11_serdeOpGetTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/api_op_GetUsageForecast.go b/service/costexplorer/api_op_GetUsageForecast.go index 3aedeb82247..5a11d57afeb 100644 --- a/service/costexplorer/api_op_GetUsageForecast.go +++ b/service/costexplorer/api_op_GetUsageForecast.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetUsageForecast(ctx context.Context, params *GetUsageForecastI addawsAwsjson11_serdeOpGetUsageForecastMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/api_op_ListCostCategoryDefinitions.go b/service/costexplorer/api_op_ListCostCategoryDefinitions.go index ea44b3ff3a9..25426f33106 100644 --- a/service/costexplorer/api_op_ListCostCategoryDefinitions.go +++ b/service/costexplorer/api_op_ListCostCategoryDefinitions.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListCostCategoryDefinitions(ctx context.Context, params *ListCo addawsAwsjson11_serdeOpListCostCategoryDefinitionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/api_op_UpdateCostCategoryDefinition.go b/service/costexplorer/api_op_UpdateCostCategoryDefinition.go index 30ee010bc2d..b7d301aa0cc 100644 --- a/service/costexplorer/api_op_UpdateCostCategoryDefinition.go +++ b/service/costexplorer/api_op_UpdateCostCategoryDefinition.go @@ -5,7 +5,6 @@ package costexplorer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateCostCategoryDefinition(ctx context.Context, params *Updat addawsAwsjson11_serdeOpUpdateCostCategoryDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/costexplorer/endpoints.go b/service/costexplorer/endpoints.go index f4a34e23f77..06065b1df38 100644 --- a/service/costexplorer/endpoints.go +++ b/service/costexplorer/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/databasemigrationservice/api_client.go b/service/databasemigrationservice/api_client.go index 1f219eabfa0..cf591bd35d7 100644 --- a/service/databasemigrationservice/api_client.go +++ b/service/databasemigrationservice/api_client.go @@ -86,30 +86,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -175,6 +151,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/databasemigrationservice/api_op_AddTagsToResource.go b/service/databasemigrationservice/api_op_AddTagsToResource.go index dab066d9d5c..54734fc48e3 100644 --- a/service/databasemigrationservice/api_op_AddTagsToResource.go +++ b/service/databasemigrationservice/api_op_AddTagsToResource.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) AddTagsToResource(ctx context.Context, params *AddTagsToResourc addawsAwsjson11_serdeOpAddTagsToResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_ApplyPendingMaintenanceAction.go b/service/databasemigrationservice/api_op_ApplyPendingMaintenanceAction.go index 62695ac4b30..09979712fb8 100644 --- a/service/databasemigrationservice/api_op_ApplyPendingMaintenanceAction.go +++ b/service/databasemigrationservice/api_op_ApplyPendingMaintenanceAction.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ApplyPendingMaintenanceAction(ctx context.Context, params *Appl addawsAwsjson11_serdeOpApplyPendingMaintenanceActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_CancelReplicationTaskAssessmentRun.go b/service/databasemigrationservice/api_op_CancelReplicationTaskAssessmentRun.go index d4ed28f8255..5864361a8d5 100644 --- a/service/databasemigrationservice/api_op_CancelReplicationTaskAssessmentRun.go +++ b/service/databasemigrationservice/api_op_CancelReplicationTaskAssessmentRun.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CancelReplicationTaskAssessmentRun(ctx context.Context, params addawsAwsjson11_serdeOpCancelReplicationTaskAssessmentRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_CreateEndpoint.go b/service/databasemigrationservice/api_op_CreateEndpoint.go index 78c073edd2b..be481b32ab6 100644 --- a/service/databasemigrationservice/api_op_CreateEndpoint.go +++ b/service/databasemigrationservice/api_op_CreateEndpoint.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateEndpoint(ctx context.Context, params *CreateEndpointInput addawsAwsjson11_serdeOpCreateEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_CreateEventSubscription.go b/service/databasemigrationservice/api_op_CreateEventSubscription.go index 8a72e255df4..12d6f81547b 100644 --- a/service/databasemigrationservice/api_op_CreateEventSubscription.go +++ b/service/databasemigrationservice/api_op_CreateEventSubscription.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) CreateEventSubscription(ctx context.Context, params *CreateEven addawsAwsjson11_serdeOpCreateEventSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_CreateReplicationInstance.go b/service/databasemigrationservice/api_op_CreateReplicationInstance.go index 78db7889ae0..4010a86b613 100644 --- a/service/databasemigrationservice/api_op_CreateReplicationInstance.go +++ b/service/databasemigrationservice/api_op_CreateReplicationInstance.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateReplicationInstance(ctx context.Context, params *CreateRe addawsAwsjson11_serdeOpCreateReplicationInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_CreateReplicationSubnetGroup.go b/service/databasemigrationservice/api_op_CreateReplicationSubnetGroup.go index fe6c70a114c..c37ca0da966 100644 --- a/service/databasemigrationservice/api_op_CreateReplicationSubnetGroup.go +++ b/service/databasemigrationservice/api_op_CreateReplicationSubnetGroup.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateReplicationSubnetGroup(ctx context.Context, params *Creat addawsAwsjson11_serdeOpCreateReplicationSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_CreateReplicationTask.go b/service/databasemigrationservice/api_op_CreateReplicationTask.go index d3d1c0c0a8d..479c075e5b7 100644 --- a/service/databasemigrationservice/api_op_CreateReplicationTask.go +++ b/service/databasemigrationservice/api_op_CreateReplicationTask.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateReplicationTask(ctx context.Context, params *CreateReplic addawsAwsjson11_serdeOpCreateReplicationTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DeleteCertificate.go b/service/databasemigrationservice/api_op_DeleteCertificate.go index bfaa89603c1..85781ed63b9 100644 --- a/service/databasemigrationservice/api_op_DeleteCertificate.go +++ b/service/databasemigrationservice/api_op_DeleteCertificate.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteCertificate(ctx context.Context, params *DeleteCertificat addawsAwsjson11_serdeOpDeleteCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DeleteConnection.go b/service/databasemigrationservice/api_op_DeleteConnection.go index e5555840762..ae4015f06bd 100644 --- a/service/databasemigrationservice/api_op_DeleteConnection.go +++ b/service/databasemigrationservice/api_op_DeleteConnection.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteConnection(ctx context.Context, params *DeleteConnectionI addawsAwsjson11_serdeOpDeleteConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DeleteEndpoint.go b/service/databasemigrationservice/api_op_DeleteEndpoint.go index 49e30dcd029..2111b9b2449 100644 --- a/service/databasemigrationservice/api_op_DeleteEndpoint.go +++ b/service/databasemigrationservice/api_op_DeleteEndpoint.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteEndpoint(ctx context.Context, params *DeleteEndpointInput addawsAwsjson11_serdeOpDeleteEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DeleteEventSubscription.go b/service/databasemigrationservice/api_op_DeleteEventSubscription.go index d051d5a3bc6..5af3e6186c4 100644 --- a/service/databasemigrationservice/api_op_DeleteEventSubscription.go +++ b/service/databasemigrationservice/api_op_DeleteEventSubscription.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteEventSubscription(ctx context.Context, params *DeleteEven addawsAwsjson11_serdeOpDeleteEventSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DeleteReplicationInstance.go b/service/databasemigrationservice/api_op_DeleteReplicationInstance.go index 3c184a89045..3551090d363 100644 --- a/service/databasemigrationservice/api_op_DeleteReplicationInstance.go +++ b/service/databasemigrationservice/api_op_DeleteReplicationInstance.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteReplicationInstance(ctx context.Context, params *DeleteRe addawsAwsjson11_serdeOpDeleteReplicationInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DeleteReplicationSubnetGroup.go b/service/databasemigrationservice/api_op_DeleteReplicationSubnetGroup.go index b11c0092904..0befd74fe84 100644 --- a/service/databasemigrationservice/api_op_DeleteReplicationSubnetGroup.go +++ b/service/databasemigrationservice/api_op_DeleteReplicationSubnetGroup.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteReplicationSubnetGroup(ctx context.Context, params *Delet addawsAwsjson11_serdeOpDeleteReplicationSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DeleteReplicationTask.go b/service/databasemigrationservice/api_op_DeleteReplicationTask.go index fb544e96631..9cb3f2f0335 100644 --- a/service/databasemigrationservice/api_op_DeleteReplicationTask.go +++ b/service/databasemigrationservice/api_op_DeleteReplicationTask.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteReplicationTask(ctx context.Context, params *DeleteReplic addawsAwsjson11_serdeOpDeleteReplicationTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DeleteReplicationTaskAssessmentRun.go b/service/databasemigrationservice/api_op_DeleteReplicationTaskAssessmentRun.go index 21b1c8e9760..c1103ce6972 100644 --- a/service/databasemigrationservice/api_op_DeleteReplicationTaskAssessmentRun.go +++ b/service/databasemigrationservice/api_op_DeleteReplicationTaskAssessmentRun.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteReplicationTaskAssessmentRun(ctx context.Context, params addawsAwsjson11_serdeOpDeleteReplicationTaskAssessmentRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeAccountAttributes.go b/service/databasemigrationservice/api_op_DescribeAccountAttributes.go index 14b6d634266..7bef4561e5f 100644 --- a/service/databasemigrationservice/api_op_DescribeAccountAttributes.go +++ b/service/databasemigrationservice/api_op_DescribeAccountAttributes.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DescribeAccountAttributes(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeAccountAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeApplicableIndividualAssessments.go b/service/databasemigrationservice/api_op_DescribeApplicableIndividualAssessments.go index 41c355a323a..3d1f651f83c 100644 --- a/service/databasemigrationservice/api_op_DescribeApplicableIndividualAssessments.go +++ b/service/databasemigrationservice/api_op_DescribeApplicableIndividualAssessments.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) DescribeApplicableIndividualAssessments(ctx context.Context, pa addawsAwsjson11_serdeOpDescribeApplicableIndividualAssessmentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeCertificates.go b/service/databasemigrationservice/api_op_DescribeCertificates.go index 2e648bb03ad..d2e28cf0952 100644 --- a/service/databasemigrationservice/api_op_DescribeCertificates.go +++ b/service/databasemigrationservice/api_op_DescribeCertificates.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeCertificates(ctx context.Context, params *DescribeCerti addawsAwsjson11_serdeOpDescribeCertificatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeConnections.go b/service/databasemigrationservice/api_op_DescribeConnections.go index ee0bb25b0e7..5436f96b2af 100644 --- a/service/databasemigrationservice/api_op_DescribeConnections.go +++ b/service/databasemigrationservice/api_op_DescribeConnections.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeConnections(ctx context.Context, params *DescribeConnec addawsAwsjson11_serdeOpDescribeConnectionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeEndpointTypes.go b/service/databasemigrationservice/api_op_DescribeEndpointTypes.go index fc2f4764edb..885a4c9c579 100644 --- a/service/databasemigrationservice/api_op_DescribeEndpointTypes.go +++ b/service/databasemigrationservice/api_op_DescribeEndpointTypes.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeEndpointTypes(ctx context.Context, params *DescribeEndp addawsAwsjson11_serdeOpDescribeEndpointTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeEndpoints.go b/service/databasemigrationservice/api_op_DescribeEndpoints.go index 77d4c73d11c..23de8478c3b 100644 --- a/service/databasemigrationservice/api_op_DescribeEndpoints.go +++ b/service/databasemigrationservice/api_op_DescribeEndpoints.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeEndpoints(ctx context.Context, params *DescribeEndpoint addawsAwsjson11_serdeOpDescribeEndpointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeEventCategories.go b/service/databasemigrationservice/api_op_DescribeEventCategories.go index 2f2faaaca70..a2a8cf26d9f 100644 --- a/service/databasemigrationservice/api_op_DescribeEventCategories.go +++ b/service/databasemigrationservice/api_op_DescribeEventCategories.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeEventCategories(ctx context.Context, params *DescribeEv addawsAwsjson11_serdeOpDescribeEventCategoriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeEventSubscriptions.go b/service/databasemigrationservice/api_op_DescribeEventSubscriptions.go index d5fb70961d6..1745c17ae33 100644 --- a/service/databasemigrationservice/api_op_DescribeEventSubscriptions.go +++ b/service/databasemigrationservice/api_op_DescribeEventSubscriptions.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeEventSubscriptions(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeEventSubscriptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeEvents.go b/service/databasemigrationservice/api_op_DescribeEvents.go index 9e4d6bb8e61..f684e187568 100644 --- a/service/databasemigrationservice/api_op_DescribeEvents.go +++ b/service/databasemigrationservice/api_op_DescribeEvents.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeEvents(ctx context.Context, params *DescribeEventsInput addawsAwsjson11_serdeOpDescribeEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeOrderableReplicationInstances.go b/service/databasemigrationservice/api_op_DescribeOrderableReplicationInstances.go index 4b5e3f8d933..e47cc8d5c1f 100644 --- a/service/databasemigrationservice/api_op_DescribeOrderableReplicationInstances.go +++ b/service/databasemigrationservice/api_op_DescribeOrderableReplicationInstances.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeOrderableReplicationInstances(ctx context.Context, para addawsAwsjson11_serdeOpDescribeOrderableReplicationInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribePendingMaintenanceActions.go b/service/databasemigrationservice/api_op_DescribePendingMaintenanceActions.go index 8be96ec8685..95ee1c26455 100644 --- a/service/databasemigrationservice/api_op_DescribePendingMaintenanceActions.go +++ b/service/databasemigrationservice/api_op_DescribePendingMaintenanceActions.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribePendingMaintenanceActions(ctx context.Context, params * addawsAwsjson11_serdeOpDescribePendingMaintenanceActionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeRefreshSchemasStatus.go b/service/databasemigrationservice/api_op_DescribeRefreshSchemasStatus.go index aa2171f1806..7e0665d2e12 100644 --- a/service/databasemigrationservice/api_op_DescribeRefreshSchemasStatus.go +++ b/service/databasemigrationservice/api_op_DescribeRefreshSchemasStatus.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeRefreshSchemasStatus(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribeRefreshSchemasStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeReplicationInstanceTaskLogs.go b/service/databasemigrationservice/api_op_DescribeReplicationInstanceTaskLogs.go index 594d664ffa3..3b047631353 100644 --- a/service/databasemigrationservice/api_op_DescribeReplicationInstanceTaskLogs.go +++ b/service/databasemigrationservice/api_op_DescribeReplicationInstanceTaskLogs.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeReplicationInstanceTaskLogs(ctx context.Context, params addawsAwsjson11_serdeOpDescribeReplicationInstanceTaskLogsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeReplicationInstances.go b/service/databasemigrationservice/api_op_DescribeReplicationInstances.go index b533a7aef04..ab84cc8460a 100644 --- a/service/databasemigrationservice/api_op_DescribeReplicationInstances.go +++ b/service/databasemigrationservice/api_op_DescribeReplicationInstances.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeReplicationInstances(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribeReplicationInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeReplicationSubnetGroups.go b/service/databasemigrationservice/api_op_DescribeReplicationSubnetGroups.go index 1ead4c0c45f..3dcf7d09221 100644 --- a/service/databasemigrationservice/api_op_DescribeReplicationSubnetGroups.go +++ b/service/databasemigrationservice/api_op_DescribeReplicationSubnetGroups.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeReplicationSubnetGroups(ctx context.Context, params *De addawsAwsjson11_serdeOpDescribeReplicationSubnetGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeReplicationTaskAssessmentResults.go b/service/databasemigrationservice/api_op_DescribeReplicationTaskAssessmentResults.go index 9d85d22b2a3..ffb7fc929ae 100644 --- a/service/databasemigrationservice/api_op_DescribeReplicationTaskAssessmentResults.go +++ b/service/databasemigrationservice/api_op_DescribeReplicationTaskAssessmentResults.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeReplicationTaskAssessmentResults(ctx context.Context, p addawsAwsjson11_serdeOpDescribeReplicationTaskAssessmentResultsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeReplicationTaskAssessmentRuns.go b/service/databasemigrationservice/api_op_DescribeReplicationTaskAssessmentRuns.go index 2b74b5f3dd3..646b42b7dea 100644 --- a/service/databasemigrationservice/api_op_DescribeReplicationTaskAssessmentRuns.go +++ b/service/databasemigrationservice/api_op_DescribeReplicationTaskAssessmentRuns.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeReplicationTaskAssessmentRuns(ctx context.Context, para addawsAwsjson11_serdeOpDescribeReplicationTaskAssessmentRunsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeReplicationTaskIndividualAssessments.go b/service/databasemigrationservice/api_op_DescribeReplicationTaskIndividualAssessments.go index 8a2967d2b13..86ae067918c 100644 --- a/service/databasemigrationservice/api_op_DescribeReplicationTaskIndividualAssessments.go +++ b/service/databasemigrationservice/api_op_DescribeReplicationTaskIndividualAssessments.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeReplicationTaskIndividualAssessments(ctx context.Contex addawsAwsjson11_serdeOpDescribeReplicationTaskIndividualAssessmentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeReplicationTasks.go b/service/databasemigrationservice/api_op_DescribeReplicationTasks.go index 78c108ebd47..b8cb55f89f1 100644 --- a/service/databasemigrationservice/api_op_DescribeReplicationTasks.go +++ b/service/databasemigrationservice/api_op_DescribeReplicationTasks.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeReplicationTasks(ctx context.Context, params *DescribeR addawsAwsjson11_serdeOpDescribeReplicationTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeSchemas.go b/service/databasemigrationservice/api_op_DescribeSchemas.go index 1adf7a70925..522feaac616 100644 --- a/service/databasemigrationservice/api_op_DescribeSchemas.go +++ b/service/databasemigrationservice/api_op_DescribeSchemas.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DescribeSchemas(ctx context.Context, params *DescribeSchemasInp addawsAwsjson11_serdeOpDescribeSchemasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_DescribeTableStatistics.go b/service/databasemigrationservice/api_op_DescribeTableStatistics.go index 6cff2dd6978..e2741caa923 100644 --- a/service/databasemigrationservice/api_op_DescribeTableStatistics.go +++ b/service/databasemigrationservice/api_op_DescribeTableStatistics.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeTableStatistics(ctx context.Context, params *DescribeTa addawsAwsjson11_serdeOpDescribeTableStatisticsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_ImportCertificate.go b/service/databasemigrationservice/api_op_ImportCertificate.go index a38f363ceff..243493a3e3a 100644 --- a/service/databasemigrationservice/api_op_ImportCertificate.go +++ b/service/databasemigrationservice/api_op_ImportCertificate.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ImportCertificate(ctx context.Context, params *ImportCertificat addawsAwsjson11_serdeOpImportCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_ListTagsForResource.go b/service/databasemigrationservice/api_op_ListTagsForResource.go index 9aa24da4609..0909da32aeb 100644 --- a/service/databasemigrationservice/api_op_ListTagsForResource.go +++ b/service/databasemigrationservice/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_ModifyEndpoint.go b/service/databasemigrationservice/api_op_ModifyEndpoint.go index 78910bc3576..2143bf57138 100644 --- a/service/databasemigrationservice/api_op_ModifyEndpoint.go +++ b/service/databasemigrationservice/api_op_ModifyEndpoint.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifyEndpoint(ctx context.Context, params *ModifyEndpointInput addawsAwsjson11_serdeOpModifyEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_ModifyEventSubscription.go b/service/databasemigrationservice/api_op_ModifyEventSubscription.go index 1e7f3d4e17d..2538d7540e4 100644 --- a/service/databasemigrationservice/api_op_ModifyEventSubscription.go +++ b/service/databasemigrationservice/api_op_ModifyEventSubscription.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifyEventSubscription(ctx context.Context, params *ModifyEven addawsAwsjson11_serdeOpModifyEventSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_ModifyReplicationInstance.go b/service/databasemigrationservice/api_op_ModifyReplicationInstance.go index 093a5512e88..bbe39974b3f 100644 --- a/service/databasemigrationservice/api_op_ModifyReplicationInstance.go +++ b/service/databasemigrationservice/api_op_ModifyReplicationInstance.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ModifyReplicationInstance(ctx context.Context, params *ModifyRe addawsAwsjson11_serdeOpModifyReplicationInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_ModifyReplicationSubnetGroup.go b/service/databasemigrationservice/api_op_ModifyReplicationSubnetGroup.go index 5d9e7db50b3..56d0991a340 100644 --- a/service/databasemigrationservice/api_op_ModifyReplicationSubnetGroup.go +++ b/service/databasemigrationservice/api_op_ModifyReplicationSubnetGroup.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifyReplicationSubnetGroup(ctx context.Context, params *Modif addawsAwsjson11_serdeOpModifyReplicationSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_ModifyReplicationTask.go b/service/databasemigrationservice/api_op_ModifyReplicationTask.go index b2971a52bbf..94e7200741d 100644 --- a/service/databasemigrationservice/api_op_ModifyReplicationTask.go +++ b/service/databasemigrationservice/api_op_ModifyReplicationTask.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ModifyReplicationTask(ctx context.Context, params *ModifyReplic addawsAwsjson11_serdeOpModifyReplicationTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_RebootReplicationInstance.go b/service/databasemigrationservice/api_op_RebootReplicationInstance.go index 5667318a682..b92ce677b3d 100644 --- a/service/databasemigrationservice/api_op_RebootReplicationInstance.go +++ b/service/databasemigrationservice/api_op_RebootReplicationInstance.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) RebootReplicationInstance(ctx context.Context, params *RebootRe addawsAwsjson11_serdeOpRebootReplicationInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_RefreshSchemas.go b/service/databasemigrationservice/api_op_RefreshSchemas.go index e3998d899e8..4dda5735c05 100644 --- a/service/databasemigrationservice/api_op_RefreshSchemas.go +++ b/service/databasemigrationservice/api_op_RefreshSchemas.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) RefreshSchemas(ctx context.Context, params *RefreshSchemasInput addawsAwsjson11_serdeOpRefreshSchemasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_ReloadTables.go b/service/databasemigrationservice/api_op_ReloadTables.go index e3cfea9ed80..79baba3b5ae 100644 --- a/service/databasemigrationservice/api_op_ReloadTables.go +++ b/service/databasemigrationservice/api_op_ReloadTables.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ReloadTables(ctx context.Context, params *ReloadTablesInput, op addawsAwsjson11_serdeOpReloadTablesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_RemoveTagsFromResource.go b/service/databasemigrationservice/api_op_RemoveTagsFromResource.go index 93a4b79822b..6d6e85da31e 100644 --- a/service/databasemigrationservice/api_op_RemoveTagsFromResource.go +++ b/service/databasemigrationservice/api_op_RemoveTagsFromResource.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RemoveTagsFromResource(ctx context.Context, params *RemoveTagsF addawsAwsjson11_serdeOpRemoveTagsFromResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_StartReplicationTask.go b/service/databasemigrationservice/api_op_StartReplicationTask.go index d78dbf790aa..e71a7d330d1 100644 --- a/service/databasemigrationservice/api_op_StartReplicationTask.go +++ b/service/databasemigrationservice/api_op_StartReplicationTask.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) StartReplicationTask(ctx context.Context, params *StartReplicat addawsAwsjson11_serdeOpStartReplicationTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_StartReplicationTaskAssessment.go b/service/databasemigrationservice/api_op_StartReplicationTaskAssessment.go index 7f7aa5e614d..0e3738ea58d 100644 --- a/service/databasemigrationservice/api_op_StartReplicationTaskAssessment.go +++ b/service/databasemigrationservice/api_op_StartReplicationTaskAssessment.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) StartReplicationTaskAssessment(ctx context.Context, params *Sta addawsAwsjson11_serdeOpStartReplicationTaskAssessmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_StartReplicationTaskAssessmentRun.go b/service/databasemigrationservice/api_op_StartReplicationTaskAssessmentRun.go index 0b5d4931770..1c33fdab6bc 100644 --- a/service/databasemigrationservice/api_op_StartReplicationTaskAssessmentRun.go +++ b/service/databasemigrationservice/api_op_StartReplicationTaskAssessmentRun.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) StartReplicationTaskAssessmentRun(ctx context.Context, params * addawsAwsjson11_serdeOpStartReplicationTaskAssessmentRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_StopReplicationTask.go b/service/databasemigrationservice/api_op_StopReplicationTask.go index 4786acd8a77..96e85fe2676 100644 --- a/service/databasemigrationservice/api_op_StopReplicationTask.go +++ b/service/databasemigrationservice/api_op_StopReplicationTask.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StopReplicationTask(ctx context.Context, params *StopReplicatio addawsAwsjson11_serdeOpStopReplicationTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/api_op_TestConnection.go b/service/databasemigrationservice/api_op_TestConnection.go index d53e84312c0..4c26c9d4d8c 100644 --- a/service/databasemigrationservice/api_op_TestConnection.go +++ b/service/databasemigrationservice/api_op_TestConnection.go @@ -5,7 +5,6 @@ package databasemigrationservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TestConnection(ctx context.Context, params *TestConnectionInput addawsAwsjson11_serdeOpTestConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/databasemigrationservice/endpoints.go b/service/databasemigrationservice/endpoints.go index 6a6b28437a2..1cba2122938 100644 --- a/service/databasemigrationservice/endpoints.go +++ b/service/databasemigrationservice/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/dataexchange/api_client.go b/service/dataexchange/api_client.go index 117d45978fa..e1242eb3c3e 100644 --- a/service/dataexchange/api_client.go +++ b/service/dataexchange/api_client.go @@ -92,30 +92,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -181,6 +157,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/dataexchange/api_op_CancelJob.go b/service/dataexchange/api_op_CancelJob.go index 5bf45bafc7f..25b587dee7d 100644 --- a/service/dataexchange/api_op_CancelJob.go +++ b/service/dataexchange/api_op_CancelJob.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CancelJob(ctx context.Context, params *CancelJobInput, optFns . addawsRestjson1_serdeOpCancelJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_CreateDataSet.go b/service/dataexchange/api_op_CreateDataSet.go index 968d92f0389..bdec32d5363 100644 --- a/service/dataexchange/api_op_CreateDataSet.go +++ b/service/dataexchange/api_op_CreateDataSet.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dataexchange/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateDataSet(ctx context.Context, params *CreateDataSetInput, addawsRestjson1_serdeOpCreateDataSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_CreateJob.go b/service/dataexchange/api_op_CreateJob.go index 846e6522cc9..0ac2fd1f1cf 100644 --- a/service/dataexchange/api_op_CreateJob.go +++ b/service/dataexchange/api_op_CreateJob.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dataexchange/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateJob(ctx context.Context, params *CreateJobInput, optFns . addawsRestjson1_serdeOpCreateJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_CreateRevision.go b/service/dataexchange/api_op_CreateRevision.go index 4ccaf3f0f78..7b766f4382b 100644 --- a/service/dataexchange/api_op_CreateRevision.go +++ b/service/dataexchange/api_op_CreateRevision.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateRevision(ctx context.Context, params *CreateRevisionInput addawsRestjson1_serdeOpCreateRevisionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_DeleteAsset.go b/service/dataexchange/api_op_DeleteAsset.go index 656a949e8b8..35020104777 100644 --- a/service/dataexchange/api_op_DeleteAsset.go +++ b/service/dataexchange/api_op_DeleteAsset.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteAsset(ctx context.Context, params *DeleteAssetInput, optF addawsRestjson1_serdeOpDeleteAssetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_DeleteDataSet.go b/service/dataexchange/api_op_DeleteDataSet.go index 5fed239e46b..eb85e7a5128 100644 --- a/service/dataexchange/api_op_DeleteDataSet.go +++ b/service/dataexchange/api_op_DeleteDataSet.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDataSet(ctx context.Context, params *DeleteDataSetInput, addawsRestjson1_serdeOpDeleteDataSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_DeleteRevision.go b/service/dataexchange/api_op_DeleteRevision.go index 3aae2bd97d2..28fcf7c651a 100644 --- a/service/dataexchange/api_op_DeleteRevision.go +++ b/service/dataexchange/api_op_DeleteRevision.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRevision(ctx context.Context, params *DeleteRevisionInput addawsRestjson1_serdeOpDeleteRevisionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_GetAsset.go b/service/dataexchange/api_op_GetAsset.go index 08a4bc32a7c..0bde6ece3cc 100644 --- a/service/dataexchange/api_op_GetAsset.go +++ b/service/dataexchange/api_op_GetAsset.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dataexchange/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetAsset(ctx context.Context, params *GetAssetInput, optFns ... addawsRestjson1_serdeOpGetAssetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_GetDataSet.go b/service/dataexchange/api_op_GetDataSet.go index 118647ec532..ee4e1c6d00a 100644 --- a/service/dataexchange/api_op_GetDataSet.go +++ b/service/dataexchange/api_op_GetDataSet.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dataexchange/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetDataSet(ctx context.Context, params *GetDataSetInput, optFns addawsRestjson1_serdeOpGetDataSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_GetJob.go b/service/dataexchange/api_op_GetJob.go index 05b4c3283a6..1e19cd91339 100644 --- a/service/dataexchange/api_op_GetJob.go +++ b/service/dataexchange/api_op_GetJob.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dataexchange/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetJob(ctx context.Context, params *GetJobInput, optFns ...func addawsRestjson1_serdeOpGetJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_GetRevision.go b/service/dataexchange/api_op_GetRevision.go index d1556487eb7..64bfbf1d2d1 100644 --- a/service/dataexchange/api_op_GetRevision.go +++ b/service/dataexchange/api_op_GetRevision.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetRevision(ctx context.Context, params *GetRevisionInput, optF addawsRestjson1_serdeOpGetRevisionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_ListDataSetRevisions.go b/service/dataexchange/api_op_ListDataSetRevisions.go index 5481f4c5629..a613d1b6ed6 100644 --- a/service/dataexchange/api_op_ListDataSetRevisions.go +++ b/service/dataexchange/api_op_ListDataSetRevisions.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dataexchange/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListDataSetRevisions(ctx context.Context, params *ListDataSetRe addawsRestjson1_serdeOpListDataSetRevisionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_ListDataSets.go b/service/dataexchange/api_op_ListDataSets.go index ada3057741e..fe55de0d9f8 100644 --- a/service/dataexchange/api_op_ListDataSets.go +++ b/service/dataexchange/api_op_ListDataSets.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dataexchange/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListDataSets(ctx context.Context, params *ListDataSetsInput, op addawsRestjson1_serdeOpListDataSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_ListJobs.go b/service/dataexchange/api_op_ListJobs.go index 4a7a45b5386..19e990f860b 100644 --- a/service/dataexchange/api_op_ListJobs.go +++ b/service/dataexchange/api_op_ListJobs.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dataexchange/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListJobs(ctx context.Context, params *ListJobsInput, optFns ... addawsRestjson1_serdeOpListJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_ListRevisionAssets.go b/service/dataexchange/api_op_ListRevisionAssets.go index f0a7ec0c181..c51816e50d4 100644 --- a/service/dataexchange/api_op_ListRevisionAssets.go +++ b/service/dataexchange/api_op_ListRevisionAssets.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dataexchange/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListRevisionAssets(ctx context.Context, params *ListRevisionAss addawsRestjson1_serdeOpListRevisionAssetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_ListTagsForResource.go b/service/dataexchange/api_op_ListTagsForResource.go index 8b05d73702e..0c1f0f4a0fa 100644 --- a/service/dataexchange/api_op_ListTagsForResource.go +++ b/service/dataexchange/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_StartJob.go b/service/dataexchange/api_op_StartJob.go index f1474868ed1..0a3c8dc98b9 100644 --- a/service/dataexchange/api_op_StartJob.go +++ b/service/dataexchange/api_op_StartJob.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StartJob(ctx context.Context, params *StartJobInput, optFns ... addawsRestjson1_serdeOpStartJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_TagResource.go b/service/dataexchange/api_op_TagResource.go index 97493df9749..b42a508f74e 100644 --- a/service/dataexchange/api_op_TagResource.go +++ b/service/dataexchange/api_op_TagResource.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_UntagResource.go b/service/dataexchange/api_op_UntagResource.go index 1856c6cb5b4..d503ef63801 100644 --- a/service/dataexchange/api_op_UntagResource.go +++ b/service/dataexchange/api_op_UntagResource.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_UpdateAsset.go b/service/dataexchange/api_op_UpdateAsset.go index 3146b64ccbd..6e5af5ab283 100644 --- a/service/dataexchange/api_op_UpdateAsset.go +++ b/service/dataexchange/api_op_UpdateAsset.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dataexchange/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateAsset(ctx context.Context, params *UpdateAssetInput, optF addawsRestjson1_serdeOpUpdateAssetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_UpdateDataSet.go b/service/dataexchange/api_op_UpdateDataSet.go index 0f080c27132..6b4a51b4b4f 100644 --- a/service/dataexchange/api_op_UpdateDataSet.go +++ b/service/dataexchange/api_op_UpdateDataSet.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dataexchange/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateDataSet(ctx context.Context, params *UpdateDataSetInput, addawsRestjson1_serdeOpUpdateDataSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/api_op_UpdateRevision.go b/service/dataexchange/api_op_UpdateRevision.go index 69fb529b785..1b56389c0fe 100644 --- a/service/dataexchange/api_op_UpdateRevision.go +++ b/service/dataexchange/api_op_UpdateRevision.go @@ -5,7 +5,6 @@ package dataexchange import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpdateRevision(ctx context.Context, params *UpdateRevisionInput addawsRestjson1_serdeOpUpdateRevisionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dataexchange/endpoints.go b/service/dataexchange/endpoints.go index 5c93c3840d7..fd35e1dda92 100644 --- a/service/dataexchange/endpoints.go +++ b/service/dataexchange/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/datapipeline/api_client.go b/service/datapipeline/api_client.go index 980c620b8af..88a717ec49d 100644 --- a/service/datapipeline/api_client.go +++ b/service/datapipeline/api_client.go @@ -94,30 +94,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -183,6 +159,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/datapipeline/api_op_ActivatePipeline.go b/service/datapipeline/api_op_ActivatePipeline.go index c7fddd4b5a9..d88f4687761 100644 --- a/service/datapipeline/api_op_ActivatePipeline.go +++ b/service/datapipeline/api_op_ActivatePipeline.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datapipeline/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ActivatePipeline(ctx context.Context, params *ActivatePipelineI addawsAwsjson11_serdeOpActivatePipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/api_op_AddTags.go b/service/datapipeline/api_op_AddTags.go index 5e4745c7287..ed7d251476e 100644 --- a/service/datapipeline/api_op_AddTags.go +++ b/service/datapipeline/api_op_AddTags.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datapipeline/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) AddTags(ctx context.Context, params *AddTagsInput, optFns ...fu addawsAwsjson11_serdeOpAddTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/api_op_CreatePipeline.go b/service/datapipeline/api_op_CreatePipeline.go index 87346dd41a9..07e48b77e89 100644 --- a/service/datapipeline/api_op_CreatePipeline.go +++ b/service/datapipeline/api_op_CreatePipeline.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datapipeline/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreatePipeline(ctx context.Context, params *CreatePipelineInput addawsAwsjson11_serdeOpCreatePipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/api_op_DeactivatePipeline.go b/service/datapipeline/api_op_DeactivatePipeline.go index cd2f75d36ce..5ca6819d7e7 100644 --- a/service/datapipeline/api_op_DeactivatePipeline.go +++ b/service/datapipeline/api_op_DeactivatePipeline.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeactivatePipeline(ctx context.Context, params *DeactivatePipel addawsAwsjson11_serdeOpDeactivatePipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/api_op_DeletePipeline.go b/service/datapipeline/api_op_DeletePipeline.go index 3e5226754c7..0484aa185e5 100644 --- a/service/datapipeline/api_op_DeletePipeline.go +++ b/service/datapipeline/api_op_DeletePipeline.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeletePipeline(ctx context.Context, params *DeletePipelineInput addawsAwsjson11_serdeOpDeletePipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/api_op_DescribeObjects.go b/service/datapipeline/api_op_DescribeObjects.go index 7c4206acbc0..81a78bb476a 100644 --- a/service/datapipeline/api_op_DescribeObjects.go +++ b/service/datapipeline/api_op_DescribeObjects.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datapipeline/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeObjects(ctx context.Context, params *DescribeObjectsInp addawsAwsjson11_serdeOpDescribeObjectsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/api_op_DescribePipelines.go b/service/datapipeline/api_op_DescribePipelines.go index 0637c7efe28..6caf146916a 100644 --- a/service/datapipeline/api_op_DescribePipelines.go +++ b/service/datapipeline/api_op_DescribePipelines.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datapipeline/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DescribePipelines(ctx context.Context, params *DescribePipeline addawsAwsjson11_serdeOpDescribePipelinesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/api_op_EvaluateExpression.go b/service/datapipeline/api_op_EvaluateExpression.go index d60b9e5521b..ebaf53f080d 100644 --- a/service/datapipeline/api_op_EvaluateExpression.go +++ b/service/datapipeline/api_op_EvaluateExpression.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) EvaluateExpression(ctx context.Context, params *EvaluateExpress addawsAwsjson11_serdeOpEvaluateExpressionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/api_op_GetPipelineDefinition.go b/service/datapipeline/api_op_GetPipelineDefinition.go index 91becd5f59b..f93e544f154 100644 --- a/service/datapipeline/api_op_GetPipelineDefinition.go +++ b/service/datapipeline/api_op_GetPipelineDefinition.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datapipeline/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetPipelineDefinition(ctx context.Context, params *GetPipelineD addawsAwsjson11_serdeOpGetPipelineDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/api_op_ListPipelines.go b/service/datapipeline/api_op_ListPipelines.go index 5d089af2ab4..14a690a77c5 100644 --- a/service/datapipeline/api_op_ListPipelines.go +++ b/service/datapipeline/api_op_ListPipelines.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datapipeline/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListPipelines(ctx context.Context, params *ListPipelinesInput, addawsAwsjson11_serdeOpListPipelinesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/api_op_PollForTask.go b/service/datapipeline/api_op_PollForTask.go index 4fda80d3e12..26cd3fbdca4 100644 --- a/service/datapipeline/api_op_PollForTask.go +++ b/service/datapipeline/api_op_PollForTask.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datapipeline/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) PollForTask(ctx context.Context, params *PollForTaskInput, optF addawsAwsjson11_serdeOpPollForTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/api_op_PutPipelineDefinition.go b/service/datapipeline/api_op_PutPipelineDefinition.go index 4827e7006a1..4437257d893 100644 --- a/service/datapipeline/api_op_PutPipelineDefinition.go +++ b/service/datapipeline/api_op_PutPipelineDefinition.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datapipeline/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) PutPipelineDefinition(ctx context.Context, params *PutPipelineD addawsAwsjson11_serdeOpPutPipelineDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/api_op_QueryObjects.go b/service/datapipeline/api_op_QueryObjects.go index f29437ef4a4..e1bce213c50 100644 --- a/service/datapipeline/api_op_QueryObjects.go +++ b/service/datapipeline/api_op_QueryObjects.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datapipeline/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) QueryObjects(ctx context.Context, params *QueryObjectsInput, op addawsAwsjson11_serdeOpQueryObjectsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/api_op_RemoveTags.go b/service/datapipeline/api_op_RemoveTags.go index d2a7ab21e53..0385447c09c 100644 --- a/service/datapipeline/api_op_RemoveTags.go +++ b/service/datapipeline/api_op_RemoveTags.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RemoveTags(ctx context.Context, params *RemoveTagsInput, optFns addawsAwsjson11_serdeOpRemoveTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/api_op_ReportTaskProgress.go b/service/datapipeline/api_op_ReportTaskProgress.go index 08939a64d1a..057d3ab92d2 100644 --- a/service/datapipeline/api_op_ReportTaskProgress.go +++ b/service/datapipeline/api_op_ReportTaskProgress.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datapipeline/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ReportTaskProgress(ctx context.Context, params *ReportTaskProgr addawsAwsjson11_serdeOpReportTaskProgressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/api_op_ReportTaskRunnerHeartbeat.go b/service/datapipeline/api_op_ReportTaskRunnerHeartbeat.go index b5b0e61ba77..0cf80737ec8 100644 --- a/service/datapipeline/api_op_ReportTaskRunnerHeartbeat.go +++ b/service/datapipeline/api_op_ReportTaskRunnerHeartbeat.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) ReportTaskRunnerHeartbeat(ctx context.Context, params *ReportTa addawsAwsjson11_serdeOpReportTaskRunnerHeartbeatMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/api_op_SetStatus.go b/service/datapipeline/api_op_SetStatus.go index f18314c7200..39938a94c5a 100644 --- a/service/datapipeline/api_op_SetStatus.go +++ b/service/datapipeline/api_op_SetStatus.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) SetStatus(ctx context.Context, params *SetStatusInput, optFns . addawsAwsjson11_serdeOpSetStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/api_op_SetTaskStatus.go b/service/datapipeline/api_op_SetTaskStatus.go index e2c1e55160f..a45178dcc4c 100644 --- a/service/datapipeline/api_op_SetTaskStatus.go +++ b/service/datapipeline/api_op_SetTaskStatus.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datapipeline/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) SetTaskStatus(ctx context.Context, params *SetTaskStatusInput, addawsAwsjson11_serdeOpSetTaskStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/api_op_ValidatePipelineDefinition.go b/service/datapipeline/api_op_ValidatePipelineDefinition.go index bfc1b119d06..8d548d689f7 100644 --- a/service/datapipeline/api_op_ValidatePipelineDefinition.go +++ b/service/datapipeline/api_op_ValidatePipelineDefinition.go @@ -5,7 +5,6 @@ package datapipeline import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datapipeline/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ValidatePipelineDefinition(ctx context.Context, params *Validat addawsAwsjson11_serdeOpValidatePipelineDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datapipeline/endpoints.go b/service/datapipeline/endpoints.go index 01197678bcc..bf204129338 100644 --- a/service/datapipeline/endpoints.go +++ b/service/datapipeline/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/datasync/api_client.go b/service/datasync/api_client.go index 74a07a4efa8..8b08faa5cbc 100644 --- a/service/datasync/api_client.go +++ b/service/datasync/api_client.go @@ -81,30 +81,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -170,6 +146,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/datasync/api_op_CancelTaskExecution.go b/service/datasync/api_op_CancelTaskExecution.go index 6a58e6371b2..29eb52c83dc 100644 --- a/service/datasync/api_op_CancelTaskExecution.go +++ b/service/datasync/api_op_CancelTaskExecution.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) CancelTaskExecution(ctx context.Context, params *CancelTaskExec addawsAwsjson11_serdeOpCancelTaskExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_CreateAgent.go b/service/datasync/api_op_CreateAgent.go index 5b4b689690f..130f12253a4 100644 --- a/service/datasync/api_op_CreateAgent.go +++ b/service/datasync/api_op_CreateAgent.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) CreateAgent(ctx context.Context, params *CreateAgentInput, optF addawsAwsjson11_serdeOpCreateAgentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_CreateLocationEfs.go b/service/datasync/api_op_CreateLocationEfs.go index 0ad56e8e21f..10466141dc3 100644 --- a/service/datasync/api_op_CreateLocationEfs.go +++ b/service/datasync/api_op_CreateLocationEfs.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateLocationEfs(ctx context.Context, params *CreateLocationEf addawsAwsjson11_serdeOpCreateLocationEfsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_CreateLocationFsxWindows.go b/service/datasync/api_op_CreateLocationFsxWindows.go index 44655bd528a..3093ae37be3 100644 --- a/service/datasync/api_op_CreateLocationFsxWindows.go +++ b/service/datasync/api_op_CreateLocationFsxWindows.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateLocationFsxWindows(ctx context.Context, params *CreateLoc addawsAwsjson11_serdeOpCreateLocationFsxWindowsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_CreateLocationNfs.go b/service/datasync/api_op_CreateLocationNfs.go index 93d39af663d..e619ca03eb6 100644 --- a/service/datasync/api_op_CreateLocationNfs.go +++ b/service/datasync/api_op_CreateLocationNfs.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateLocationNfs(ctx context.Context, params *CreateLocationNf addawsAwsjson11_serdeOpCreateLocationNfsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_CreateLocationObjectStorage.go b/service/datasync/api_op_CreateLocationObjectStorage.go index b707f39bc12..0a1bb63b017 100644 --- a/service/datasync/api_op_CreateLocationObjectStorage.go +++ b/service/datasync/api_op_CreateLocationObjectStorage.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateLocationObjectStorage(ctx context.Context, params *Create addawsAwsjson11_serdeOpCreateLocationObjectStorageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_CreateLocationS3.go b/service/datasync/api_op_CreateLocationS3.go index 18a65599084..1d3616e9703 100644 --- a/service/datasync/api_op_CreateLocationS3.go +++ b/service/datasync/api_op_CreateLocationS3.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateLocationS3(ctx context.Context, params *CreateLocationS3I addawsAwsjson11_serdeOpCreateLocationS3Middlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_CreateLocationSmb.go b/service/datasync/api_op_CreateLocationSmb.go index 601ed222e84..784027463f3 100644 --- a/service/datasync/api_op_CreateLocationSmb.go +++ b/service/datasync/api_op_CreateLocationSmb.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateLocationSmb(ctx context.Context, params *CreateLocationSm addawsAwsjson11_serdeOpCreateLocationSmbMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_CreateTask.go b/service/datasync/api_op_CreateTask.go index 9ac2488b4d3..d222c08880d 100644 --- a/service/datasync/api_op_CreateTask.go +++ b/service/datasync/api_op_CreateTask.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) CreateTask(ctx context.Context, params *CreateTaskInput, optFns addawsAwsjson11_serdeOpCreateTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_DeleteAgent.go b/service/datasync/api_op_DeleteAgent.go index 74c156edf6b..8f4fb565829 100644 --- a/service/datasync/api_op_DeleteAgent.go +++ b/service/datasync/api_op_DeleteAgent.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteAgent(ctx context.Context, params *DeleteAgentInput, optF addawsAwsjson11_serdeOpDeleteAgentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_DeleteLocation.go b/service/datasync/api_op_DeleteLocation.go index e63fa0c2c7e..2778e9c0542 100644 --- a/service/datasync/api_op_DeleteLocation.go +++ b/service/datasync/api_op_DeleteLocation.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteLocation(ctx context.Context, params *DeleteLocationInput addawsAwsjson11_serdeOpDeleteLocationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_DeleteTask.go b/service/datasync/api_op_DeleteTask.go index 41a33330671..1514f48ba41 100644 --- a/service/datasync/api_op_DeleteTask.go +++ b/service/datasync/api_op_DeleteTask.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteTask(ctx context.Context, params *DeleteTaskInput, optFns addawsAwsjson11_serdeOpDeleteTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_DescribeAgent.go b/service/datasync/api_op_DescribeAgent.go index 70674ad211a..c4355e740f8 100644 --- a/service/datasync/api_op_DescribeAgent.go +++ b/service/datasync/api_op_DescribeAgent.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeAgent(ctx context.Context, params *DescribeAgentInput, addawsAwsjson11_serdeOpDescribeAgentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_DescribeLocationEfs.go b/service/datasync/api_op_DescribeLocationEfs.go index dad76bad8ce..0621bd83149 100644 --- a/service/datasync/api_op_DescribeLocationEfs.go +++ b/service/datasync/api_op_DescribeLocationEfs.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeLocationEfs(ctx context.Context, params *DescribeLocati addawsAwsjson11_serdeOpDescribeLocationEfsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_DescribeLocationFsxWindows.go b/service/datasync/api_op_DescribeLocationFsxWindows.go index 1671f08bcad..fe05165bf91 100644 --- a/service/datasync/api_op_DescribeLocationFsxWindows.go +++ b/service/datasync/api_op_DescribeLocationFsxWindows.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DescribeLocationFsxWindows(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeLocationFsxWindowsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_DescribeLocationNfs.go b/service/datasync/api_op_DescribeLocationNfs.go index 3dd432e400b..f5ec3e5fbd7 100644 --- a/service/datasync/api_op_DescribeLocationNfs.go +++ b/service/datasync/api_op_DescribeLocationNfs.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeLocationNfs(ctx context.Context, params *DescribeLocati addawsAwsjson11_serdeOpDescribeLocationNfsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_DescribeLocationObjectStorage.go b/service/datasync/api_op_DescribeLocationObjectStorage.go index 0ed82947401..50fd80bf930 100644 --- a/service/datasync/api_op_DescribeLocationObjectStorage.go +++ b/service/datasync/api_op_DescribeLocationObjectStorage.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeLocationObjectStorage(ctx context.Context, params *Desc addawsAwsjson11_serdeOpDescribeLocationObjectStorageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_DescribeLocationS3.go b/service/datasync/api_op_DescribeLocationS3.go index 8187cb77bf7..c80764563fa 100644 --- a/service/datasync/api_op_DescribeLocationS3.go +++ b/service/datasync/api_op_DescribeLocationS3.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeLocationS3(ctx context.Context, params *DescribeLocatio addawsAwsjson11_serdeOpDescribeLocationS3Middlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_DescribeLocationSmb.go b/service/datasync/api_op_DescribeLocationSmb.go index ab1a37b20cb..a4de4e93fb9 100644 --- a/service/datasync/api_op_DescribeLocationSmb.go +++ b/service/datasync/api_op_DescribeLocationSmb.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeLocationSmb(ctx context.Context, params *DescribeLocati addawsAwsjson11_serdeOpDescribeLocationSmbMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_DescribeTask.go b/service/datasync/api_op_DescribeTask.go index d12d0b9011a..d479a81d60d 100644 --- a/service/datasync/api_op_DescribeTask.go +++ b/service/datasync/api_op_DescribeTask.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeTask(ctx context.Context, params *DescribeTaskInput, op addawsAwsjson11_serdeOpDescribeTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_DescribeTaskExecution.go b/service/datasync/api_op_DescribeTaskExecution.go index ee724f81754..34f34830940 100644 --- a/service/datasync/api_op_DescribeTaskExecution.go +++ b/service/datasync/api_op_DescribeTaskExecution.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeTaskExecution(ctx context.Context, params *DescribeTask addawsAwsjson11_serdeOpDescribeTaskExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_ListAgents.go b/service/datasync/api_op_ListAgents.go index 6a0a9432e76..7bf33588bbc 100644 --- a/service/datasync/api_op_ListAgents.go +++ b/service/datasync/api_op_ListAgents.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListAgents(ctx context.Context, params *ListAgentsInput, optFns addawsAwsjson11_serdeOpListAgentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_ListLocations.go b/service/datasync/api_op_ListLocations.go index 145fec0a8e8..96f3adffd6c 100644 --- a/service/datasync/api_op_ListLocations.go +++ b/service/datasync/api_op_ListLocations.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListLocations(ctx context.Context, params *ListLocationsInput, addawsAwsjson11_serdeOpListLocationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_ListTagsForResource.go b/service/datasync/api_op_ListTagsForResource.go index 26375685d3c..58ccc03d36d 100644 --- a/service/datasync/api_op_ListTagsForResource.go +++ b/service/datasync/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_ListTaskExecutions.go b/service/datasync/api_op_ListTaskExecutions.go index fbcabfcb756..8a3b7d7301d 100644 --- a/service/datasync/api_op_ListTaskExecutions.go +++ b/service/datasync/api_op_ListTaskExecutions.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTaskExecutions(ctx context.Context, params *ListTaskExecuti addawsAwsjson11_serdeOpListTaskExecutionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_ListTasks.go b/service/datasync/api_op_ListTasks.go index 69c3d5fdd4f..f767d274448 100644 --- a/service/datasync/api_op_ListTasks.go +++ b/service/datasync/api_op_ListTasks.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTasks(ctx context.Context, params *ListTasksInput, optFns . addawsAwsjson11_serdeOpListTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_StartTaskExecution.go b/service/datasync/api_op_StartTaskExecution.go index 03ccfd0029c..89a13b65f12 100644 --- a/service/datasync/api_op_StartTaskExecution.go +++ b/service/datasync/api_op_StartTaskExecution.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) StartTaskExecution(ctx context.Context, params *StartTaskExecut addawsAwsjson11_serdeOpStartTaskExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_TagResource.go b/service/datasync/api_op_TagResource.go index 13262c70e0a..9e73cd27e73 100644 --- a/service/datasync/api_op_TagResource.go +++ b/service/datasync/api_op_TagResource.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_UntagResource.go b/service/datasync/api_op_UntagResource.go index 080e6179c96..889f8a773fa 100644 --- a/service/datasync/api_op_UntagResource.go +++ b/service/datasync/api_op_UntagResource.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_UpdateAgent.go b/service/datasync/api_op_UpdateAgent.go index 7f6a613e08c..c586cf74b5f 100644 --- a/service/datasync/api_op_UpdateAgent.go +++ b/service/datasync/api_op_UpdateAgent.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateAgent(ctx context.Context, params *UpdateAgentInput, optF addawsAwsjson11_serdeOpUpdateAgentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/api_op_UpdateTask.go b/service/datasync/api_op_UpdateTask.go index 313beb22c32..a158f4d5c12 100644 --- a/service/datasync/api_op_UpdateTask.go +++ b/service/datasync/api_op_UpdateTask.go @@ -5,7 +5,6 @@ package datasync import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/datasync/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateTask(ctx context.Context, params *UpdateTaskInput, optFns addawsAwsjson11_serdeOpUpdateTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/datasync/endpoints.go b/service/datasync/endpoints.go index e4c41efb5de..816d578e1c1 100644 --- a/service/datasync/endpoints.go +++ b/service/datasync/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/dax/api_client.go b/service/dax/api_client.go index 9333b9bcc35..ff21d20e4e4 100644 --- a/service/dax/api_client.go +++ b/service/dax/api_client.go @@ -82,30 +82,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -171,6 +147,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/dax/api_op_CreateCluster.go b/service/dax/api_op_CreateCluster.go index 322459badbf..29ec38a5577 100644 --- a/service/dax/api_op_CreateCluster.go +++ b/service/dax/api_op_CreateCluster.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateCluster(ctx context.Context, params *CreateClusterInput, addawsAwsjson11_serdeOpCreateClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_CreateParameterGroup.go b/service/dax/api_op_CreateParameterGroup.go index 6164b478f41..13b0a7fd5c3 100644 --- a/service/dax/api_op_CreateParameterGroup.go +++ b/service/dax/api_op_CreateParameterGroup.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateParameterGroup(ctx context.Context, params *CreateParamet addawsAwsjson11_serdeOpCreateParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_CreateSubnetGroup.go b/service/dax/api_op_CreateSubnetGroup.go index b74ebd25554..fc0d328e14e 100644 --- a/service/dax/api_op_CreateSubnetGroup.go +++ b/service/dax/api_op_CreateSubnetGroup.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateSubnetGroup(ctx context.Context, params *CreateSubnetGrou addawsAwsjson11_serdeOpCreateSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_DecreaseReplicationFactor.go b/service/dax/api_op_DecreaseReplicationFactor.go index 34396444b4d..bbe0a9a28ae 100644 --- a/service/dax/api_op_DecreaseReplicationFactor.go +++ b/service/dax/api_op_DecreaseReplicationFactor.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DecreaseReplicationFactor(ctx context.Context, params *Decrease addawsAwsjson11_serdeOpDecreaseReplicationFactorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_DeleteCluster.go b/service/dax/api_op_DeleteCluster.go index de66be3330c..55fd6efc1a3 100644 --- a/service/dax/api_op_DeleteCluster.go +++ b/service/dax/api_op_DeleteCluster.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteCluster(ctx context.Context, params *DeleteClusterInput, addawsAwsjson11_serdeOpDeleteClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_DeleteParameterGroup.go b/service/dax/api_op_DeleteParameterGroup.go index 3b28f8a9a8e..f0f15f9073e 100644 --- a/service/dax/api_op_DeleteParameterGroup.go +++ b/service/dax/api_op_DeleteParameterGroup.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteParameterGroup(ctx context.Context, params *DeleteParamet addawsAwsjson11_serdeOpDeleteParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_DeleteSubnetGroup.go b/service/dax/api_op_DeleteSubnetGroup.go index e3a56a01f67..f845df864bd 100644 --- a/service/dax/api_op_DeleteSubnetGroup.go +++ b/service/dax/api_op_DeleteSubnetGroup.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteSubnetGroup(ctx context.Context, params *DeleteSubnetGrou addawsAwsjson11_serdeOpDeleteSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_DescribeClusters.go b/service/dax/api_op_DescribeClusters.go index d577e3ac964..95a844054ce 100644 --- a/service/dax/api_op_DescribeClusters.go +++ b/service/dax/api_op_DescribeClusters.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) DescribeClusters(ctx context.Context, params *DescribeClustersI addawsAwsjson11_serdeOpDescribeClustersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_DescribeDefaultParameters.go b/service/dax/api_op_DescribeDefaultParameters.go index 07f8eb410a7..9f6df42085c 100644 --- a/service/dax/api_op_DescribeDefaultParameters.go +++ b/service/dax/api_op_DescribeDefaultParameters.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDefaultParameters(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeDefaultParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_DescribeEvents.go b/service/dax/api_op_DescribeEvents.go index b2c798bd2f5..40c90adc625 100644 --- a/service/dax/api_op_DescribeEvents.go +++ b/service/dax/api_op_DescribeEvents.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeEvents(ctx context.Context, params *DescribeEventsInput addawsAwsjson11_serdeOpDescribeEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_DescribeParameterGroups.go b/service/dax/api_op_DescribeParameterGroups.go index e08468ef446..320145866c5 100644 --- a/service/dax/api_op_DescribeParameterGroups.go +++ b/service/dax/api_op_DescribeParameterGroups.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeParameterGroups(ctx context.Context, params *DescribePa addawsAwsjson11_serdeOpDescribeParameterGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_DescribeParameters.go b/service/dax/api_op_DescribeParameters.go index d3653cd04ff..157190626d1 100644 --- a/service/dax/api_op_DescribeParameters.go +++ b/service/dax/api_op_DescribeParameters.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeParameters(ctx context.Context, params *DescribeParamet addawsAwsjson11_serdeOpDescribeParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_DescribeSubnetGroups.go b/service/dax/api_op_DescribeSubnetGroups.go index 8261eb3f714..4ecba54be75 100644 --- a/service/dax/api_op_DescribeSubnetGroups.go +++ b/service/dax/api_op_DescribeSubnetGroups.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeSubnetGroups(ctx context.Context, params *DescribeSubne addawsAwsjson11_serdeOpDescribeSubnetGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_IncreaseReplicationFactor.go b/service/dax/api_op_IncreaseReplicationFactor.go index fbb29dcd022..176f6606337 100644 --- a/service/dax/api_op_IncreaseReplicationFactor.go +++ b/service/dax/api_op_IncreaseReplicationFactor.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) IncreaseReplicationFactor(ctx context.Context, params *Increase addawsAwsjson11_serdeOpIncreaseReplicationFactorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_ListTags.go b/service/dax/api_op_ListTags.go index 943de7a6870..d850af6fe53 100644 --- a/service/dax/api_op_ListTags.go +++ b/service/dax/api_op_ListTags.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTags(ctx context.Context, params *ListTagsInput, optFns ... addawsAwsjson11_serdeOpListTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_RebootNode.go b/service/dax/api_op_RebootNode.go index c30cf0fd6f6..c0eff8fcd24 100644 --- a/service/dax/api_op_RebootNode.go +++ b/service/dax/api_op_RebootNode.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) RebootNode(ctx context.Context, params *RebootNodeInput, optFns addawsAwsjson11_serdeOpRebootNodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_TagResource.go b/service/dax/api_op_TagResource.go index c33b0af06b9..c41caab1fe7 100644 --- a/service/dax/api_op_TagResource.go +++ b/service/dax/api_op_TagResource.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_UntagResource.go b/service/dax/api_op_UntagResource.go index 658dabb6dc0..33e7e1e08f8 100644 --- a/service/dax/api_op_UntagResource.go +++ b/service/dax/api_op_UntagResource.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_UpdateCluster.go b/service/dax/api_op_UpdateCluster.go index 6ae4fac1f25..0e4d15aa488 100644 --- a/service/dax/api_op_UpdateCluster.go +++ b/service/dax/api_op_UpdateCluster.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateCluster(ctx context.Context, params *UpdateClusterInput, addawsAwsjson11_serdeOpUpdateClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_UpdateParameterGroup.go b/service/dax/api_op_UpdateParameterGroup.go index dc8602c4972..da6150d79bb 100644 --- a/service/dax/api_op_UpdateParameterGroup.go +++ b/service/dax/api_op_UpdateParameterGroup.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateParameterGroup(ctx context.Context, params *UpdateParamet addawsAwsjson11_serdeOpUpdateParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/api_op_UpdateSubnetGroup.go b/service/dax/api_op_UpdateSubnetGroup.go index 3d43513803b..6786be97679 100644 --- a/service/dax/api_op_UpdateSubnetGroup.go +++ b/service/dax/api_op_UpdateSubnetGroup.go @@ -5,7 +5,6 @@ package dax import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dax/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateSubnetGroup(ctx context.Context, params *UpdateSubnetGrou addawsAwsjson11_serdeOpUpdateSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dax/endpoints.go b/service/dax/endpoints.go index 8660f86944f..6086e080ca3 100644 --- a/service/dax/endpoints.go +++ b/service/dax/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/detective/api_client.go b/service/detective/api_client.go index bb04a2dc9a7..6517be08cb1 100644 --- a/service/detective/api_client.go +++ b/service/detective/api_client.go @@ -117,30 +117,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -206,6 +182,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/detective/api_op_AcceptInvitation.go b/service/detective/api_op_AcceptInvitation.go index 07c03ee99c4..a8492b673c8 100644 --- a/service/detective/api_op_AcceptInvitation.go +++ b/service/detective/api_op_AcceptInvitation.go @@ -5,7 +5,6 @@ package detective import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) AcceptInvitation(ctx context.Context, params *AcceptInvitationI addawsRestjson1_serdeOpAcceptInvitationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/detective/api_op_CreateGraph.go b/service/detective/api_op_CreateGraph.go index e31e9b4c158..d928a8044cb 100644 --- a/service/detective/api_op_CreateGraph.go +++ b/service/detective/api_op_CreateGraph.go @@ -5,7 +5,6 @@ package detective import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) CreateGraph(ctx context.Context, params *CreateGraphInput, optF addawsRestjson1_serdeOpCreateGraphMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/detective/api_op_CreateMembers.go b/service/detective/api_op_CreateMembers.go index c3ae605776e..fdde0df55bc 100644 --- a/service/detective/api_op_CreateMembers.go +++ b/service/detective/api_op_CreateMembers.go @@ -5,7 +5,6 @@ package detective import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/detective/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) CreateMembers(ctx context.Context, params *CreateMembersInput, addawsRestjson1_serdeOpCreateMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/detective/api_op_DeleteGraph.go b/service/detective/api_op_DeleteGraph.go index 1b4691a2b33..eeec0942654 100644 --- a/service/detective/api_op_DeleteGraph.go +++ b/service/detective/api_op_DeleteGraph.go @@ -5,7 +5,6 @@ package detective import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteGraph(ctx context.Context, params *DeleteGraphInput, optF addawsRestjson1_serdeOpDeleteGraphMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/detective/api_op_DeleteMembers.go b/service/detective/api_op_DeleteMembers.go index 79f4320f70b..55ca9316a6e 100644 --- a/service/detective/api_op_DeleteMembers.go +++ b/service/detective/api_op_DeleteMembers.go @@ -5,7 +5,6 @@ package detective import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/detective/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteMembers(ctx context.Context, params *DeleteMembersInput, addawsRestjson1_serdeOpDeleteMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/detective/api_op_DisassociateMembership.go b/service/detective/api_op_DisassociateMembership.go index efbfe9939ab..d1dee7d6859 100644 --- a/service/detective/api_op_DisassociateMembership.go +++ b/service/detective/api_op_DisassociateMembership.go @@ -5,7 +5,6 @@ package detective import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisassociateMembership(ctx context.Context, params *Disassociat addawsRestjson1_serdeOpDisassociateMembershipMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/detective/api_op_GetMembers.go b/service/detective/api_op_GetMembers.go index 8f1bcacc6bb..b1c6ea79c6e 100644 --- a/service/detective/api_op_GetMembers.go +++ b/service/detective/api_op_GetMembers.go @@ -5,7 +5,6 @@ package detective import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/detective/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetMembers(ctx context.Context, params *GetMembersInput, optFns addawsRestjson1_serdeOpGetMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/detective/api_op_ListGraphs.go b/service/detective/api_op_ListGraphs.go index 69976c900b8..5896ad23fa8 100644 --- a/service/detective/api_op_ListGraphs.go +++ b/service/detective/api_op_ListGraphs.go @@ -5,7 +5,6 @@ package detective import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/detective/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListGraphs(ctx context.Context, params *ListGraphsInput, optFns addawsRestjson1_serdeOpListGraphsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/detective/api_op_ListInvitations.go b/service/detective/api_op_ListInvitations.go index d1c823204ad..f6525cc71dc 100644 --- a/service/detective/api_op_ListInvitations.go +++ b/service/detective/api_op_ListInvitations.go @@ -5,7 +5,6 @@ package detective import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/detective/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListInvitations(ctx context.Context, params *ListInvitationsInp addawsRestjson1_serdeOpListInvitationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/detective/api_op_ListMembers.go b/service/detective/api_op_ListMembers.go index 8de9a0d90b4..8e4e14070eb 100644 --- a/service/detective/api_op_ListMembers.go +++ b/service/detective/api_op_ListMembers.go @@ -5,7 +5,6 @@ package detective import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/detective/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListMembers(ctx context.Context, params *ListMembersInput, optF addawsRestjson1_serdeOpListMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/detective/api_op_RejectInvitation.go b/service/detective/api_op_RejectInvitation.go index f211ea0042d..8be9a17a591 100644 --- a/service/detective/api_op_RejectInvitation.go +++ b/service/detective/api_op_RejectInvitation.go @@ -5,7 +5,6 @@ package detective import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) RejectInvitation(ctx context.Context, params *RejectInvitationI addawsRestjson1_serdeOpRejectInvitationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/detective/api_op_StartMonitoringMember.go b/service/detective/api_op_StartMonitoringMember.go index 8ec64cc4219..158e78b398f 100644 --- a/service/detective/api_op_StartMonitoringMember.go +++ b/service/detective/api_op_StartMonitoringMember.go @@ -5,7 +5,6 @@ package detective import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) StartMonitoringMember(ctx context.Context, params *StartMonitor addawsRestjson1_serdeOpStartMonitoringMemberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/detective/endpoints.go b/service/detective/endpoints.go index c1a3bac1366..5ba871f4ff4 100644 --- a/service/detective/endpoints.go +++ b/service/detective/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/devicefarm/api_client.go b/service/devicefarm/api_client.go index e081d2b42b0..e80cb80a383 100644 --- a/service/devicefarm/api_client.go +++ b/service/devicefarm/api_client.go @@ -90,30 +90,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -179,6 +155,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/devicefarm/api_op_CreateDevicePool.go b/service/devicefarm/api_op_CreateDevicePool.go index 1b1a4e62ca2..e7af62ffda2 100644 --- a/service/devicefarm/api_op_CreateDevicePool.go +++ b/service/devicefarm/api_op_CreateDevicePool.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDevicePool(ctx context.Context, params *CreateDevicePoolI addawsAwsjson11_serdeOpCreateDevicePoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_CreateInstanceProfile.go b/service/devicefarm/api_op_CreateInstanceProfile.go index 5971acb1678..cd5945bf00f 100644 --- a/service/devicefarm/api_op_CreateInstanceProfile.go +++ b/service/devicefarm/api_op_CreateInstanceProfile.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateInstanceProfile(ctx context.Context, params *CreateInstan addawsAwsjson11_serdeOpCreateInstanceProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_CreateNetworkProfile.go b/service/devicefarm/api_op_CreateNetworkProfile.go index 46ed713dafc..dbf8717f621 100644 --- a/service/devicefarm/api_op_CreateNetworkProfile.go +++ b/service/devicefarm/api_op_CreateNetworkProfile.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateNetworkProfile(ctx context.Context, params *CreateNetwork addawsAwsjson11_serdeOpCreateNetworkProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_CreateProject.go b/service/devicefarm/api_op_CreateProject.go index ef27cc9128c..fd733ce5250 100644 --- a/service/devicefarm/api_op_CreateProject.go +++ b/service/devicefarm/api_op_CreateProject.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateProject(ctx context.Context, params *CreateProjectInput, addawsAwsjson11_serdeOpCreateProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_CreateRemoteAccessSession.go b/service/devicefarm/api_op_CreateRemoteAccessSession.go index c6de37428b4..7e894f1c880 100644 --- a/service/devicefarm/api_op_CreateRemoteAccessSession.go +++ b/service/devicefarm/api_op_CreateRemoteAccessSession.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateRemoteAccessSession(ctx context.Context, params *CreateRe addawsAwsjson11_serdeOpCreateRemoteAccessSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_CreateTestGridProject.go b/service/devicefarm/api_op_CreateTestGridProject.go index 1226310bf4b..3b6ca7ac8f8 100644 --- a/service/devicefarm/api_op_CreateTestGridProject.go +++ b/service/devicefarm/api_op_CreateTestGridProject.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateTestGridProject(ctx context.Context, params *CreateTestGr addawsAwsjson11_serdeOpCreateTestGridProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_CreateTestGridUrl.go b/service/devicefarm/api_op_CreateTestGridUrl.go index 523b87a5610..69062d39258 100644 --- a/service/devicefarm/api_op_CreateTestGridUrl.go +++ b/service/devicefarm/api_op_CreateTestGridUrl.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CreateTestGridUrl(ctx context.Context, params *CreateTestGridUr addawsAwsjson11_serdeOpCreateTestGridUrlMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_CreateUpload.go b/service/devicefarm/api_op_CreateUpload.go index 7b707b0c796..e3584e40a40 100644 --- a/service/devicefarm/api_op_CreateUpload.go +++ b/service/devicefarm/api_op_CreateUpload.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateUpload(ctx context.Context, params *CreateUploadInput, op addawsAwsjson11_serdeOpCreateUploadMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_CreateVPCEConfiguration.go b/service/devicefarm/api_op_CreateVPCEConfiguration.go index 598dd468400..c71ea250d15 100644 --- a/service/devicefarm/api_op_CreateVPCEConfiguration.go +++ b/service/devicefarm/api_op_CreateVPCEConfiguration.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateVPCEConfiguration(ctx context.Context, params *CreateVPCE addawsAwsjson11_serdeOpCreateVPCEConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_DeleteDevicePool.go b/service/devicefarm/api_op_DeleteDevicePool.go index c63dbfdcf1b..3e9578ad3aa 100644 --- a/service/devicefarm/api_op_DeleteDevicePool.go +++ b/service/devicefarm/api_op_DeleteDevicePool.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDevicePool(ctx context.Context, params *DeleteDevicePoolI addawsAwsjson11_serdeOpDeleteDevicePoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_DeleteInstanceProfile.go b/service/devicefarm/api_op_DeleteInstanceProfile.go index ff08df931b9..a901f6f5ee6 100644 --- a/service/devicefarm/api_op_DeleteInstanceProfile.go +++ b/service/devicefarm/api_op_DeleteInstanceProfile.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteInstanceProfile(ctx context.Context, params *DeleteInstan addawsAwsjson11_serdeOpDeleteInstanceProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_DeleteNetworkProfile.go b/service/devicefarm/api_op_DeleteNetworkProfile.go index 58048b3b16e..5b679ac70ac 100644 --- a/service/devicefarm/api_op_DeleteNetworkProfile.go +++ b/service/devicefarm/api_op_DeleteNetworkProfile.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteNetworkProfile(ctx context.Context, params *DeleteNetwork addawsAwsjson11_serdeOpDeleteNetworkProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_DeleteProject.go b/service/devicefarm/api_op_DeleteProject.go index fa0bf006fd7..2e325d9e2d4 100644 --- a/service/devicefarm/api_op_DeleteProject.go +++ b/service/devicefarm/api_op_DeleteProject.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteProject(ctx context.Context, params *DeleteProjectInput, addawsAwsjson11_serdeOpDeleteProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_DeleteRemoteAccessSession.go b/service/devicefarm/api_op_DeleteRemoteAccessSession.go index 130a4c88459..56ab48007f7 100644 --- a/service/devicefarm/api_op_DeleteRemoteAccessSession.go +++ b/service/devicefarm/api_op_DeleteRemoteAccessSession.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRemoteAccessSession(ctx context.Context, params *DeleteRe addawsAwsjson11_serdeOpDeleteRemoteAccessSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_DeleteRun.go b/service/devicefarm/api_op_DeleteRun.go index a0bee163498..ec047a87c76 100644 --- a/service/devicefarm/api_op_DeleteRun.go +++ b/service/devicefarm/api_op_DeleteRun.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteRun(ctx context.Context, params *DeleteRunInput, optFns . addawsAwsjson11_serdeOpDeleteRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_DeleteTestGridProject.go b/service/devicefarm/api_op_DeleteTestGridProject.go index bde3e4cca1c..863490ff261 100644 --- a/service/devicefarm/api_op_DeleteTestGridProject.go +++ b/service/devicefarm/api_op_DeleteTestGridProject.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteTestGridProject(ctx context.Context, params *DeleteTestGr addawsAwsjson11_serdeOpDeleteTestGridProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_DeleteUpload.go b/service/devicefarm/api_op_DeleteUpload.go index 8be75fd3e20..9985227dec1 100644 --- a/service/devicefarm/api_op_DeleteUpload.go +++ b/service/devicefarm/api_op_DeleteUpload.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteUpload(ctx context.Context, params *DeleteUploadInput, op addawsAwsjson11_serdeOpDeleteUploadMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_DeleteVPCEConfiguration.go b/service/devicefarm/api_op_DeleteVPCEConfiguration.go index 01e3cec0a81..878fd5eaf71 100644 --- a/service/devicefarm/api_op_DeleteVPCEConfiguration.go +++ b/service/devicefarm/api_op_DeleteVPCEConfiguration.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteVPCEConfiguration(ctx context.Context, params *DeleteVPCE addawsAwsjson11_serdeOpDeleteVPCEConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_GetAccountSettings.go b/service/devicefarm/api_op_GetAccountSettings.go index ac2b012a92c..d4dba4a7bab 100644 --- a/service/devicefarm/api_op_GetAccountSettings.go +++ b/service/devicefarm/api_op_GetAccountSettings.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetAccountSettings(ctx context.Context, params *GetAccountSetti addawsAwsjson11_serdeOpGetAccountSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_GetDevice.go b/service/devicefarm/api_op_GetDevice.go index 11f52328746..c63dc782bbe 100644 --- a/service/devicefarm/api_op_GetDevice.go +++ b/service/devicefarm/api_op_GetDevice.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDevice(ctx context.Context, params *GetDeviceInput, optFns . addawsAwsjson11_serdeOpGetDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_GetDeviceInstance.go b/service/devicefarm/api_op_GetDeviceInstance.go index 37e857392e2..4e8ebe05bfc 100644 --- a/service/devicefarm/api_op_GetDeviceInstance.go +++ b/service/devicefarm/api_op_GetDeviceInstance.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetDeviceInstance(ctx context.Context, params *GetDeviceInstanc addawsAwsjson11_serdeOpGetDeviceInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_GetDevicePool.go b/service/devicefarm/api_op_GetDevicePool.go index b67f1d338a5..516416557e3 100644 --- a/service/devicefarm/api_op_GetDevicePool.go +++ b/service/devicefarm/api_op_GetDevicePool.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDevicePool(ctx context.Context, params *GetDevicePoolInput, addawsAwsjson11_serdeOpGetDevicePoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_GetDevicePoolCompatibility.go b/service/devicefarm/api_op_GetDevicePoolCompatibility.go index 8d66d28248c..c83a7b44990 100644 --- a/service/devicefarm/api_op_GetDevicePoolCompatibility.go +++ b/service/devicefarm/api_op_GetDevicePoolCompatibility.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDevicePoolCompatibility(ctx context.Context, params *GetDevi addawsAwsjson11_serdeOpGetDevicePoolCompatibilityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_GetInstanceProfile.go b/service/devicefarm/api_op_GetInstanceProfile.go index 3c408652c10..3d3bfa937d3 100644 --- a/service/devicefarm/api_op_GetInstanceProfile.go +++ b/service/devicefarm/api_op_GetInstanceProfile.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetInstanceProfile(ctx context.Context, params *GetInstanceProf addawsAwsjson11_serdeOpGetInstanceProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_GetJob.go b/service/devicefarm/api_op_GetJob.go index f2b416800d6..851d05eaee8 100644 --- a/service/devicefarm/api_op_GetJob.go +++ b/service/devicefarm/api_op_GetJob.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetJob(ctx context.Context, params *GetJobInput, optFns ...func addawsAwsjson11_serdeOpGetJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_GetNetworkProfile.go b/service/devicefarm/api_op_GetNetworkProfile.go index 84506ddf9e9..50c7dcb76c2 100644 --- a/service/devicefarm/api_op_GetNetworkProfile.go +++ b/service/devicefarm/api_op_GetNetworkProfile.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetNetworkProfile(ctx context.Context, params *GetNetworkProfil addawsAwsjson11_serdeOpGetNetworkProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_GetOfferingStatus.go b/service/devicefarm/api_op_GetOfferingStatus.go index 373652821ca..ca749d8ec9a 100644 --- a/service/devicefarm/api_op_GetOfferingStatus.go +++ b/service/devicefarm/api_op_GetOfferingStatus.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetOfferingStatus(ctx context.Context, params *GetOfferingStatu addawsAwsjson11_serdeOpGetOfferingStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_GetProject.go b/service/devicefarm/api_op_GetProject.go index b0574b3d4b8..1100375a731 100644 --- a/service/devicefarm/api_op_GetProject.go +++ b/service/devicefarm/api_op_GetProject.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetProject(ctx context.Context, params *GetProjectInput, optFns addawsAwsjson11_serdeOpGetProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_GetRemoteAccessSession.go b/service/devicefarm/api_op_GetRemoteAccessSession.go index 1f5635b9fd5..95f520d363b 100644 --- a/service/devicefarm/api_op_GetRemoteAccessSession.go +++ b/service/devicefarm/api_op_GetRemoteAccessSession.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetRemoteAccessSession(ctx context.Context, params *GetRemoteAc addawsAwsjson11_serdeOpGetRemoteAccessSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_GetRun.go b/service/devicefarm/api_op_GetRun.go index dddfaa91985..8ef5dc7da2e 100644 --- a/service/devicefarm/api_op_GetRun.go +++ b/service/devicefarm/api_op_GetRun.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetRun(ctx context.Context, params *GetRunInput, optFns ...func addawsAwsjson11_serdeOpGetRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_GetSuite.go b/service/devicefarm/api_op_GetSuite.go index 780a30fe891..d6dedb9d8d1 100644 --- a/service/devicefarm/api_op_GetSuite.go +++ b/service/devicefarm/api_op_GetSuite.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetSuite(ctx context.Context, params *GetSuiteInput, optFns ... addawsAwsjson11_serdeOpGetSuiteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_GetTest.go b/service/devicefarm/api_op_GetTest.go index 9865fdd4cf7..947d849b450 100644 --- a/service/devicefarm/api_op_GetTest.go +++ b/service/devicefarm/api_op_GetTest.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetTest(ctx context.Context, params *GetTestInput, optFns ...fu addawsAwsjson11_serdeOpGetTestMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_GetTestGridProject.go b/service/devicefarm/api_op_GetTestGridProject.go index 56f641c57b7..f6729d001ff 100644 --- a/service/devicefarm/api_op_GetTestGridProject.go +++ b/service/devicefarm/api_op_GetTestGridProject.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetTestGridProject(ctx context.Context, params *GetTestGridProj addawsAwsjson11_serdeOpGetTestGridProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_GetTestGridSession.go b/service/devicefarm/api_op_GetTestGridSession.go index 41b65137bd5..41d50e86dbc 100644 --- a/service/devicefarm/api_op_GetTestGridSession.go +++ b/service/devicefarm/api_op_GetTestGridSession.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) GetTestGridSession(ctx context.Context, params *GetTestGridSess addawsAwsjson11_serdeOpGetTestGridSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_GetUpload.go b/service/devicefarm/api_op_GetUpload.go index e9f7a63ee85..78385b11732 100644 --- a/service/devicefarm/api_op_GetUpload.go +++ b/service/devicefarm/api_op_GetUpload.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetUpload(ctx context.Context, params *GetUploadInput, optFns . addawsAwsjson11_serdeOpGetUploadMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_GetVPCEConfiguration.go b/service/devicefarm/api_op_GetVPCEConfiguration.go index 956b6858a57..b917e1ea1c3 100644 --- a/service/devicefarm/api_op_GetVPCEConfiguration.go +++ b/service/devicefarm/api_op_GetVPCEConfiguration.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetVPCEConfiguration(ctx context.Context, params *GetVPCEConfig addawsAwsjson11_serdeOpGetVPCEConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_InstallToRemoteAccessSession.go b/service/devicefarm/api_op_InstallToRemoteAccessSession.go index 10df1e4acbd..38454f2d472 100644 --- a/service/devicefarm/api_op_InstallToRemoteAccessSession.go +++ b/service/devicefarm/api_op_InstallToRemoteAccessSession.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) InstallToRemoteAccessSession(ctx context.Context, params *Insta addawsAwsjson11_serdeOpInstallToRemoteAccessSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListArtifacts.go b/service/devicefarm/api_op_ListArtifacts.go index 6370d3ffd99..f0d5ad1a19c 100644 --- a/service/devicefarm/api_op_ListArtifacts.go +++ b/service/devicefarm/api_op_ListArtifacts.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListArtifacts(ctx context.Context, params *ListArtifactsInput, addawsAwsjson11_serdeOpListArtifactsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListDeviceInstances.go b/service/devicefarm/api_op_ListDeviceInstances.go index 386a0ab2fee..84a0eab5c60 100644 --- a/service/devicefarm/api_op_ListDeviceInstances.go +++ b/service/devicefarm/api_op_ListDeviceInstances.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListDeviceInstances(ctx context.Context, params *ListDeviceInst addawsAwsjson11_serdeOpListDeviceInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListDevicePools.go b/service/devicefarm/api_op_ListDevicePools.go index 462e31d8c0e..1aa3edd9fec 100644 --- a/service/devicefarm/api_op_ListDevicePools.go +++ b/service/devicefarm/api_op_ListDevicePools.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDevicePools(ctx context.Context, params *ListDevicePoolsInp addawsAwsjson11_serdeOpListDevicePoolsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListDevices.go b/service/devicefarm/api_op_ListDevices.go index 6498cccfa0d..fdc28096fdb 100644 --- a/service/devicefarm/api_op_ListDevices.go +++ b/service/devicefarm/api_op_ListDevices.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDevices(ctx context.Context, params *ListDevicesInput, optF addawsAwsjson11_serdeOpListDevicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListInstanceProfiles.go b/service/devicefarm/api_op_ListInstanceProfiles.go index a080dd59bfd..4647e8b5fd4 100644 --- a/service/devicefarm/api_op_ListInstanceProfiles.go +++ b/service/devicefarm/api_op_ListInstanceProfiles.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListInstanceProfiles(ctx context.Context, params *ListInstanceP addawsAwsjson11_serdeOpListInstanceProfilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListJobs.go b/service/devicefarm/api_op_ListJobs.go index 08cc7345faf..0aecea7585d 100644 --- a/service/devicefarm/api_op_ListJobs.go +++ b/service/devicefarm/api_op_ListJobs.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListJobs(ctx context.Context, params *ListJobsInput, optFns ... addawsAwsjson11_serdeOpListJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListNetworkProfiles.go b/service/devicefarm/api_op_ListNetworkProfiles.go index efb421c2773..50f11d04c12 100644 --- a/service/devicefarm/api_op_ListNetworkProfiles.go +++ b/service/devicefarm/api_op_ListNetworkProfiles.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListNetworkProfiles(ctx context.Context, params *ListNetworkPro addawsAwsjson11_serdeOpListNetworkProfilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListOfferingPromotions.go b/service/devicefarm/api_op_ListOfferingPromotions.go index aee893e6821..415ab62c25c 100644 --- a/service/devicefarm/api_op_ListOfferingPromotions.go +++ b/service/devicefarm/api_op_ListOfferingPromotions.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListOfferingPromotions(ctx context.Context, params *ListOfferin addawsAwsjson11_serdeOpListOfferingPromotionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListOfferingTransactions.go b/service/devicefarm/api_op_ListOfferingTransactions.go index 608a55d5a5a..c35d61863ac 100644 --- a/service/devicefarm/api_op_ListOfferingTransactions.go +++ b/service/devicefarm/api_op_ListOfferingTransactions.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListOfferingTransactions(ctx context.Context, params *ListOffer addawsAwsjson11_serdeOpListOfferingTransactionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListOfferings.go b/service/devicefarm/api_op_ListOfferings.go index fccee4f198e..35179f4e447 100644 --- a/service/devicefarm/api_op_ListOfferings.go +++ b/service/devicefarm/api_op_ListOfferings.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListOfferings(ctx context.Context, params *ListOfferingsInput, addawsAwsjson11_serdeOpListOfferingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListProjects.go b/service/devicefarm/api_op_ListProjects.go index d3848797960..4bd9e14e093 100644 --- a/service/devicefarm/api_op_ListProjects.go +++ b/service/devicefarm/api_op_ListProjects.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListProjects(ctx context.Context, params *ListProjectsInput, op addawsAwsjson11_serdeOpListProjectsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListRemoteAccessSessions.go b/service/devicefarm/api_op_ListRemoteAccessSessions.go index a8912ba3ee3..addfdb5550f 100644 --- a/service/devicefarm/api_op_ListRemoteAccessSessions.go +++ b/service/devicefarm/api_op_ListRemoteAccessSessions.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListRemoteAccessSessions(ctx context.Context, params *ListRemot addawsAwsjson11_serdeOpListRemoteAccessSessionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListRuns.go b/service/devicefarm/api_op_ListRuns.go index c125a2ff872..661223a729b 100644 --- a/service/devicefarm/api_op_ListRuns.go +++ b/service/devicefarm/api_op_ListRuns.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListRuns(ctx context.Context, params *ListRunsInput, optFns ... addawsAwsjson11_serdeOpListRunsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListSamples.go b/service/devicefarm/api_op_ListSamples.go index 32188bbf8d9..53254395f66 100644 --- a/service/devicefarm/api_op_ListSamples.go +++ b/service/devicefarm/api_op_ListSamples.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListSamples(ctx context.Context, params *ListSamplesInput, optF addawsAwsjson11_serdeOpListSamplesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListSuites.go b/service/devicefarm/api_op_ListSuites.go index 0991a92e97b..46898e73d1d 100644 --- a/service/devicefarm/api_op_ListSuites.go +++ b/service/devicefarm/api_op_ListSuites.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListSuites(ctx context.Context, params *ListSuitesInput, optFns addawsAwsjson11_serdeOpListSuitesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListTagsForResource.go b/service/devicefarm/api_op_ListTagsForResource.go index 24ec076752a..e61abdd7f48 100644 --- a/service/devicefarm/api_op_ListTagsForResource.go +++ b/service/devicefarm/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListTestGridProjects.go b/service/devicefarm/api_op_ListTestGridProjects.go index ac477a80ad1..6d7a367656e 100644 --- a/service/devicefarm/api_op_ListTestGridProjects.go +++ b/service/devicefarm/api_op_ListTestGridProjects.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTestGridProjects(ctx context.Context, params *ListTestGridP addawsAwsjson11_serdeOpListTestGridProjectsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListTestGridSessionActions.go b/service/devicefarm/api_op_ListTestGridSessionActions.go index eee2ab37bd4..7d303e7bce5 100644 --- a/service/devicefarm/api_op_ListTestGridSessionActions.go +++ b/service/devicefarm/api_op_ListTestGridSessionActions.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTestGridSessionActions(ctx context.Context, params *ListTes addawsAwsjson11_serdeOpListTestGridSessionActionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListTestGridSessionArtifacts.go b/service/devicefarm/api_op_ListTestGridSessionArtifacts.go index e694c4c8ad4..b0d1395b25d 100644 --- a/service/devicefarm/api_op_ListTestGridSessionArtifacts.go +++ b/service/devicefarm/api_op_ListTestGridSessionArtifacts.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTestGridSessionArtifacts(ctx context.Context, params *ListT addawsAwsjson11_serdeOpListTestGridSessionArtifactsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListTestGridSessions.go b/service/devicefarm/api_op_ListTestGridSessions.go index 0a36501f3be..97ddd2e1f89 100644 --- a/service/devicefarm/api_op_ListTestGridSessions.go +++ b/service/devicefarm/api_op_ListTestGridSessions.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTestGridSessions(ctx context.Context, params *ListTestGridS addawsAwsjson11_serdeOpListTestGridSessionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListTests.go b/service/devicefarm/api_op_ListTests.go index ebfac0351c0..13fd4ef3ff4 100644 --- a/service/devicefarm/api_op_ListTests.go +++ b/service/devicefarm/api_op_ListTests.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTests(ctx context.Context, params *ListTestsInput, optFns . addawsAwsjson11_serdeOpListTestsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListUniqueProblems.go b/service/devicefarm/api_op_ListUniqueProblems.go index 25cea037423..c8e38134a4c 100644 --- a/service/devicefarm/api_op_ListUniqueProblems.go +++ b/service/devicefarm/api_op_ListUniqueProblems.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListUniqueProblems(ctx context.Context, params *ListUniqueProbl addawsAwsjson11_serdeOpListUniqueProblemsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListUploads.go b/service/devicefarm/api_op_ListUploads.go index 060a44dc498..2e704b6db04 100644 --- a/service/devicefarm/api_op_ListUploads.go +++ b/service/devicefarm/api_op_ListUploads.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListUploads(ctx context.Context, params *ListUploadsInput, optF addawsAwsjson11_serdeOpListUploadsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ListVPCEConfigurations.go b/service/devicefarm/api_op_ListVPCEConfigurations.go index 6958fc17084..89cfec80478 100644 --- a/service/devicefarm/api_op_ListVPCEConfigurations.go +++ b/service/devicefarm/api_op_ListVPCEConfigurations.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListVPCEConfigurations(ctx context.Context, params *ListVPCECon addawsAwsjson11_serdeOpListVPCEConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_PurchaseOffering.go b/service/devicefarm/api_op_PurchaseOffering.go index ff51349e54d..b9231d2a8b4 100644 --- a/service/devicefarm/api_op_PurchaseOffering.go +++ b/service/devicefarm/api_op_PurchaseOffering.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) PurchaseOffering(ctx context.Context, params *PurchaseOfferingI addawsAwsjson11_serdeOpPurchaseOfferingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_RenewOffering.go b/service/devicefarm/api_op_RenewOffering.go index 39ab9e7459b..dc8a3b92267 100644 --- a/service/devicefarm/api_op_RenewOffering.go +++ b/service/devicefarm/api_op_RenewOffering.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) RenewOffering(ctx context.Context, params *RenewOfferingInput, addawsAwsjson11_serdeOpRenewOfferingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_ScheduleRun.go b/service/devicefarm/api_op_ScheduleRun.go index 803b2cb15f7..6ec2e01a3ff 100644 --- a/service/devicefarm/api_op_ScheduleRun.go +++ b/service/devicefarm/api_op_ScheduleRun.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ScheduleRun(ctx context.Context, params *ScheduleRunInput, optF addawsAwsjson11_serdeOpScheduleRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_StopJob.go b/service/devicefarm/api_op_StopJob.go index d3e9c4c6d87..c0ecba3ccb2 100644 --- a/service/devicefarm/api_op_StopJob.go +++ b/service/devicefarm/api_op_StopJob.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) StopJob(ctx context.Context, params *StopJobInput, optFns ...fu addawsAwsjson11_serdeOpStopJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_StopRemoteAccessSession.go b/service/devicefarm/api_op_StopRemoteAccessSession.go index 878c5110f32..e8260df4f8e 100644 --- a/service/devicefarm/api_op_StopRemoteAccessSession.go +++ b/service/devicefarm/api_op_StopRemoteAccessSession.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StopRemoteAccessSession(ctx context.Context, params *StopRemote addawsAwsjson11_serdeOpStopRemoteAccessSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_StopRun.go b/service/devicefarm/api_op_StopRun.go index dfe96953af5..3963f6e9306 100644 --- a/service/devicefarm/api_op_StopRun.go +++ b/service/devicefarm/api_op_StopRun.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) StopRun(ctx context.Context, params *StopRunInput, optFns ...fu addawsAwsjson11_serdeOpStopRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_TagResource.go b/service/devicefarm/api_op_TagResource.go index 3a96cc698d1..99e424ddf81 100644 --- a/service/devicefarm/api_op_TagResource.go +++ b/service/devicefarm/api_op_TagResource.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_UntagResource.go b/service/devicefarm/api_op_UntagResource.go index 42c8da05782..8500ab537b2 100644 --- a/service/devicefarm/api_op_UntagResource.go +++ b/service/devicefarm/api_op_UntagResource.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_UpdateDeviceInstance.go b/service/devicefarm/api_op_UpdateDeviceInstance.go index b65a5e1f83d..91db5769e68 100644 --- a/service/devicefarm/api_op_UpdateDeviceInstance.go +++ b/service/devicefarm/api_op_UpdateDeviceInstance.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDeviceInstance(ctx context.Context, params *UpdateDeviceI addawsAwsjson11_serdeOpUpdateDeviceInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_UpdateDevicePool.go b/service/devicefarm/api_op_UpdateDevicePool.go index 4a228285c20..38f0714a418 100644 --- a/service/devicefarm/api_op_UpdateDevicePool.go +++ b/service/devicefarm/api_op_UpdateDevicePool.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateDevicePool(ctx context.Context, params *UpdateDevicePoolI addawsAwsjson11_serdeOpUpdateDevicePoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_UpdateInstanceProfile.go b/service/devicefarm/api_op_UpdateInstanceProfile.go index c84525278ac..dcefcd10806 100644 --- a/service/devicefarm/api_op_UpdateInstanceProfile.go +++ b/service/devicefarm/api_op_UpdateInstanceProfile.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateInstanceProfile(ctx context.Context, params *UpdateInstan addawsAwsjson11_serdeOpUpdateInstanceProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_UpdateNetworkProfile.go b/service/devicefarm/api_op_UpdateNetworkProfile.go index 757b5c44749..8e2ff0d5497 100644 --- a/service/devicefarm/api_op_UpdateNetworkProfile.go +++ b/service/devicefarm/api_op_UpdateNetworkProfile.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateNetworkProfile(ctx context.Context, params *UpdateNetwork addawsAwsjson11_serdeOpUpdateNetworkProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_UpdateProject.go b/service/devicefarm/api_op_UpdateProject.go index 7fc3146217d..90329a7b17f 100644 --- a/service/devicefarm/api_op_UpdateProject.go +++ b/service/devicefarm/api_op_UpdateProject.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateProject(ctx context.Context, params *UpdateProjectInput, addawsAwsjson11_serdeOpUpdateProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_UpdateTestGridProject.go b/service/devicefarm/api_op_UpdateTestGridProject.go index 002d8510331..26db5370126 100644 --- a/service/devicefarm/api_op_UpdateTestGridProject.go +++ b/service/devicefarm/api_op_UpdateTestGridProject.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateTestGridProject(ctx context.Context, params *UpdateTestGr addawsAwsjson11_serdeOpUpdateTestGridProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_UpdateUpload.go b/service/devicefarm/api_op_UpdateUpload.go index 6b4427cdcaf..7f04b58597a 100644 --- a/service/devicefarm/api_op_UpdateUpload.go +++ b/service/devicefarm/api_op_UpdateUpload.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateUpload(ctx context.Context, params *UpdateUploadInput, op addawsAwsjson11_serdeOpUpdateUploadMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/api_op_UpdateVPCEConfiguration.go b/service/devicefarm/api_op_UpdateVPCEConfiguration.go index 589cc0c02f7..fdeb0932808 100644 --- a/service/devicefarm/api_op_UpdateVPCEConfiguration.go +++ b/service/devicefarm/api_op_UpdateVPCEConfiguration.go @@ -5,7 +5,6 @@ package devicefarm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateVPCEConfiguration(ctx context.Context, params *UpdateVPCE addawsAwsjson11_serdeOpUpdateVPCEConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/devicefarm/endpoints.go b/service/devicefarm/endpoints.go index 086911cd04c..0cb93cb2301 100644 --- a/service/devicefarm/endpoints.go +++ b/service/devicefarm/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/directconnect/api_client.go b/service/directconnect/api_client.go index 31176537b4d..c2b3840dde1 100644 --- a/service/directconnect/api_client.go +++ b/service/directconnect/api_client.go @@ -85,30 +85,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -174,6 +150,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/directconnect/api_op_AcceptDirectConnectGatewayAssociationProposal.go b/service/directconnect/api_op_AcceptDirectConnectGatewayAssociationProposal.go index aeb5893e102..1b56215771c 100644 --- a/service/directconnect/api_op_AcceptDirectConnectGatewayAssociationProposal.go +++ b/service/directconnect/api_op_AcceptDirectConnectGatewayAssociationProposal.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AcceptDirectConnectGatewayAssociationProposal(ctx context.Conte addawsAwsjson11_serdeOpAcceptDirectConnectGatewayAssociationProposalMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_AllocateConnectionOnInterconnect.go b/service/directconnect/api_op_AllocateConnectionOnInterconnect.go index a043a0af2f2..df690b7f51d 100644 --- a/service/directconnect/api_op_AllocateConnectionOnInterconnect.go +++ b/service/directconnect/api_op_AllocateConnectionOnInterconnect.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) AllocateConnectionOnInterconnect(ctx context.Context, params *A addawsAwsjson11_serdeOpAllocateConnectionOnInterconnectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_AllocateHostedConnection.go b/service/directconnect/api_op_AllocateHostedConnection.go index 8b6bd99e87e..75e2e742c3c 100644 --- a/service/directconnect/api_op_AllocateHostedConnection.go +++ b/service/directconnect/api_op_AllocateHostedConnection.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) AllocateHostedConnection(ctx context.Context, params *AllocateH addawsAwsjson11_serdeOpAllocateHostedConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_AllocatePrivateVirtualInterface.go b/service/directconnect/api_op_AllocatePrivateVirtualInterface.go index 42342bc3457..6c2ced5b793 100644 --- a/service/directconnect/api_op_AllocatePrivateVirtualInterface.go +++ b/service/directconnect/api_op_AllocatePrivateVirtualInterface.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) AllocatePrivateVirtualInterface(ctx context.Context, params *Al addawsAwsjson11_serdeOpAllocatePrivateVirtualInterfaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_AllocatePublicVirtualInterface.go b/service/directconnect/api_op_AllocatePublicVirtualInterface.go index dbf89be447a..45eb2b5076d 100644 --- a/service/directconnect/api_op_AllocatePublicVirtualInterface.go +++ b/service/directconnect/api_op_AllocatePublicVirtualInterface.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) AllocatePublicVirtualInterface(ctx context.Context, params *All addawsAwsjson11_serdeOpAllocatePublicVirtualInterfaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_AllocateTransitVirtualInterface.go b/service/directconnect/api_op_AllocateTransitVirtualInterface.go index 85fe54d9718..9dd5d04dd07 100644 --- a/service/directconnect/api_op_AllocateTransitVirtualInterface.go +++ b/service/directconnect/api_op_AllocateTransitVirtualInterface.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) AllocateTransitVirtualInterface(ctx context.Context, params *Al addawsAwsjson11_serdeOpAllocateTransitVirtualInterfaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_AssociateConnectionWithLag.go b/service/directconnect/api_op_AssociateConnectionWithLag.go index 287ebd0a643..e4074470c0e 100644 --- a/service/directconnect/api_op_AssociateConnectionWithLag.go +++ b/service/directconnect/api_op_AssociateConnectionWithLag.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) AssociateConnectionWithLag(ctx context.Context, params *Associa addawsAwsjson11_serdeOpAssociateConnectionWithLagMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_AssociateHostedConnection.go b/service/directconnect/api_op_AssociateHostedConnection.go index fe781a62be8..ee55575074b 100644 --- a/service/directconnect/api_op_AssociateHostedConnection.go +++ b/service/directconnect/api_op_AssociateHostedConnection.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) AssociateHostedConnection(ctx context.Context, params *Associat addawsAwsjson11_serdeOpAssociateHostedConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_AssociateVirtualInterface.go b/service/directconnect/api_op_AssociateVirtualInterface.go index 8e488e596b2..82940fd8d5a 100644 --- a/service/directconnect/api_op_AssociateVirtualInterface.go +++ b/service/directconnect/api_op_AssociateVirtualInterface.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) AssociateVirtualInterface(ctx context.Context, params *Associat addawsAwsjson11_serdeOpAssociateVirtualInterfaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_ConfirmConnection.go b/service/directconnect/api_op_ConfirmConnection.go index e0a6c7d8dbe..7fe0c8ad867 100644 --- a/service/directconnect/api_op_ConfirmConnection.go +++ b/service/directconnect/api_op_ConfirmConnection.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ConfirmConnection(ctx context.Context, params *ConfirmConnectio addawsAwsjson11_serdeOpConfirmConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_ConfirmPrivateVirtualInterface.go b/service/directconnect/api_op_ConfirmPrivateVirtualInterface.go index 7e231ab2c9e..0512050b2f6 100644 --- a/service/directconnect/api_op_ConfirmPrivateVirtualInterface.go +++ b/service/directconnect/api_op_ConfirmPrivateVirtualInterface.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ConfirmPrivateVirtualInterface(ctx context.Context, params *Con addawsAwsjson11_serdeOpConfirmPrivateVirtualInterfaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_ConfirmPublicVirtualInterface.go b/service/directconnect/api_op_ConfirmPublicVirtualInterface.go index b0e9bec96d0..4349b65764a 100644 --- a/service/directconnect/api_op_ConfirmPublicVirtualInterface.go +++ b/service/directconnect/api_op_ConfirmPublicVirtualInterface.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ConfirmPublicVirtualInterface(ctx context.Context, params *Conf addawsAwsjson11_serdeOpConfirmPublicVirtualInterfaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_ConfirmTransitVirtualInterface.go b/service/directconnect/api_op_ConfirmTransitVirtualInterface.go index 1a3248bdc65..55ffcebe605 100644 --- a/service/directconnect/api_op_ConfirmTransitVirtualInterface.go +++ b/service/directconnect/api_op_ConfirmTransitVirtualInterface.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ConfirmTransitVirtualInterface(ctx context.Context, params *Con addawsAwsjson11_serdeOpConfirmTransitVirtualInterfaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_CreateBGPPeer.go b/service/directconnect/api_op_CreateBGPPeer.go index 84410fe26f3..ef77724887c 100644 --- a/service/directconnect/api_op_CreateBGPPeer.go +++ b/service/directconnect/api_op_CreateBGPPeer.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) CreateBGPPeer(ctx context.Context, params *CreateBGPPeerInput, addawsAwsjson11_serdeOpCreateBGPPeerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_CreateConnection.go b/service/directconnect/api_op_CreateConnection.go index a7721e5ef4f..be14891c056 100644 --- a/service/directconnect/api_op_CreateConnection.go +++ b/service/directconnect/api_op_CreateConnection.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) CreateConnection(ctx context.Context, params *CreateConnectionI addawsAwsjson11_serdeOpCreateConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_CreateDirectConnectGateway.go b/service/directconnect/api_op_CreateDirectConnectGateway.go index d2aab7da315..0a6fbcd9dce 100644 --- a/service/directconnect/api_op_CreateDirectConnectGateway.go +++ b/service/directconnect/api_op_CreateDirectConnectGateway.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateDirectConnectGateway(ctx context.Context, params *CreateD addawsAwsjson11_serdeOpCreateDirectConnectGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_CreateDirectConnectGatewayAssociation.go b/service/directconnect/api_op_CreateDirectConnectGatewayAssociation.go index b424ee1a8d7..12820f3010e 100644 --- a/service/directconnect/api_op_CreateDirectConnectGatewayAssociation.go +++ b/service/directconnect/api_op_CreateDirectConnectGatewayAssociation.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateDirectConnectGatewayAssociation(ctx context.Context, para addawsAwsjson11_serdeOpCreateDirectConnectGatewayAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_CreateDirectConnectGatewayAssociationProposal.go b/service/directconnect/api_op_CreateDirectConnectGatewayAssociationProposal.go index 99ad6bdb522..c97ad69fd7d 100644 --- a/service/directconnect/api_op_CreateDirectConnectGatewayAssociationProposal.go +++ b/service/directconnect/api_op_CreateDirectConnectGatewayAssociationProposal.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateDirectConnectGatewayAssociationProposal(ctx context.Conte addawsAwsjson11_serdeOpCreateDirectConnectGatewayAssociationProposalMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_CreateInterconnect.go b/service/directconnect/api_op_CreateInterconnect.go index e584cc70190..05716244377 100644 --- a/service/directconnect/api_op_CreateInterconnect.go +++ b/service/directconnect/api_op_CreateInterconnect.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) CreateInterconnect(ctx context.Context, params *CreateInterconn addawsAwsjson11_serdeOpCreateInterconnectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_CreateLag.go b/service/directconnect/api_op_CreateLag.go index 291fd840984..a4e41af5126 100644 --- a/service/directconnect/api_op_CreateLag.go +++ b/service/directconnect/api_op_CreateLag.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) CreateLag(ctx context.Context, params *CreateLagInput, optFns . addawsAwsjson11_serdeOpCreateLagMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_CreatePrivateVirtualInterface.go b/service/directconnect/api_op_CreatePrivateVirtualInterface.go index 696a3c3d379..c230060d4b6 100644 --- a/service/directconnect/api_op_CreatePrivateVirtualInterface.go +++ b/service/directconnect/api_op_CreatePrivateVirtualInterface.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) CreatePrivateVirtualInterface(ctx context.Context, params *Crea addawsAwsjson11_serdeOpCreatePrivateVirtualInterfaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_CreatePublicVirtualInterface.go b/service/directconnect/api_op_CreatePublicVirtualInterface.go index 70432a7d1b0..ba836a84318 100644 --- a/service/directconnect/api_op_CreatePublicVirtualInterface.go +++ b/service/directconnect/api_op_CreatePublicVirtualInterface.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreatePublicVirtualInterface(ctx context.Context, params *Creat addawsAwsjson11_serdeOpCreatePublicVirtualInterfaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_CreateTransitVirtualInterface.go b/service/directconnect/api_op_CreateTransitVirtualInterface.go index 3b22adbaaf1..e3476f35f28 100644 --- a/service/directconnect/api_op_CreateTransitVirtualInterface.go +++ b/service/directconnect/api_op_CreateTransitVirtualInterface.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) CreateTransitVirtualInterface(ctx context.Context, params *Crea addawsAwsjson11_serdeOpCreateTransitVirtualInterfaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DeleteBGPPeer.go b/service/directconnect/api_op_DeleteBGPPeer.go index 88d238eb444..3187e933e3c 100644 --- a/service/directconnect/api_op_DeleteBGPPeer.go +++ b/service/directconnect/api_op_DeleteBGPPeer.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DeleteBGPPeer(ctx context.Context, params *DeleteBGPPeerInput, addawsAwsjson11_serdeOpDeleteBGPPeerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DeleteConnection.go b/service/directconnect/api_op_DeleteConnection.go index 95ce298f71f..cb8d32f7366 100644 --- a/service/directconnect/api_op_DeleteConnection.go +++ b/service/directconnect/api_op_DeleteConnection.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeleteConnection(ctx context.Context, params *DeleteConnectionI addawsAwsjson11_serdeOpDeleteConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DeleteDirectConnectGateway.go b/service/directconnect/api_op_DeleteDirectConnectGateway.go index 9d5e8515410..2a82652e48f 100644 --- a/service/directconnect/api_op_DeleteDirectConnectGateway.go +++ b/service/directconnect/api_op_DeleteDirectConnectGateway.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DeleteDirectConnectGateway(ctx context.Context, params *DeleteD addawsAwsjson11_serdeOpDeleteDirectConnectGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DeleteDirectConnectGatewayAssociation.go b/service/directconnect/api_op_DeleteDirectConnectGatewayAssociation.go index d62bab9abaf..00547566d92 100644 --- a/service/directconnect/api_op_DeleteDirectConnectGatewayAssociation.go +++ b/service/directconnect/api_op_DeleteDirectConnectGatewayAssociation.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeleteDirectConnectGatewayAssociation(ctx context.Context, para addawsAwsjson11_serdeOpDeleteDirectConnectGatewayAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DeleteDirectConnectGatewayAssociationProposal.go b/service/directconnect/api_op_DeleteDirectConnectGatewayAssociationProposal.go index 615455f3c27..e1d58d0e99e 100644 --- a/service/directconnect/api_op_DeleteDirectConnectGatewayAssociationProposal.go +++ b/service/directconnect/api_op_DeleteDirectConnectGatewayAssociationProposal.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteDirectConnectGatewayAssociationProposal(ctx context.Conte addawsAwsjson11_serdeOpDeleteDirectConnectGatewayAssociationProposalMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DeleteInterconnect.go b/service/directconnect/api_op_DeleteInterconnect.go index b0b8f1501ad..7c3a4d809da 100644 --- a/service/directconnect/api_op_DeleteInterconnect.go +++ b/service/directconnect/api_op_DeleteInterconnect.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteInterconnect(ctx context.Context, params *DeleteInterconn addawsAwsjson11_serdeOpDeleteInterconnectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DeleteLag.go b/service/directconnect/api_op_DeleteLag.go index f4fe92c5a97..e49b6b64e3f 100644 --- a/service/directconnect/api_op_DeleteLag.go +++ b/service/directconnect/api_op_DeleteLag.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteLag(ctx context.Context, params *DeleteLagInput, optFns . addawsAwsjson11_serdeOpDeleteLagMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DeleteVirtualInterface.go b/service/directconnect/api_op_DeleteVirtualInterface.go index 7b29ee1b52b..1852e0958cb 100644 --- a/service/directconnect/api_op_DeleteVirtualInterface.go +++ b/service/directconnect/api_op_DeleteVirtualInterface.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteVirtualInterface(ctx context.Context, params *DeleteVirtu addawsAwsjson11_serdeOpDeleteVirtualInterfaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DescribeConnectionLoa.go b/service/directconnect/api_op_DescribeConnectionLoa.go index ccb4e233d12..6f84ce59da3 100644 --- a/service/directconnect/api_op_DescribeConnectionLoa.go +++ b/service/directconnect/api_op_DescribeConnectionLoa.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeConnectionLoa(ctx context.Context, params *DescribeConn addawsAwsjson11_serdeOpDescribeConnectionLoaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DescribeConnections.go b/service/directconnect/api_op_DescribeConnections.go index 0b525ed7084..85649076f9d 100644 --- a/service/directconnect/api_op_DescribeConnections.go +++ b/service/directconnect/api_op_DescribeConnections.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeConnections(ctx context.Context, params *DescribeConnec addawsAwsjson11_serdeOpDescribeConnectionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DescribeConnectionsOnInterconnect.go b/service/directconnect/api_op_DescribeConnectionsOnInterconnect.go index f539b6a7c26..59890c8b6d6 100644 --- a/service/directconnect/api_op_DescribeConnectionsOnInterconnect.go +++ b/service/directconnect/api_op_DescribeConnectionsOnInterconnect.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeConnectionsOnInterconnect(ctx context.Context, params * addawsAwsjson11_serdeOpDescribeConnectionsOnInterconnectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DescribeDirectConnectGatewayAssociationProposals.go b/service/directconnect/api_op_DescribeDirectConnectGatewayAssociationProposals.go index a1be033eade..2919b445f0a 100644 --- a/service/directconnect/api_op_DescribeDirectConnectGatewayAssociationProposals.go +++ b/service/directconnect/api_op_DescribeDirectConnectGatewayAssociationProposals.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDirectConnectGatewayAssociationProposals(ctx context.Co addawsAwsjson11_serdeOpDescribeDirectConnectGatewayAssociationProposalsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DescribeDirectConnectGatewayAssociations.go b/service/directconnect/api_op_DescribeDirectConnectGatewayAssociations.go index 311618450ff..e68d647c450 100644 --- a/service/directconnect/api_op_DescribeDirectConnectGatewayAssociations.go +++ b/service/directconnect/api_op_DescribeDirectConnectGatewayAssociations.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DescribeDirectConnectGatewayAssociations(ctx context.Context, p addawsAwsjson11_serdeOpDescribeDirectConnectGatewayAssociationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DescribeDirectConnectGatewayAttachments.go b/service/directconnect/api_op_DescribeDirectConnectGatewayAttachments.go index 5d582a05711..4d6f895509e 100644 --- a/service/directconnect/api_op_DescribeDirectConnectGatewayAttachments.go +++ b/service/directconnect/api_op_DescribeDirectConnectGatewayAttachments.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeDirectConnectGatewayAttachments(ctx context.Context, pa addawsAwsjson11_serdeOpDescribeDirectConnectGatewayAttachmentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DescribeDirectConnectGateways.go b/service/directconnect/api_op_DescribeDirectConnectGateways.go index dcf0dab617c..3c29d099ea1 100644 --- a/service/directconnect/api_op_DescribeDirectConnectGateways.go +++ b/service/directconnect/api_op_DescribeDirectConnectGateways.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDirectConnectGateways(ctx context.Context, params *Desc addawsAwsjson11_serdeOpDescribeDirectConnectGatewaysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DescribeHostedConnections.go b/service/directconnect/api_op_DescribeHostedConnections.go index 321c8d5e709..90cd7161757 100644 --- a/service/directconnect/api_op_DescribeHostedConnections.go +++ b/service/directconnect/api_op_DescribeHostedConnections.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeHostedConnections(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeHostedConnectionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DescribeInterconnectLoa.go b/service/directconnect/api_op_DescribeInterconnectLoa.go index 014b8842b16..aec15fff39e 100644 --- a/service/directconnect/api_op_DescribeInterconnectLoa.go +++ b/service/directconnect/api_op_DescribeInterconnectLoa.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeInterconnectLoa(ctx context.Context, params *DescribeIn addawsAwsjson11_serdeOpDescribeInterconnectLoaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DescribeInterconnects.go b/service/directconnect/api_op_DescribeInterconnects.go index 7628cff0288..c41d0705dac 100644 --- a/service/directconnect/api_op_DescribeInterconnects.go +++ b/service/directconnect/api_op_DescribeInterconnects.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeInterconnects(ctx context.Context, params *DescribeInte addawsAwsjson11_serdeOpDescribeInterconnectsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DescribeLags.go b/service/directconnect/api_op_DescribeLags.go index b67864c88a7..4c15642b608 100644 --- a/service/directconnect/api_op_DescribeLags.go +++ b/service/directconnect/api_op_DescribeLags.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeLags(ctx context.Context, params *DescribeLagsInput, op addawsAwsjson11_serdeOpDescribeLagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DescribeLoa.go b/service/directconnect/api_op_DescribeLoa.go index 02b3bd51ce6..60ff3d0423e 100644 --- a/service/directconnect/api_op_DescribeLoa.go +++ b/service/directconnect/api_op_DescribeLoa.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeLoa(ctx context.Context, params *DescribeLoaInput, optF addawsAwsjson11_serdeOpDescribeLoaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DescribeLocations.go b/service/directconnect/api_op_DescribeLocations.go index 4d18ec58f55..c55e4162a4b 100644 --- a/service/directconnect/api_op_DescribeLocations.go +++ b/service/directconnect/api_op_DescribeLocations.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeLocations(ctx context.Context, params *DescribeLocation addawsAwsjson11_serdeOpDescribeLocationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DescribeTags.go b/service/directconnect/api_op_DescribeTags.go index bb18f1d35d0..49811432d1e 100644 --- a/service/directconnect/api_op_DescribeTags.go +++ b/service/directconnect/api_op_DescribeTags.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeTags(ctx context.Context, params *DescribeTagsInput, op addawsAwsjson11_serdeOpDescribeTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DescribeVirtualGateways.go b/service/directconnect/api_op_DescribeVirtualGateways.go index 61addebb3d5..89d97d7bf47 100644 --- a/service/directconnect/api_op_DescribeVirtualGateways.go +++ b/service/directconnect/api_op_DescribeVirtualGateways.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeVirtualGateways(ctx context.Context, params *DescribeVi addawsAwsjson11_serdeOpDescribeVirtualGatewaysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DescribeVirtualInterfaces.go b/service/directconnect/api_op_DescribeVirtualInterfaces.go index fa596bb051c..895215b176f 100644 --- a/service/directconnect/api_op_DescribeVirtualInterfaces.go +++ b/service/directconnect/api_op_DescribeVirtualInterfaces.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeVirtualInterfaces(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeVirtualInterfacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_DisassociateConnectionFromLag.go b/service/directconnect/api_op_DisassociateConnectionFromLag.go index 82de52d26c3..c9fe73e0886 100644 --- a/service/directconnect/api_op_DisassociateConnectionFromLag.go +++ b/service/directconnect/api_op_DisassociateConnectionFromLag.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) DisassociateConnectionFromLag(ctx context.Context, params *Disa addawsAwsjson11_serdeOpDisassociateConnectionFromLagMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_ListVirtualInterfaceTestHistory.go b/service/directconnect/api_op_ListVirtualInterfaceTestHistory.go index 456b8926924..afebc659a4d 100644 --- a/service/directconnect/api_op_ListVirtualInterfaceTestHistory.go +++ b/service/directconnect/api_op_ListVirtualInterfaceTestHistory.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListVirtualInterfaceTestHistory(ctx context.Context, params *Li addawsAwsjson11_serdeOpListVirtualInterfaceTestHistoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_StartBgpFailoverTest.go b/service/directconnect/api_op_StartBgpFailoverTest.go index 9ce3283c102..1f05533afa0 100644 --- a/service/directconnect/api_op_StartBgpFailoverTest.go +++ b/service/directconnect/api_op_StartBgpFailoverTest.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) StartBgpFailoverTest(ctx context.Context, params *StartBgpFailo addawsAwsjson11_serdeOpStartBgpFailoverTestMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_StopBgpFailoverTest.go b/service/directconnect/api_op_StopBgpFailoverTest.go index 02143964fd4..b5512ac9f3a 100644 --- a/service/directconnect/api_op_StopBgpFailoverTest.go +++ b/service/directconnect/api_op_StopBgpFailoverTest.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StopBgpFailoverTest(ctx context.Context, params *StopBgpFailove addawsAwsjson11_serdeOpStopBgpFailoverTestMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_TagResource.go b/service/directconnect/api_op_TagResource.go index 5f198e80a69..5600da2ec7f 100644 --- a/service/directconnect/api_op_TagResource.go +++ b/service/directconnect/api_op_TagResource.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_UntagResource.go b/service/directconnect/api_op_UntagResource.go index 0c0044e21d3..d21492ef304 100644 --- a/service/directconnect/api_op_UntagResource.go +++ b/service/directconnect/api_op_UntagResource.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_UpdateDirectConnectGatewayAssociation.go b/service/directconnect/api_op_UpdateDirectConnectGatewayAssociation.go index d029def23c7..1547598d066 100644 --- a/service/directconnect/api_op_UpdateDirectConnectGatewayAssociation.go +++ b/service/directconnect/api_op_UpdateDirectConnectGatewayAssociation.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateDirectConnectGatewayAssociation(ctx context.Context, para addawsAwsjson11_serdeOpUpdateDirectConnectGatewayAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_UpdateLag.go b/service/directconnect/api_op_UpdateLag.go index 9a4fa93ec6f..16229a7fc03 100644 --- a/service/directconnect/api_op_UpdateLag.go +++ b/service/directconnect/api_op_UpdateLag.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) UpdateLag(ctx context.Context, params *UpdateLagInput, optFns . addawsAwsjson11_serdeOpUpdateLagMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/api_op_UpdateVirtualInterfaceAttributes.go b/service/directconnect/api_op_UpdateVirtualInterfaceAttributes.go index 65761b6cc2c..71e1b917706 100644 --- a/service/directconnect/api_op_UpdateVirtualInterfaceAttributes.go +++ b/service/directconnect/api_op_UpdateVirtualInterfaceAttributes.go @@ -5,7 +5,6 @@ package directconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directconnect/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) UpdateVirtualInterfaceAttributes(ctx context.Context, params *U addawsAwsjson11_serdeOpUpdateVirtualInterfaceAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directconnect/endpoints.go b/service/directconnect/endpoints.go index 809e38bb01c..0ec155850b9 100644 --- a/service/directconnect/endpoints.go +++ b/service/directconnect/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/directoryservice/api_client.go b/service/directoryservice/api_client.go index 4ba7b9aee89..180f5394810 100644 --- a/service/directoryservice/api_client.go +++ b/service/directoryservice/api_client.go @@ -90,30 +90,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -179,6 +155,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/directoryservice/api_op_AcceptSharedDirectory.go b/service/directoryservice/api_op_AcceptSharedDirectory.go index 6d885fab0fb..9b1113b24cd 100644 --- a/service/directoryservice/api_op_AcceptSharedDirectory.go +++ b/service/directoryservice/api_op_AcceptSharedDirectory.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AcceptSharedDirectory(ctx context.Context, params *AcceptShared addawsAwsjson11_serdeOpAcceptSharedDirectoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_AddIpRoutes.go b/service/directoryservice/api_op_AddIpRoutes.go index 6d5794a26e3..0d3ccd4046a 100644 --- a/service/directoryservice/api_op_AddIpRoutes.go +++ b/service/directoryservice/api_op_AddIpRoutes.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) AddIpRoutes(ctx context.Context, params *AddIpRoutesInput, optF addawsAwsjson11_serdeOpAddIpRoutesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_AddTagsToResource.go b/service/directoryservice/api_op_AddTagsToResource.go index c5f309addb7..a689094d8ba 100644 --- a/service/directoryservice/api_op_AddTagsToResource.go +++ b/service/directoryservice/api_op_AddTagsToResource.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) AddTagsToResource(ctx context.Context, params *AddTagsToResourc addawsAwsjson11_serdeOpAddTagsToResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_CancelSchemaExtension.go b/service/directoryservice/api_op_CancelSchemaExtension.go index 168358475c3..3cad9f43553 100644 --- a/service/directoryservice/api_op_CancelSchemaExtension.go +++ b/service/directoryservice/api_op_CancelSchemaExtension.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) CancelSchemaExtension(ctx context.Context, params *CancelSchema addawsAwsjson11_serdeOpCancelSchemaExtensionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_ConnectDirectory.go b/service/directoryservice/api_op_ConnectDirectory.go index 4905b70520a..996838adee2 100644 --- a/service/directoryservice/api_op_ConnectDirectory.go +++ b/service/directoryservice/api_op_ConnectDirectory.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ConnectDirectory(ctx context.Context, params *ConnectDirectoryI addawsAwsjson11_serdeOpConnectDirectoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_CreateAlias.go b/service/directoryservice/api_op_CreateAlias.go index 6877cb4e93c..2d172c342fd 100644 --- a/service/directoryservice/api_op_CreateAlias.go +++ b/service/directoryservice/api_op_CreateAlias.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) CreateAlias(ctx context.Context, params *CreateAliasInput, optF addawsAwsjson11_serdeOpCreateAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_CreateComputer.go b/service/directoryservice/api_op_CreateComputer.go index 9c9a4ce93ec..20d9d37475e 100644 --- a/service/directoryservice/api_op_CreateComputer.go +++ b/service/directoryservice/api_op_CreateComputer.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateComputer(ctx context.Context, params *CreateComputerInput addawsAwsjson11_serdeOpCreateComputerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_CreateConditionalForwarder.go b/service/directoryservice/api_op_CreateConditionalForwarder.go index 28d95fe29e9..2e59fd27f8e 100644 --- a/service/directoryservice/api_op_CreateConditionalForwarder.go +++ b/service/directoryservice/api_op_CreateConditionalForwarder.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CreateConditionalForwarder(ctx context.Context, params *CreateC addawsAwsjson11_serdeOpCreateConditionalForwarderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_CreateDirectory.go b/service/directoryservice/api_op_CreateDirectory.go index 0a04422f5d6..5eaafad5423 100644 --- a/service/directoryservice/api_op_CreateDirectory.go +++ b/service/directoryservice/api_op_CreateDirectory.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateDirectory(ctx context.Context, params *CreateDirectoryInp addawsAwsjson11_serdeOpCreateDirectoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_CreateLogSubscription.go b/service/directoryservice/api_op_CreateLogSubscription.go index cf4997fd253..ba8f3c7e574 100644 --- a/service/directoryservice/api_op_CreateLogSubscription.go +++ b/service/directoryservice/api_op_CreateLogSubscription.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateLogSubscription(ctx context.Context, params *CreateLogSub addawsAwsjson11_serdeOpCreateLogSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_CreateMicrosoftAD.go b/service/directoryservice/api_op_CreateMicrosoftAD.go index 4d493ae5014..58da26ee1d6 100644 --- a/service/directoryservice/api_op_CreateMicrosoftAD.go +++ b/service/directoryservice/api_op_CreateMicrosoftAD.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateMicrosoftAD(ctx context.Context, params *CreateMicrosoftA addawsAwsjson11_serdeOpCreateMicrosoftADMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_CreateSnapshot.go b/service/directoryservice/api_op_CreateSnapshot.go index 965ff928408..8c4ec11cbe1 100644 --- a/service/directoryservice/api_op_CreateSnapshot.go +++ b/service/directoryservice/api_op_CreateSnapshot.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateSnapshot(ctx context.Context, params *CreateSnapshotInput addawsAwsjson11_serdeOpCreateSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_CreateTrust.go b/service/directoryservice/api_op_CreateTrust.go index e9867cb1353..5c5b9cf7047 100644 --- a/service/directoryservice/api_op_CreateTrust.go +++ b/service/directoryservice/api_op_CreateTrust.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateTrust(ctx context.Context, params *CreateTrustInput, optF addawsAwsjson11_serdeOpCreateTrustMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DeleteConditionalForwarder.go b/service/directoryservice/api_op_DeleteConditionalForwarder.go index f109b27be15..fcf82b83b63 100644 --- a/service/directoryservice/api_op_DeleteConditionalForwarder.go +++ b/service/directoryservice/api_op_DeleteConditionalForwarder.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteConditionalForwarder(ctx context.Context, params *DeleteC addawsAwsjson11_serdeOpDeleteConditionalForwarderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DeleteDirectory.go b/service/directoryservice/api_op_DeleteDirectory.go index 8ab47af59cf..3d8f863b61d 100644 --- a/service/directoryservice/api_op_DeleteDirectory.go +++ b/service/directoryservice/api_op_DeleteDirectory.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteDirectory(ctx context.Context, params *DeleteDirectoryInp addawsAwsjson11_serdeOpDeleteDirectoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DeleteLogSubscription.go b/service/directoryservice/api_op_DeleteLogSubscription.go index 0cd8529b807..f3bcc12f976 100644 --- a/service/directoryservice/api_op_DeleteLogSubscription.go +++ b/service/directoryservice/api_op_DeleteLogSubscription.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteLogSubscription(ctx context.Context, params *DeleteLogSub addawsAwsjson11_serdeOpDeleteLogSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DeleteSnapshot.go b/service/directoryservice/api_op_DeleteSnapshot.go index 971307acf58..55af41985e9 100644 --- a/service/directoryservice/api_op_DeleteSnapshot.go +++ b/service/directoryservice/api_op_DeleteSnapshot.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSnapshot(ctx context.Context, params *DeleteSnapshotInput addawsAwsjson11_serdeOpDeleteSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DeleteTrust.go b/service/directoryservice/api_op_DeleteTrust.go index ff652e28371..c5f86ef8327 100644 --- a/service/directoryservice/api_op_DeleteTrust.go +++ b/service/directoryservice/api_op_DeleteTrust.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteTrust(ctx context.Context, params *DeleteTrustInput, optF addawsAwsjson11_serdeOpDeleteTrustMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DeregisterCertificate.go b/service/directoryservice/api_op_DeregisterCertificate.go index 68a7fce5071..df43c228187 100644 --- a/service/directoryservice/api_op_DeregisterCertificate.go +++ b/service/directoryservice/api_op_DeregisterCertificate.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeregisterCertificate(ctx context.Context, params *DeregisterCe addawsAwsjson11_serdeOpDeregisterCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DeregisterEventTopic.go b/service/directoryservice/api_op_DeregisterEventTopic.go index 746a9b7a8ee..0d8e132f27e 100644 --- a/service/directoryservice/api_op_DeregisterEventTopic.go +++ b/service/directoryservice/api_op_DeregisterEventTopic.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeregisterEventTopic(ctx context.Context, params *DeregisterEve addawsAwsjson11_serdeOpDeregisterEventTopicMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DescribeCertificate.go b/service/directoryservice/api_op_DescribeCertificate.go index 4152a519463..de374a62576 100644 --- a/service/directoryservice/api_op_DescribeCertificate.go +++ b/service/directoryservice/api_op_DescribeCertificate.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeCertificate(ctx context.Context, params *DescribeCertif addawsAwsjson11_serdeOpDescribeCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DescribeConditionalForwarders.go b/service/directoryservice/api_op_DescribeConditionalForwarders.go index 99e2474bc7b..ba180177d5f 100644 --- a/service/directoryservice/api_op_DescribeConditionalForwarders.go +++ b/service/directoryservice/api_op_DescribeConditionalForwarders.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeConditionalForwarders(ctx context.Context, params *Desc addawsAwsjson11_serdeOpDescribeConditionalForwardersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DescribeDirectories.go b/service/directoryservice/api_op_DescribeDirectories.go index eedbc5c99f7..4bf06632767 100644 --- a/service/directoryservice/api_op_DescribeDirectories.go +++ b/service/directoryservice/api_op_DescribeDirectories.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DescribeDirectories(ctx context.Context, params *DescribeDirect addawsAwsjson11_serdeOpDescribeDirectoriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DescribeDomainControllers.go b/service/directoryservice/api_op_DescribeDomainControllers.go index 9d4dfdd0a56..c2f2b73568c 100644 --- a/service/directoryservice/api_op_DescribeDomainControllers.go +++ b/service/directoryservice/api_op_DescribeDomainControllers.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDomainControllers(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeDomainControllersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DescribeEventTopics.go b/service/directoryservice/api_op_DescribeEventTopics.go index e2f20c082c1..34cbd678129 100644 --- a/service/directoryservice/api_op_DescribeEventTopics.go +++ b/service/directoryservice/api_op_DescribeEventTopics.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeEventTopics(ctx context.Context, params *DescribeEventT addawsAwsjson11_serdeOpDescribeEventTopicsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DescribeLDAPSSettings.go b/service/directoryservice/api_op_DescribeLDAPSSettings.go index a0749c8c9f2..b5073f90fab 100644 --- a/service/directoryservice/api_op_DescribeLDAPSSettings.go +++ b/service/directoryservice/api_op_DescribeLDAPSSettings.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeLDAPSSettings(ctx context.Context, params *DescribeLDAP addawsAwsjson11_serdeOpDescribeLDAPSSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DescribeSharedDirectories.go b/service/directoryservice/api_op_DescribeSharedDirectories.go index 26fa465a35f..0f8fdce9914 100644 --- a/service/directoryservice/api_op_DescribeSharedDirectories.go +++ b/service/directoryservice/api_op_DescribeSharedDirectories.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeSharedDirectories(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeSharedDirectoriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DescribeSnapshots.go b/service/directoryservice/api_op_DescribeSnapshots.go index caf29225878..cc860430bcc 100644 --- a/service/directoryservice/api_op_DescribeSnapshots.go +++ b/service/directoryservice/api_op_DescribeSnapshots.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeSnapshots(ctx context.Context, params *DescribeSnapshot addawsAwsjson11_serdeOpDescribeSnapshotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DescribeTrusts.go b/service/directoryservice/api_op_DescribeTrusts.go index 920e412efe9..8e56fe5facb 100644 --- a/service/directoryservice/api_op_DescribeTrusts.go +++ b/service/directoryservice/api_op_DescribeTrusts.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeTrusts(ctx context.Context, params *DescribeTrustsInput addawsAwsjson11_serdeOpDescribeTrustsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DisableLDAPS.go b/service/directoryservice/api_op_DisableLDAPS.go index 5c24436b91d..6371d25e11f 100644 --- a/service/directoryservice/api_op_DisableLDAPS.go +++ b/service/directoryservice/api_op_DisableLDAPS.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DisableLDAPS(ctx context.Context, params *DisableLDAPSInput, op addawsAwsjson11_serdeOpDisableLDAPSMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DisableRadius.go b/service/directoryservice/api_op_DisableRadius.go index 4d81852fd32..a1a7846136f 100644 --- a/service/directoryservice/api_op_DisableRadius.go +++ b/service/directoryservice/api_op_DisableRadius.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisableRadius(ctx context.Context, params *DisableRadiusInput, addawsAwsjson11_serdeOpDisableRadiusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_DisableSso.go b/service/directoryservice/api_op_DisableSso.go index 61339bda16e..efd00132e01 100644 --- a/service/directoryservice/api_op_DisableSso.go +++ b/service/directoryservice/api_op_DisableSso.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisableSso(ctx context.Context, params *DisableSsoInput, optFns addawsAwsjson11_serdeOpDisableSsoMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_EnableLDAPS.go b/service/directoryservice/api_op_EnableLDAPS.go index 0a280be8915..5f804b25066 100644 --- a/service/directoryservice/api_op_EnableLDAPS.go +++ b/service/directoryservice/api_op_EnableLDAPS.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) EnableLDAPS(ctx context.Context, params *EnableLDAPSInput, optF addawsAwsjson11_serdeOpEnableLDAPSMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_EnableRadius.go b/service/directoryservice/api_op_EnableRadius.go index 054a6bd3e77..2b37da77e09 100644 --- a/service/directoryservice/api_op_EnableRadius.go +++ b/service/directoryservice/api_op_EnableRadius.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) EnableRadius(ctx context.Context, params *EnableRadiusInput, op addawsAwsjson11_serdeOpEnableRadiusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_EnableSso.go b/service/directoryservice/api_op_EnableSso.go index c9f0a9dde85..562647999b4 100644 --- a/service/directoryservice/api_op_EnableSso.go +++ b/service/directoryservice/api_op_EnableSso.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) EnableSso(ctx context.Context, params *EnableSsoInput, optFns . addawsAwsjson11_serdeOpEnableSsoMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_GetDirectoryLimits.go b/service/directoryservice/api_op_GetDirectoryLimits.go index cd0604400b7..34c3b2f94ee 100644 --- a/service/directoryservice/api_op_GetDirectoryLimits.go +++ b/service/directoryservice/api_op_GetDirectoryLimits.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDirectoryLimits(ctx context.Context, params *GetDirectoryLim addawsAwsjson11_serdeOpGetDirectoryLimitsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_GetSnapshotLimits.go b/service/directoryservice/api_op_GetSnapshotLimits.go index c9710dae444..8ccbecfa629 100644 --- a/service/directoryservice/api_op_GetSnapshotLimits.go +++ b/service/directoryservice/api_op_GetSnapshotLimits.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetSnapshotLimits(ctx context.Context, params *GetSnapshotLimit addawsAwsjson11_serdeOpGetSnapshotLimitsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_ListCertificates.go b/service/directoryservice/api_op_ListCertificates.go index 54dcd0563bf..20690f8a55b 100644 --- a/service/directoryservice/api_op_ListCertificates.go +++ b/service/directoryservice/api_op_ListCertificates.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListCertificates(ctx context.Context, params *ListCertificatesI addawsAwsjson11_serdeOpListCertificatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_ListIpRoutes.go b/service/directoryservice/api_op_ListIpRoutes.go index 79b6a071732..b9609067e9f 100644 --- a/service/directoryservice/api_op_ListIpRoutes.go +++ b/service/directoryservice/api_op_ListIpRoutes.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListIpRoutes(ctx context.Context, params *ListIpRoutesInput, op addawsAwsjson11_serdeOpListIpRoutesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_ListLogSubscriptions.go b/service/directoryservice/api_op_ListLogSubscriptions.go index c9f9a07aa55..3faacddf573 100644 --- a/service/directoryservice/api_op_ListLogSubscriptions.go +++ b/service/directoryservice/api_op_ListLogSubscriptions.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListLogSubscriptions(ctx context.Context, params *ListLogSubscr addawsAwsjson11_serdeOpListLogSubscriptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_ListSchemaExtensions.go b/service/directoryservice/api_op_ListSchemaExtensions.go index 74a1c294f49..f99ad63e521 100644 --- a/service/directoryservice/api_op_ListSchemaExtensions.go +++ b/service/directoryservice/api_op_ListSchemaExtensions.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListSchemaExtensions(ctx context.Context, params *ListSchemaExt addawsAwsjson11_serdeOpListSchemaExtensionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_ListTagsForResource.go b/service/directoryservice/api_op_ListTagsForResource.go index 4d95065aad2..9bbfb69dacb 100644 --- a/service/directoryservice/api_op_ListTagsForResource.go +++ b/service/directoryservice/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_RegisterCertificate.go b/service/directoryservice/api_op_RegisterCertificate.go index 64288e6e386..d2034f4d6ad 100644 --- a/service/directoryservice/api_op_RegisterCertificate.go +++ b/service/directoryservice/api_op_RegisterCertificate.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RegisterCertificate(ctx context.Context, params *RegisterCertif addawsAwsjson11_serdeOpRegisterCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_RegisterEventTopic.go b/service/directoryservice/api_op_RegisterEventTopic.go index 7fd6b82f9f2..320c5f60d3c 100644 --- a/service/directoryservice/api_op_RegisterEventTopic.go +++ b/service/directoryservice/api_op_RegisterEventTopic.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) RegisterEventTopic(ctx context.Context, params *RegisterEventTo addawsAwsjson11_serdeOpRegisterEventTopicMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_RejectSharedDirectory.go b/service/directoryservice/api_op_RejectSharedDirectory.go index 8411e11b84c..7752bf4cde3 100644 --- a/service/directoryservice/api_op_RejectSharedDirectory.go +++ b/service/directoryservice/api_op_RejectSharedDirectory.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) RejectSharedDirectory(ctx context.Context, params *RejectShared addawsAwsjson11_serdeOpRejectSharedDirectoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_RemoveIpRoutes.go b/service/directoryservice/api_op_RemoveIpRoutes.go index b97ecc459f2..e25a1cd2edd 100644 --- a/service/directoryservice/api_op_RemoveIpRoutes.go +++ b/service/directoryservice/api_op_RemoveIpRoutes.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RemoveIpRoutes(ctx context.Context, params *RemoveIpRoutesInput addawsAwsjson11_serdeOpRemoveIpRoutesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_RemoveTagsFromResource.go b/service/directoryservice/api_op_RemoveTagsFromResource.go index a5a849937ce..4bf8976eab6 100644 --- a/service/directoryservice/api_op_RemoveTagsFromResource.go +++ b/service/directoryservice/api_op_RemoveTagsFromResource.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RemoveTagsFromResource(ctx context.Context, params *RemoveTagsF addawsAwsjson11_serdeOpRemoveTagsFromResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_ResetUserPassword.go b/service/directoryservice/api_op_ResetUserPassword.go index 7db5b08f3bc..4466b70af00 100644 --- a/service/directoryservice/api_op_ResetUserPassword.go +++ b/service/directoryservice/api_op_ResetUserPassword.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -37,9 +36,9 @@ func (c *Client) ResetUserPassword(ctx context.Context, params *ResetUserPasswor addawsAwsjson11_serdeOpResetUserPasswordMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_RestoreFromSnapshot.go b/service/directoryservice/api_op_RestoreFromSnapshot.go index f62d3654b9b..e6f5f5651b4 100644 --- a/service/directoryservice/api_op_RestoreFromSnapshot.go +++ b/service/directoryservice/api_op_RestoreFromSnapshot.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) RestoreFromSnapshot(ctx context.Context, params *RestoreFromSna addawsAwsjson11_serdeOpRestoreFromSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_ShareDirectory.go b/service/directoryservice/api_op_ShareDirectory.go index cdce9b0911a..ba9ad3487f2 100644 --- a/service/directoryservice/api_op_ShareDirectory.go +++ b/service/directoryservice/api_op_ShareDirectory.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) ShareDirectory(ctx context.Context, params *ShareDirectoryInput addawsAwsjson11_serdeOpShareDirectoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_StartSchemaExtension.go b/service/directoryservice/api_op_StartSchemaExtension.go index 31e1aede3aa..8d6d39d30a5 100644 --- a/service/directoryservice/api_op_StartSchemaExtension.go +++ b/service/directoryservice/api_op_StartSchemaExtension.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StartSchemaExtension(ctx context.Context, params *StartSchemaEx addawsAwsjson11_serdeOpStartSchemaExtensionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_UnshareDirectory.go b/service/directoryservice/api_op_UnshareDirectory.go index e4425204545..1a4c7ed0668 100644 --- a/service/directoryservice/api_op_UnshareDirectory.go +++ b/service/directoryservice/api_op_UnshareDirectory.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UnshareDirectory(ctx context.Context, params *UnshareDirectoryI addawsAwsjson11_serdeOpUnshareDirectoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_UpdateConditionalForwarder.go b/service/directoryservice/api_op_UpdateConditionalForwarder.go index cf820c72fe2..0768446862e 100644 --- a/service/directoryservice/api_op_UpdateConditionalForwarder.go +++ b/service/directoryservice/api_op_UpdateConditionalForwarder.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateConditionalForwarder(ctx context.Context, params *UpdateC addawsAwsjson11_serdeOpUpdateConditionalForwarderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_UpdateNumberOfDomainControllers.go b/service/directoryservice/api_op_UpdateNumberOfDomainControllers.go index 97ee5068565..a0e281b4bd3 100644 --- a/service/directoryservice/api_op_UpdateNumberOfDomainControllers.go +++ b/service/directoryservice/api_op_UpdateNumberOfDomainControllers.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) UpdateNumberOfDomainControllers(ctx context.Context, params *Up addawsAwsjson11_serdeOpUpdateNumberOfDomainControllersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_UpdateRadius.go b/service/directoryservice/api_op_UpdateRadius.go index 5bbb0cf23f5..5730e73b99a 100644 --- a/service/directoryservice/api_op_UpdateRadius.go +++ b/service/directoryservice/api_op_UpdateRadius.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateRadius(ctx context.Context, params *UpdateRadiusInput, op addawsAwsjson11_serdeOpUpdateRadiusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_UpdateTrust.go b/service/directoryservice/api_op_UpdateTrust.go index eeda930de92..7a9c91d9b29 100644 --- a/service/directoryservice/api_op_UpdateTrust.go +++ b/service/directoryservice/api_op_UpdateTrust.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/directoryservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateTrust(ctx context.Context, params *UpdateTrustInput, optF addawsAwsjson11_serdeOpUpdateTrustMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/api_op_VerifyTrust.go b/service/directoryservice/api_op_VerifyTrust.go index 49f4e28952d..65134bd2c56 100644 --- a/service/directoryservice/api_op_VerifyTrust.go +++ b/service/directoryservice/api_op_VerifyTrust.go @@ -5,7 +5,6 @@ package directoryservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) VerifyTrust(ctx context.Context, params *VerifyTrustInput, optF addawsAwsjson11_serdeOpVerifyTrustMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/directoryservice/endpoints.go b/service/directoryservice/endpoints.go index b6310fa523c..724d2eadc69 100644 --- a/service/directoryservice/endpoints.go +++ b/service/directoryservice/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/dlm/api_client.go b/service/dlm/api_client.go index ea22a36b120..31e63685f43 100644 --- a/service/dlm/api_client.go +++ b/service/dlm/api_client.go @@ -83,30 +83,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -172,6 +148,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/dlm/api_op_CreateLifecyclePolicy.go b/service/dlm/api_op_CreateLifecyclePolicy.go index 3ec8428ae18..f91d4f1a0e3 100644 --- a/service/dlm/api_op_CreateLifecyclePolicy.go +++ b/service/dlm/api_op_CreateLifecyclePolicy.go @@ -5,7 +5,6 @@ package dlm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dlm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateLifecyclePolicy(ctx context.Context, params *CreateLifecy addawsRestjson1_serdeOpCreateLifecyclePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dlm/api_op_DeleteLifecyclePolicy.go b/service/dlm/api_op_DeleteLifecyclePolicy.go index f642f2ecd48..d5bca927831 100644 --- a/service/dlm/api_op_DeleteLifecyclePolicy.go +++ b/service/dlm/api_op_DeleteLifecyclePolicy.go @@ -5,7 +5,6 @@ package dlm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteLifecyclePolicy(ctx context.Context, params *DeleteLifecy addawsRestjson1_serdeOpDeleteLifecyclePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dlm/api_op_GetLifecyclePolicies.go b/service/dlm/api_op_GetLifecyclePolicies.go index 826a06852f0..d93d22ae63c 100644 --- a/service/dlm/api_op_GetLifecyclePolicies.go +++ b/service/dlm/api_op_GetLifecyclePolicies.go @@ -5,7 +5,6 @@ package dlm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dlm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetLifecyclePolicies(ctx context.Context, params *GetLifecycleP addawsRestjson1_serdeOpGetLifecyclePoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dlm/api_op_GetLifecyclePolicy.go b/service/dlm/api_op_GetLifecyclePolicy.go index ed001082434..24ef4dde49a 100644 --- a/service/dlm/api_op_GetLifecyclePolicy.go +++ b/service/dlm/api_op_GetLifecyclePolicy.go @@ -5,7 +5,6 @@ package dlm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dlm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetLifecyclePolicy(ctx context.Context, params *GetLifecyclePol addawsRestjson1_serdeOpGetLifecyclePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dlm/api_op_ListTagsForResource.go b/service/dlm/api_op_ListTagsForResource.go index b6762a1dd39..0f5e2888268 100644 --- a/service/dlm/api_op_ListTagsForResource.go +++ b/service/dlm/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package dlm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dlm/api_op_TagResource.go b/service/dlm/api_op_TagResource.go index 815aef31114..18448676f19 100644 --- a/service/dlm/api_op_TagResource.go +++ b/service/dlm/api_op_TagResource.go @@ -5,7 +5,6 @@ package dlm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dlm/api_op_UntagResource.go b/service/dlm/api_op_UntagResource.go index 268f90e6e65..05e2be8903b 100644 --- a/service/dlm/api_op_UntagResource.go +++ b/service/dlm/api_op_UntagResource.go @@ -5,7 +5,6 @@ package dlm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dlm/api_op_UpdateLifecyclePolicy.go b/service/dlm/api_op_UpdateLifecyclePolicy.go index f49d80ae52e..2760fa3db92 100644 --- a/service/dlm/api_op_UpdateLifecyclePolicy.go +++ b/service/dlm/api_op_UpdateLifecyclePolicy.go @@ -5,7 +5,6 @@ package dlm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dlm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateLifecyclePolicy(ctx context.Context, params *UpdateLifecy addawsRestjson1_serdeOpUpdateLifecyclePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dlm/endpoints.go b/service/dlm/endpoints.go index 28d524a37ee..ddb9e9c9585 100644 --- a/service/dlm/endpoints.go +++ b/service/dlm/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/docdb/api_client.go b/service/docdb/api_client.go index 4dffdeb607b..c9a483a296d 100644 --- a/service/docdb/api_client.go +++ b/service/docdb/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/docdb/api_op_AddTagsToResource.go b/service/docdb/api_op_AddTagsToResource.go index b6014c162f0..e7d9a3d4db2 100644 --- a/service/docdb/api_op_AddTagsToResource.go +++ b/service/docdb/api_op_AddTagsToResource.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) AddTagsToResource(ctx context.Context, params *AddTagsToResourc addawsAwsquery_serdeOpAddTagsToResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_ApplyPendingMaintenanceAction.go b/service/docdb/api_op_ApplyPendingMaintenanceAction.go index 9d7397559b0..0b038751d54 100644 --- a/service/docdb/api_op_ApplyPendingMaintenanceAction.go +++ b/service/docdb/api_op_ApplyPendingMaintenanceAction.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ApplyPendingMaintenanceAction(ctx context.Context, params *Appl addawsAwsquery_serdeOpApplyPendingMaintenanceActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_CopyDBClusterParameterGroup.go b/service/docdb/api_op_CopyDBClusterParameterGroup.go index 40ca18e30aa..1af40bafecd 100644 --- a/service/docdb/api_op_CopyDBClusterParameterGroup.go +++ b/service/docdb/api_op_CopyDBClusterParameterGroup.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CopyDBClusterParameterGroup(ctx context.Context, params *CopyDB addawsAwsquery_serdeOpCopyDBClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_CopyDBClusterSnapshot.go b/service/docdb/api_op_CopyDBClusterSnapshot.go index 643fb40819f..406846e5253 100644 --- a/service/docdb/api_op_CopyDBClusterSnapshot.go +++ b/service/docdb/api_op_CopyDBClusterSnapshot.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CopyDBClusterSnapshot(ctx context.Context, params *CopyDBCluste addawsAwsquery_serdeOpCopyDBClusterSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_CreateDBCluster.go b/service/docdb/api_op_CreateDBCluster.go index f487e968b3c..0d2178dc9e9 100644 --- a/service/docdb/api_op_CreateDBCluster.go +++ b/service/docdb/api_op_CreateDBCluster.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDBCluster(ctx context.Context, params *CreateDBClusterInp addawsAwsquery_serdeOpCreateDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_CreateDBClusterParameterGroup.go b/service/docdb/api_op_CreateDBClusterParameterGroup.go index e182318ea5c..b39599493ae 100644 --- a/service/docdb/api_op_CreateDBClusterParameterGroup.go +++ b/service/docdb/api_op_CreateDBClusterParameterGroup.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) CreateDBClusterParameterGroup(ctx context.Context, params *Crea addawsAwsquery_serdeOpCreateDBClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_CreateDBClusterSnapshot.go b/service/docdb/api_op_CreateDBClusterSnapshot.go index ba1f26bfc92..63d64d04944 100644 --- a/service/docdb/api_op_CreateDBClusterSnapshot.go +++ b/service/docdb/api_op_CreateDBClusterSnapshot.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDBClusterSnapshot(ctx context.Context, params *CreateDBCl addawsAwsquery_serdeOpCreateDBClusterSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_CreateDBInstance.go b/service/docdb/api_op_CreateDBInstance.go index d77ee57c3f8..bd641648e8e 100644 --- a/service/docdb/api_op_CreateDBInstance.go +++ b/service/docdb/api_op_CreateDBInstance.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDBInstance(ctx context.Context, params *CreateDBInstanceI addawsAwsquery_serdeOpCreateDBInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_CreateDBSubnetGroup.go b/service/docdb/api_op_CreateDBSubnetGroup.go index 1e5900ea3bf..5a12e36375e 100644 --- a/service/docdb/api_op_CreateDBSubnetGroup.go +++ b/service/docdb/api_op_CreateDBSubnetGroup.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateDBSubnetGroup(ctx context.Context, params *CreateDBSubnet addawsAwsquery_serdeOpCreateDBSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DeleteDBCluster.go b/service/docdb/api_op_DeleteDBCluster.go index e10855296a2..3cadfb15ec0 100644 --- a/service/docdb/api_op_DeleteDBCluster.go +++ b/service/docdb/api_op_DeleteDBCluster.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DeleteDBCluster(ctx context.Context, params *DeleteDBClusterInp addawsAwsquery_serdeOpDeleteDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DeleteDBClusterParameterGroup.go b/service/docdb/api_op_DeleteDBClusterParameterGroup.go index daf6657cc1c..cfcd9e0bb6d 100644 --- a/service/docdb/api_op_DeleteDBClusterParameterGroup.go +++ b/service/docdb/api_op_DeleteDBClusterParameterGroup.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDBClusterParameterGroup(ctx context.Context, params *Dele addawsAwsquery_serdeOpDeleteDBClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DeleteDBClusterSnapshot.go b/service/docdb/api_op_DeleteDBClusterSnapshot.go index 8c360f5847d..959ef6bfcb1 100644 --- a/service/docdb/api_op_DeleteDBClusterSnapshot.go +++ b/service/docdb/api_op_DeleteDBClusterSnapshot.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DeleteDBClusterSnapshot(ctx context.Context, params *DeleteDBCl addawsAwsquery_serdeOpDeleteDBClusterSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DeleteDBInstance.go b/service/docdb/api_op_DeleteDBInstance.go index 7ee3ba81975..9ea6301848e 100644 --- a/service/docdb/api_op_DeleteDBInstance.go +++ b/service/docdb/api_op_DeleteDBInstance.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteDBInstance(ctx context.Context, params *DeleteDBInstanceI addawsAwsquery_serdeOpDeleteDBInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DeleteDBSubnetGroup.go b/service/docdb/api_op_DeleteDBSubnetGroup.go index 3dcf1ca1ad6..2a47b6899e1 100644 --- a/service/docdb/api_op_DeleteDBSubnetGroup.go +++ b/service/docdb/api_op_DeleteDBSubnetGroup.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDBSubnetGroup(ctx context.Context, params *DeleteDBSubnet addawsAwsquery_serdeOpDeleteDBSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DescribeCertificates.go b/service/docdb/api_op_DescribeCertificates.go index e6cfd6da181..f4d7adddceb 100644 --- a/service/docdb/api_op_DescribeCertificates.go +++ b/service/docdb/api_op_DescribeCertificates.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeCertificates(ctx context.Context, params *DescribeCerti addawsAwsquery_serdeOpDescribeCertificatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DescribeDBClusterParameterGroups.go b/service/docdb/api_op_DescribeDBClusterParameterGroups.go index dd47e2a7b6b..6b344345c11 100644 --- a/service/docdb/api_op_DescribeDBClusterParameterGroups.go +++ b/service/docdb/api_op_DescribeDBClusterParameterGroups.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeDBClusterParameterGroups(ctx context.Context, params *D addawsAwsquery_serdeOpDescribeDBClusterParameterGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DescribeDBClusterParameters.go b/service/docdb/api_op_DescribeDBClusterParameters.go index 4b77e590121..6bfb4ea5772 100644 --- a/service/docdb/api_op_DescribeDBClusterParameters.go +++ b/service/docdb/api_op_DescribeDBClusterParameters.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDBClusterParameters(ctx context.Context, params *Descri addawsAwsquery_serdeOpDescribeDBClusterParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DescribeDBClusterSnapshotAttributes.go b/service/docdb/api_op_DescribeDBClusterSnapshotAttributes.go index ad97f635f77..24fd722e86d 100644 --- a/service/docdb/api_op_DescribeDBClusterSnapshotAttributes.go +++ b/service/docdb/api_op_DescribeDBClusterSnapshotAttributes.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeDBClusterSnapshotAttributes(ctx context.Context, params addawsAwsquery_serdeOpDescribeDBClusterSnapshotAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DescribeDBClusterSnapshots.go b/service/docdb/api_op_DescribeDBClusterSnapshots.go index 33a8e91fbce..fb7b2728021 100644 --- a/service/docdb/api_op_DescribeDBClusterSnapshots.go +++ b/service/docdb/api_op_DescribeDBClusterSnapshots.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDBClusterSnapshots(ctx context.Context, params *Describ addawsAwsquery_serdeOpDescribeDBClusterSnapshotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DescribeDBClusters.go b/service/docdb/api_op_DescribeDBClusters.go index 7f40bf83b69..01c12b24341 100644 --- a/service/docdb/api_op_DescribeDBClusters.go +++ b/service/docdb/api_op_DescribeDBClusters.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeDBClusters(ctx context.Context, params *DescribeDBClust addawsAwsquery_serdeOpDescribeDBClustersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DescribeDBEngineVersions.go b/service/docdb/api_op_DescribeDBEngineVersions.go index 4c53e58513e..0bc9019daea 100644 --- a/service/docdb/api_op_DescribeDBEngineVersions.go +++ b/service/docdb/api_op_DescribeDBEngineVersions.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDBEngineVersions(ctx context.Context, params *DescribeD addawsAwsquery_serdeOpDescribeDBEngineVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DescribeDBInstances.go b/service/docdb/api_op_DescribeDBInstances.go index f99f556849b..4513fba6284 100644 --- a/service/docdb/api_op_DescribeDBInstances.go +++ b/service/docdb/api_op_DescribeDBInstances.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDBInstances(ctx context.Context, params *DescribeDBInst addawsAwsquery_serdeOpDescribeDBInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DescribeDBSubnetGroups.go b/service/docdb/api_op_DescribeDBSubnetGroups.go index ecc87b5d03b..5d00fb88db3 100644 --- a/service/docdb/api_op_DescribeDBSubnetGroups.go +++ b/service/docdb/api_op_DescribeDBSubnetGroups.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeDBSubnetGroups(ctx context.Context, params *DescribeDBS addawsAwsquery_serdeOpDescribeDBSubnetGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DescribeEngineDefaultClusterParameters.go b/service/docdb/api_op_DescribeEngineDefaultClusterParameters.go index acc0db6aed3..b436c07f144 100644 --- a/service/docdb/api_op_DescribeEngineDefaultClusterParameters.go +++ b/service/docdb/api_op_DescribeEngineDefaultClusterParameters.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEngineDefaultClusterParameters(ctx context.Context, par addawsAwsquery_serdeOpDescribeEngineDefaultClusterParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DescribeEventCategories.go b/service/docdb/api_op_DescribeEventCategories.go index 4e7600487b7..5e9bef436a0 100644 --- a/service/docdb/api_op_DescribeEventCategories.go +++ b/service/docdb/api_op_DescribeEventCategories.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEventCategories(ctx context.Context, params *DescribeEv addawsAwsquery_serdeOpDescribeEventCategoriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DescribeEvents.go b/service/docdb/api_op_DescribeEvents.go index eb595d949b2..ab1f70a4cc2 100644 --- a/service/docdb/api_op_DescribeEvents.go +++ b/service/docdb/api_op_DescribeEvents.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeEvents(ctx context.Context, params *DescribeEventsInput addawsAwsquery_serdeOpDescribeEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DescribeOrderableDBInstanceOptions.go b/service/docdb/api_op_DescribeOrderableDBInstanceOptions.go index a69636bda69..0e350cbd4a8 100644 --- a/service/docdb/api_op_DescribeOrderableDBInstanceOptions.go +++ b/service/docdb/api_op_DescribeOrderableDBInstanceOptions.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeOrderableDBInstanceOptions(ctx context.Context, params addawsAwsquery_serdeOpDescribeOrderableDBInstanceOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_DescribePendingMaintenanceActions.go b/service/docdb/api_op_DescribePendingMaintenanceActions.go index b4fa1ec8d89..25c49690342 100644 --- a/service/docdb/api_op_DescribePendingMaintenanceActions.go +++ b/service/docdb/api_op_DescribePendingMaintenanceActions.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribePendingMaintenanceActions(ctx context.Context, params * addawsAwsquery_serdeOpDescribePendingMaintenanceActionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_FailoverDBCluster.go b/service/docdb/api_op_FailoverDBCluster.go index a12a14dc134..e0fad149c86 100644 --- a/service/docdb/api_op_FailoverDBCluster.go +++ b/service/docdb/api_op_FailoverDBCluster.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) FailoverDBCluster(ctx context.Context, params *FailoverDBCluste addawsAwsquery_serdeOpFailoverDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_ListTagsForResource.go b/service/docdb/api_op_ListTagsForResource.go index 89e00f97c53..69b7b4c5495 100644 --- a/service/docdb/api_op_ListTagsForResource.go +++ b/service/docdb/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsquery_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_ModifyDBCluster.go b/service/docdb/api_op_ModifyDBCluster.go index 5dccec20233..6770e63c023 100644 --- a/service/docdb/api_op_ModifyDBCluster.go +++ b/service/docdb/api_op_ModifyDBCluster.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ModifyDBCluster(ctx context.Context, params *ModifyDBClusterInp addawsAwsquery_serdeOpModifyDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_ModifyDBClusterParameterGroup.go b/service/docdb/api_op_ModifyDBClusterParameterGroup.go index f22237c1237..17b1787979c 100644 --- a/service/docdb/api_op_ModifyDBClusterParameterGroup.go +++ b/service/docdb/api_op_ModifyDBClusterParameterGroup.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) ModifyDBClusterParameterGroup(ctx context.Context, params *Modi addawsAwsquery_serdeOpModifyDBClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_ModifyDBClusterSnapshotAttribute.go b/service/docdb/api_op_ModifyDBClusterSnapshotAttribute.go index 5fb505eb499..12705866134 100644 --- a/service/docdb/api_op_ModifyDBClusterSnapshotAttribute.go +++ b/service/docdb/api_op_ModifyDBClusterSnapshotAttribute.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) ModifyDBClusterSnapshotAttribute(ctx context.Context, params *M addawsAwsquery_serdeOpModifyDBClusterSnapshotAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_ModifyDBInstance.go b/service/docdb/api_op_ModifyDBInstance.go index 6465cb34050..94d2a8c15b5 100644 --- a/service/docdb/api_op_ModifyDBInstance.go +++ b/service/docdb/api_op_ModifyDBInstance.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ModifyDBInstance(ctx context.Context, params *ModifyDBInstanceI addawsAwsquery_serdeOpModifyDBInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_ModifyDBSubnetGroup.go b/service/docdb/api_op_ModifyDBSubnetGroup.go index 91e6a783645..9d99d9dfb78 100644 --- a/service/docdb/api_op_ModifyDBSubnetGroup.go +++ b/service/docdb/api_op_ModifyDBSubnetGroup.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ModifyDBSubnetGroup(ctx context.Context, params *ModifyDBSubnet addawsAwsquery_serdeOpModifyDBSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_RebootDBInstance.go b/service/docdb/api_op_RebootDBInstance.go index 484f6d6760f..726e8d1d971 100644 --- a/service/docdb/api_op_RebootDBInstance.go +++ b/service/docdb/api_op_RebootDBInstance.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) RebootDBInstance(ctx context.Context, params *RebootDBInstanceI addawsAwsquery_serdeOpRebootDBInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_RemoveTagsFromResource.go b/service/docdb/api_op_RemoveTagsFromResource.go index 297d356cb3c..12f7bb6e685 100644 --- a/service/docdb/api_op_RemoveTagsFromResource.go +++ b/service/docdb/api_op_RemoveTagsFromResource.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RemoveTagsFromResource(ctx context.Context, params *RemoveTagsF addawsAwsquery_serdeOpRemoveTagsFromResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_ResetDBClusterParameterGroup.go b/service/docdb/api_op_ResetDBClusterParameterGroup.go index fee92b0014f..5d6a3bad1a6 100644 --- a/service/docdb/api_op_ResetDBClusterParameterGroup.go +++ b/service/docdb/api_op_ResetDBClusterParameterGroup.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ResetDBClusterParameterGroup(ctx context.Context, params *Reset addawsAwsquery_serdeOpResetDBClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_RestoreDBClusterFromSnapshot.go b/service/docdb/api_op_RestoreDBClusterFromSnapshot.go index 5363545e7c6..9cc86fbe12f 100644 --- a/service/docdb/api_op_RestoreDBClusterFromSnapshot.go +++ b/service/docdb/api_op_RestoreDBClusterFromSnapshot.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) RestoreDBClusterFromSnapshot(ctx context.Context, params *Resto addawsAwsquery_serdeOpRestoreDBClusterFromSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_RestoreDBClusterToPointInTime.go b/service/docdb/api_op_RestoreDBClusterToPointInTime.go index ceae945478f..0fa345a4a9e 100644 --- a/service/docdb/api_op_RestoreDBClusterToPointInTime.go +++ b/service/docdb/api_op_RestoreDBClusterToPointInTime.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) RestoreDBClusterToPointInTime(ctx context.Context, params *Rest addawsAwsquery_serdeOpRestoreDBClusterToPointInTimeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_StartDBCluster.go b/service/docdb/api_op_StartDBCluster.go index ba08a37dd02..7876b6c5294 100644 --- a/service/docdb/api_op_StartDBCluster.go +++ b/service/docdb/api_op_StartDBCluster.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) StartDBCluster(ctx context.Context, params *StartDBClusterInput addawsAwsquery_serdeOpStartDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/api_op_StopDBCluster.go b/service/docdb/api_op_StopDBCluster.go index 0d0201f1b4a..48c5496d690 100644 --- a/service/docdb/api_op_StopDBCluster.go +++ b/service/docdb/api_op_StopDBCluster.go @@ -5,7 +5,6 @@ package docdb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/docdb/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) StopDBCluster(ctx context.Context, params *StopDBClusterInput, addawsAwsquery_serdeOpStopDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/docdb/endpoints.go b/service/docdb/endpoints.go index 7009d21d41e..1175469125f 100644 --- a/service/docdb/endpoints.go +++ b/service/docdb/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/dynamodb/api_client.go b/service/dynamodb/api_client.go index 2aa714cdc1d..09d0f055b25 100644 --- a/service/dynamodb/api_client.go +++ b/service/dynamodb/api_client.go @@ -109,42 +109,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetDisableValidateResponseChecksum() bool { - return o.DisableValidateResponseChecksum -} - -func (o Options) GetEnableAcceptEncodingGzip() bool { - return o.EnableAcceptEncodingGzip -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -217,6 +181,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/dynamodb/api_op_BatchGetItem.go b/service/dynamodb/api_op_BatchGetItem.go index c59c60c3fdd..9dfbed6787a 100644 --- a/service/dynamodb/api_op_BatchGetItem.go +++ b/service/dynamodb/api_op_BatchGetItem.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -62,9 +61,9 @@ func (c *Client) BatchGetItem(ctx context.Context, params *BatchGetItemInput, op addawsAwsjson10_serdeOpBatchGetItemMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_BatchWriteItem.go b/service/dynamodb/api_op_BatchWriteItem.go index 23b4d704ff0..4db18a090a1 100644 --- a/service/dynamodb/api_op_BatchWriteItem.go +++ b/service/dynamodb/api_op_BatchWriteItem.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -74,9 +73,9 @@ func (c *Client) BatchWriteItem(ctx context.Context, params *BatchWriteItemInput addawsAwsjson10_serdeOpBatchWriteItemMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_CreateBackup.go b/service/dynamodb/api_op_CreateBackup.go index 7df01169a3b..c2023f958a1 100644 --- a/service/dynamodb/api_op_CreateBackup.go +++ b/service/dynamodb/api_op_CreateBackup.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) CreateBackup(ctx context.Context, params *CreateBackupInput, op addawsAwsjson10_serdeOpCreateBackupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_CreateGlobalTable.go b/service/dynamodb/api_op_CreateGlobalTable.go index 643d499ffc4..94a1229bc3a 100644 --- a/service/dynamodb/api_op_CreateGlobalTable.go +++ b/service/dynamodb/api_op_CreateGlobalTable.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -68,9 +67,9 @@ func (c *Client) CreateGlobalTable(ctx context.Context, params *CreateGlobalTabl addawsAwsjson10_serdeOpCreateGlobalTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_CreateTable.go b/service/dynamodb/api_op_CreateTable.go index 4ce5ed31695..078c6458071 100644 --- a/service/dynamodb/api_op_CreateTable.go +++ b/service/dynamodb/api_op_CreateTable.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) CreateTable(ctx context.Context, params *CreateTableInput, optF addawsAwsjson10_serdeOpCreateTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_DeleteBackup.go b/service/dynamodb/api_op_DeleteBackup.go index ba23b29a1f8..b3948151b56 100644 --- a/service/dynamodb/api_op_DeleteBackup.go +++ b/service/dynamodb/api_op_DeleteBackup.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteBackup(ctx context.Context, params *DeleteBackupInput, op addawsAwsjson10_serdeOpDeleteBackupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_DeleteItem.go b/service/dynamodb/api_op_DeleteItem.go index 00beb23b61f..aa49b4931d2 100644 --- a/service/dynamodb/api_op_DeleteItem.go +++ b/service/dynamodb/api_op_DeleteItem.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DeleteItem(ctx context.Context, params *DeleteItemInput, optFns addawsAwsjson10_serdeOpDeleteItemMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_DeleteTable.go b/service/dynamodb/api_op_DeleteTable.go index 41521de2175..207ec9e3c9f 100644 --- a/service/dynamodb/api_op_DeleteTable.go +++ b/service/dynamodb/api_op_DeleteTable.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) DeleteTable(ctx context.Context, params *DeleteTableInput, optF addawsAwsjson10_serdeOpDeleteTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_DescribeBackup.go b/service/dynamodb/api_op_DescribeBackup.go index df4634ac81c..42c49e46421 100644 --- a/service/dynamodb/api_op_DescribeBackup.go +++ b/service/dynamodb/api_op_DescribeBackup.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeBackup(ctx context.Context, params *DescribeBackupInput addawsAwsjson10_serdeOpDescribeBackupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_DescribeContinuousBackups.go b/service/dynamodb/api_op_DescribeContinuousBackups.go index 5e9a9218d52..773a36ae806 100644 --- a/service/dynamodb/api_op_DescribeContinuousBackups.go +++ b/service/dynamodb/api_op_DescribeContinuousBackups.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DescribeContinuousBackups(ctx context.Context, params *Describe addawsAwsjson10_serdeOpDescribeContinuousBackupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_DescribeContributorInsights.go b/service/dynamodb/api_op_DescribeContributorInsights.go index f169cb29ef1..82aea197c03 100644 --- a/service/dynamodb/api_op_DescribeContributorInsights.go +++ b/service/dynamodb/api_op_DescribeContributorInsights.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeContributorInsights(ctx context.Context, params *Descri addawsAwsjson10_serdeOpDescribeContributorInsightsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_DescribeEndpoints.go b/service/dynamodb/api_op_DescribeEndpoints.go index 76fbf05f6d3..d6d7831b511 100644 --- a/service/dynamodb/api_op_DescribeEndpoints.go +++ b/service/dynamodb/api_op_DescribeEndpoints.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeEndpoints(ctx context.Context, params *DescribeEndpoint addawsAwsjson10_serdeOpDescribeEndpointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_DescribeGlobalTable.go b/service/dynamodb/api_op_DescribeGlobalTable.go index 16fc33457cc..b727009e0bf 100644 --- a/service/dynamodb/api_op_DescribeGlobalTable.go +++ b/service/dynamodb/api_op_DescribeGlobalTable.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DescribeGlobalTable(ctx context.Context, params *DescribeGlobal addawsAwsjson10_serdeOpDescribeGlobalTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_DescribeGlobalTableSettings.go b/service/dynamodb/api_op_DescribeGlobalTableSettings.go index 0a118118187..d5d3c794631 100644 --- a/service/dynamodb/api_op_DescribeGlobalTableSettings.go +++ b/service/dynamodb/api_op_DescribeGlobalTableSettings.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeGlobalTableSettings(ctx context.Context, params *Descri addawsAwsjson10_serdeOpDescribeGlobalTableSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_DescribeLimits.go b/service/dynamodb/api_op_DescribeLimits.go index 73b0ea62adc..f8422e5d8f2 100644 --- a/service/dynamodb/api_op_DescribeLimits.go +++ b/service/dynamodb/api_op_DescribeLimits.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -62,9 +61,9 @@ func (c *Client) DescribeLimits(ctx context.Context, params *DescribeLimitsInput addawsAwsjson10_serdeOpDescribeLimitsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_DescribeTable.go b/service/dynamodb/api_op_DescribeTable.go index 4fc849d29d7..cb44b0eb061 100644 --- a/service/dynamodb/api_op_DescribeTable.go +++ b/service/dynamodb/api_op_DescribeTable.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeTable(ctx context.Context, params *DescribeTableInput, addawsAwsjson10_serdeOpDescribeTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_DescribeTableReplicaAutoScaling.go b/service/dynamodb/api_op_DescribeTableReplicaAutoScaling.go index feeefe9330b..eb1c3ae22f1 100644 --- a/service/dynamodb/api_op_DescribeTableReplicaAutoScaling.go +++ b/service/dynamodb/api_op_DescribeTableReplicaAutoScaling.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeTableReplicaAutoScaling(ctx context.Context, params *De addawsAwsjson10_serdeOpDescribeTableReplicaAutoScalingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_DescribeTimeToLive.go b/service/dynamodb/api_op_DescribeTimeToLive.go index 53828e10aa6..462ea7c2c80 100644 --- a/service/dynamodb/api_op_DescribeTimeToLive.go +++ b/service/dynamodb/api_op_DescribeTimeToLive.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeTimeToLive(ctx context.Context, params *DescribeTimeToL addawsAwsjson10_serdeOpDescribeTimeToLiveMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_GetItem.go b/service/dynamodb/api_op_GetItem.go index 9931071580c..b40d344639d 100644 --- a/service/dynamodb/api_op_GetItem.go +++ b/service/dynamodb/api_op_GetItem.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetItem(ctx context.Context, params *GetItemInput, optFns ...fu addawsAwsjson10_serdeOpGetItemMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_ListBackups.go b/service/dynamodb/api_op_ListBackups.go index 5c56098b19b..8dfc35ddcbd 100644 --- a/service/dynamodb/api_op_ListBackups.go +++ b/service/dynamodb/api_op_ListBackups.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListBackups(ctx context.Context, params *ListBackupsInput, optF addawsAwsjson10_serdeOpListBackupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_ListContributorInsights.go b/service/dynamodb/api_op_ListContributorInsights.go index 39d99e9867e..ae6b8ff6c6b 100644 --- a/service/dynamodb/api_op_ListContributorInsights.go +++ b/service/dynamodb/api_op_ListContributorInsights.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListContributorInsights(ctx context.Context, params *ListContri addawsAwsjson10_serdeOpListContributorInsightsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_ListGlobalTables.go b/service/dynamodb/api_op_ListGlobalTables.go index 5247734cb8c..cde29037913 100644 --- a/service/dynamodb/api_op_ListGlobalTables.go +++ b/service/dynamodb/api_op_ListGlobalTables.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListGlobalTables(ctx context.Context, params *ListGlobalTablesI addawsAwsjson10_serdeOpListGlobalTablesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_ListTables.go b/service/dynamodb/api_op_ListTables.go index ef616946fa2..f24f18ba500 100644 --- a/service/dynamodb/api_op_ListTables.go +++ b/service/dynamodb/api_op_ListTables.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ListTables(ctx context.Context, params *ListTablesInput, optFns addawsAwsjson10_serdeOpListTablesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_ListTagsOfResource.go b/service/dynamodb/api_op_ListTagsOfResource.go index 39b5e697f4f..78ae4ea5596 100644 --- a/service/dynamodb/api_op_ListTagsOfResource.go +++ b/service/dynamodb/api_op_ListTagsOfResource.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListTagsOfResource(ctx context.Context, params *ListTagsOfResou addawsAwsjson10_serdeOpListTagsOfResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_PutItem.go b/service/dynamodb/api_op_PutItem.go index 31f2b25380d..870dc567e63 100644 --- a/service/dynamodb/api_op_PutItem.go +++ b/service/dynamodb/api_op_PutItem.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -82,9 +81,9 @@ func (c *Client) PutItem(ctx context.Context, params *PutItemInput, optFns ...fu addawsAwsjson10_serdeOpPutItemMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_Query.go b/service/dynamodb/api_op_Query.go index 6d5eea35dc7..5861754e9d5 100644 --- a/service/dynamodb/api_op_Query.go +++ b/service/dynamodb/api_op_Query.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -59,9 +58,9 @@ func (c *Client) Query(ctx context.Context, params *QueryInput, optFns ...func(* addawsAwsjson10_serdeOpQueryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_RestoreTableFromBackup.go b/service/dynamodb/api_op_RestoreTableFromBackup.go index ccc86314894..2e323361937 100644 --- a/service/dynamodb/api_op_RestoreTableFromBackup.go +++ b/service/dynamodb/api_op_RestoreTableFromBackup.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) RestoreTableFromBackup(ctx context.Context, params *RestoreTabl addawsAwsjson10_serdeOpRestoreTableFromBackupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_RestoreTableToPointInTime.go b/service/dynamodb/api_op_RestoreTableToPointInTime.go index cc1adc31136..d5a47f6f4ee 100644 --- a/service/dynamodb/api_op_RestoreTableToPointInTime.go +++ b/service/dynamodb/api_op_RestoreTableToPointInTime.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -49,9 +48,9 @@ func (c *Client) RestoreTableToPointInTime(ctx context.Context, params *RestoreT addawsAwsjson10_serdeOpRestoreTableToPointInTimeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_Scan.go b/service/dynamodb/api_op_Scan.go index c78f8f31d09..b78753ea536 100644 --- a/service/dynamodb/api_op_Scan.go +++ b/service/dynamodb/api_op_Scan.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) Scan(ctx context.Context, params *ScanInput, optFns ...func(*Op addawsAwsjson10_serdeOpScanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_TagResource.go b/service/dynamodb/api_op_TagResource.go index 4d5997f1640..e92e8981ee1 100644 --- a/service/dynamodb/api_op_TagResource.go +++ b/service/dynamodb/api_op_TagResource.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson10_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_TransactGetItems.go b/service/dynamodb/api_op_TransactGetItems.go index a6f48debfa4..83c1c9f3f95 100644 --- a/service/dynamodb/api_op_TransactGetItems.go +++ b/service/dynamodb/api_op_TransactGetItems.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) TransactGetItems(ctx context.Context, params *TransactGetItemsI addawsAwsjson10_serdeOpTransactGetItemsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_TransactWriteItems.go b/service/dynamodb/api_op_TransactWriteItems.go index 3fd4b5c445c..b0825e335fb 100644 --- a/service/dynamodb/api_op_TransactWriteItems.go +++ b/service/dynamodb/api_op_TransactWriteItems.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -63,9 +62,9 @@ func (c *Client) TransactWriteItems(ctx context.Context, params *TransactWriteIt addawsAwsjson10_serdeOpTransactWriteItemsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_UntagResource.go b/service/dynamodb/api_op_UntagResource.go index dbe3a34312f..801e6e5de66 100644 --- a/service/dynamodb/api_op_UntagResource.go +++ b/service/dynamodb/api_op_UntagResource.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson10_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_UpdateContinuousBackups.go b/service/dynamodb/api_op_UpdateContinuousBackups.go index ba71b2ba7c7..7cd69b120af 100644 --- a/service/dynamodb/api_op_UpdateContinuousBackups.go +++ b/service/dynamodb/api_op_UpdateContinuousBackups.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) UpdateContinuousBackups(ctx context.Context, params *UpdateCont addawsAwsjson10_serdeOpUpdateContinuousBackupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_UpdateContributorInsights.go b/service/dynamodb/api_op_UpdateContributorInsights.go index ee36da107a8..e8ec6df8a04 100644 --- a/service/dynamodb/api_op_UpdateContributorInsights.go +++ b/service/dynamodb/api_op_UpdateContributorInsights.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateContributorInsights(ctx context.Context, params *UpdateCo addawsAwsjson10_serdeOpUpdateContributorInsightsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_UpdateGlobalTable.go b/service/dynamodb/api_op_UpdateGlobalTable.go index e480d9a8152..738400dcba2 100644 --- a/service/dynamodb/api_op_UpdateGlobalTable.go +++ b/service/dynamodb/api_op_UpdateGlobalTable.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) UpdateGlobalTable(ctx context.Context, params *UpdateGlobalTabl addawsAwsjson10_serdeOpUpdateGlobalTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_UpdateGlobalTableSettings.go b/service/dynamodb/api_op_UpdateGlobalTableSettings.go index f97f455bbd4..721f75f8e34 100644 --- a/service/dynamodb/api_op_UpdateGlobalTableSettings.go +++ b/service/dynamodb/api_op_UpdateGlobalTableSettings.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateGlobalTableSettings(ctx context.Context, params *UpdateGl addawsAwsjson10_serdeOpUpdateGlobalTableSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_UpdateItem.go b/service/dynamodb/api_op_UpdateItem.go index 32c716981bb..cc5beaac1e3 100644 --- a/service/dynamodb/api_op_UpdateItem.go +++ b/service/dynamodb/api_op_UpdateItem.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) UpdateItem(ctx context.Context, params *UpdateItemInput, optFns addawsAwsjson10_serdeOpUpdateItemMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_UpdateTable.go b/service/dynamodb/api_op_UpdateTable.go index c72d480345a..f3cd8bfe985 100644 --- a/service/dynamodb/api_op_UpdateTable.go +++ b/service/dynamodb/api_op_UpdateTable.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) UpdateTable(ctx context.Context, params *UpdateTableInput, optF addawsAwsjson10_serdeOpUpdateTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_UpdateTableReplicaAutoScaling.go b/service/dynamodb/api_op_UpdateTableReplicaAutoScaling.go index 8ced8219cba..90285c5177d 100644 --- a/service/dynamodb/api_op_UpdateTableReplicaAutoScaling.go +++ b/service/dynamodb/api_op_UpdateTableReplicaAutoScaling.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateTableReplicaAutoScaling(ctx context.Context, params *Upda addawsAwsjson10_serdeOpUpdateTableReplicaAutoScalingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/api_op_UpdateTimeToLive.go b/service/dynamodb/api_op_UpdateTimeToLive.go index 66702b91521..24314939752 100644 --- a/service/dynamodb/api_op_UpdateTimeToLive.go +++ b/service/dynamodb/api_op_UpdateTimeToLive.go @@ -5,7 +5,6 @@ package dynamodb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) UpdateTimeToLive(ctx context.Context, params *UpdateTimeToLiveI addawsAwsjson10_serdeOpUpdateTimeToLiveMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodb/endpoints.go b/service/dynamodb/endpoints.go index 74291b07897..473b8b4cedd 100644 --- a/service/dynamodb/endpoints.go +++ b/service/dynamodb/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/dynamodbstreams/api_client.go b/service/dynamodbstreams/api_client.go index 8a9689ac23a..c780cb7d17d 100644 --- a/service/dynamodbstreams/api_client.go +++ b/service/dynamodbstreams/api_client.go @@ -82,30 +82,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -171,6 +147,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/dynamodbstreams/api_op_DescribeStream.go b/service/dynamodbstreams/api_op_DescribeStream.go index b092a7ab2f5..16c12ec5cc6 100644 --- a/service/dynamodbstreams/api_op_DescribeStream.go +++ b/service/dynamodbstreams/api_op_DescribeStream.go @@ -5,7 +5,6 @@ package dynamodbstreams import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodbstreams/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DescribeStream(ctx context.Context, params *DescribeStreamInput addawsAwsjson10_serdeOpDescribeStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodbstreams/api_op_GetRecords.go b/service/dynamodbstreams/api_op_GetRecords.go index aa00cce5a0e..d7ba59953e0 100644 --- a/service/dynamodbstreams/api_op_GetRecords.go +++ b/service/dynamodbstreams/api_op_GetRecords.go @@ -5,7 +5,6 @@ package dynamodbstreams import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodbstreams/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetRecords(ctx context.Context, params *GetRecordsInput, optFns addawsAwsjson10_serdeOpGetRecordsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodbstreams/api_op_GetShardIterator.go b/service/dynamodbstreams/api_op_GetShardIterator.go index 3a4375333b6..77b4a3aad90 100644 --- a/service/dynamodbstreams/api_op_GetShardIterator.go +++ b/service/dynamodbstreams/api_op_GetShardIterator.go @@ -5,7 +5,6 @@ package dynamodbstreams import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodbstreams/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetShardIterator(ctx context.Context, params *GetShardIteratorI addawsAwsjson10_serdeOpGetShardIteratorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodbstreams/api_op_ListStreams.go b/service/dynamodbstreams/api_op_ListStreams.go index 927d6a01ccf..e909c9e806c 100644 --- a/service/dynamodbstreams/api_op_ListStreams.go +++ b/service/dynamodbstreams/api_op_ListStreams.go @@ -5,7 +5,6 @@ package dynamodbstreams import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/dynamodbstreams/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListStreams(ctx context.Context, params *ListStreamsInput, optF addawsAwsjson10_serdeOpListStreamsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/dynamodbstreams/endpoints.go b/service/dynamodbstreams/endpoints.go index f16227dbd83..fb9e729fde8 100644 --- a/service/dynamodbstreams/endpoints.go +++ b/service/dynamodbstreams/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/ebs/api_client.go b/service/ebs/api_client.go index ee6c557dd16..1b3920e9cbc 100644 --- a/service/ebs/api_client.go +++ b/service/ebs/api_client.go @@ -103,34 +103,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -203,6 +175,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/ebs/api_op_CompleteSnapshot.go b/service/ebs/api_op_CompleteSnapshot.go index 56c177ed817..799d48b1e50 100644 --- a/service/ebs/api_op_CompleteSnapshot.go +++ b/service/ebs/api_op_CompleteSnapshot.go @@ -5,7 +5,6 @@ package ebs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ebs/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CompleteSnapshot(ctx context.Context, params *CompleteSnapshotI addawsRestjson1_serdeOpCompleteSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ebs/api_op_GetSnapshotBlock.go b/service/ebs/api_op_GetSnapshotBlock.go index 095cf6443d0..2cfc200ee8e 100644 --- a/service/ebs/api_op_GetSnapshotBlock.go +++ b/service/ebs/api_op_GetSnapshotBlock.go @@ -5,7 +5,6 @@ package ebs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ebs/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetSnapshotBlock(ctx context.Context, params *GetSnapshotBlockI addawsRestjson1_serdeOpGetSnapshotBlockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ebs/api_op_ListChangedBlocks.go b/service/ebs/api_op_ListChangedBlocks.go index 24cc2fb7e1f..9fc769f6daf 100644 --- a/service/ebs/api_op_ListChangedBlocks.go +++ b/service/ebs/api_op_ListChangedBlocks.go @@ -5,7 +5,6 @@ package ebs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ebs/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListChangedBlocks(ctx context.Context, params *ListChangedBlock addawsRestjson1_serdeOpListChangedBlocksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ebs/api_op_ListSnapshotBlocks.go b/service/ebs/api_op_ListSnapshotBlocks.go index b87fe657cfb..6eddb7f9bf7 100644 --- a/service/ebs/api_op_ListSnapshotBlocks.go +++ b/service/ebs/api_op_ListSnapshotBlocks.go @@ -5,7 +5,6 @@ package ebs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ebs/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListSnapshotBlocks(ctx context.Context, params *ListSnapshotBlo addawsRestjson1_serdeOpListSnapshotBlocksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ebs/api_op_PutSnapshotBlock.go b/service/ebs/api_op_PutSnapshotBlock.go index 5b37d4e2bae..7a84d80cd30 100644 --- a/service/ebs/api_op_PutSnapshotBlock.go +++ b/service/ebs/api_op_PutSnapshotBlock.go @@ -5,7 +5,6 @@ package ebs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ebs/types" smithy "github.com/awslabs/smithy-go" @@ -27,10 +26,10 @@ func (c *Client) PutSnapshotBlock(ctx context.Context, params *PutSnapshotBlockI addawsRestjson1_serdeOpPutSnapshotBlockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddUnsignedPayloadMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ebs/api_op_StartSnapshot.go b/service/ebs/api_op_StartSnapshot.go index dd40ab182b7..0a835e3872b 100644 --- a/service/ebs/api_op_StartSnapshot.go +++ b/service/ebs/api_op_StartSnapshot.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ebs/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) StartSnapshot(ctx context.Context, params *StartSnapshotInput, addawsRestjson1_serdeOpStartSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ebs/endpoints.go b/service/ebs/endpoints.go index a54a83c76e0..0d5ee04f055 100644 --- a/service/ebs/endpoints.go +++ b/service/ebs/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/ec2/api_client.go b/service/ec2/api_client.go index 93cc00c0b3e..5f2d6be1782 100644 --- a/service/ec2/api_client.go +++ b/service/ec2/api_client.go @@ -104,34 +104,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -204,6 +176,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/ec2/api_op_AcceptReservedInstancesExchangeQuote.go b/service/ec2/api_op_AcceptReservedInstancesExchangeQuote.go index ee4407b1246..a54d81eb61e 100644 --- a/service/ec2/api_op_AcceptReservedInstancesExchangeQuote.go +++ b/service/ec2/api_op_AcceptReservedInstancesExchangeQuote.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AcceptReservedInstancesExchangeQuote(ctx context.Context, param addawsEc2query_serdeOpAcceptReservedInstancesExchangeQuoteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AcceptTransitGatewayPeeringAttachment.go b/service/ec2/api_op_AcceptTransitGatewayPeeringAttachment.go index afe099436b1..5cca9ae0af5 100644 --- a/service/ec2/api_op_AcceptTransitGatewayPeeringAttachment.go +++ b/service/ec2/api_op_AcceptTransitGatewayPeeringAttachment.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AcceptTransitGatewayPeeringAttachment(ctx context.Context, para addawsEc2query_serdeOpAcceptTransitGatewayPeeringAttachmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AcceptTransitGatewayVpcAttachment.go b/service/ec2/api_op_AcceptTransitGatewayVpcAttachment.go index e369d053488..961e3376f2f 100644 --- a/service/ec2/api_op_AcceptTransitGatewayVpcAttachment.go +++ b/service/ec2/api_op_AcceptTransitGatewayVpcAttachment.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) AcceptTransitGatewayVpcAttachment(ctx context.Context, params * addawsEc2query_serdeOpAcceptTransitGatewayVpcAttachmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AcceptVpcEndpointConnections.go b/service/ec2/api_op_AcceptVpcEndpointConnections.go index 3330fd701f7..3eb716bb7e3 100644 --- a/service/ec2/api_op_AcceptVpcEndpointConnections.go +++ b/service/ec2/api_op_AcceptVpcEndpointConnections.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AcceptVpcEndpointConnections(ctx context.Context, params *Accep addawsEc2query_serdeOpAcceptVpcEndpointConnectionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AcceptVpcPeeringConnection.go b/service/ec2/api_op_AcceptVpcPeeringConnection.go index be267f79307..ba5f59f3d23 100644 --- a/service/ec2/api_op_AcceptVpcPeeringConnection.go +++ b/service/ec2/api_op_AcceptVpcPeeringConnection.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) AcceptVpcPeeringConnection(ctx context.Context, params *AcceptV addawsEc2query_serdeOpAcceptVpcPeeringConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AdvertiseByoipCidr.go b/service/ec2/api_op_AdvertiseByoipCidr.go index a2884fcbb9f..d9e21603e33 100644 --- a/service/ec2/api_op_AdvertiseByoipCidr.go +++ b/service/ec2/api_op_AdvertiseByoipCidr.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) AdvertiseByoipCidr(ctx context.Context, params *AdvertiseByoipC addawsEc2query_serdeOpAdvertiseByoipCidrMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AllocateAddress.go b/service/ec2/api_op_AllocateAddress.go index a1c07fa8b19..13990be89cc 100644 --- a/service/ec2/api_op_AllocateAddress.go +++ b/service/ec2/api_op_AllocateAddress.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) AllocateAddress(ctx context.Context, params *AllocateAddressInp addawsEc2query_serdeOpAllocateAddressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AllocateHosts.go b/service/ec2/api_op_AllocateHosts.go index 4d1a7d2116d..c0615f32f5d 100644 --- a/service/ec2/api_op_AllocateHosts.go +++ b/service/ec2/api_op_AllocateHosts.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) AllocateHosts(ctx context.Context, params *AllocateHostsInput, addawsEc2query_serdeOpAllocateHostsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ApplySecurityGroupsToClientVpnTargetNetwork.go b/service/ec2/api_op_ApplySecurityGroupsToClientVpnTargetNetwork.go index 1d651a309aa..ea8a3c88ddb 100644 --- a/service/ec2/api_op_ApplySecurityGroupsToClientVpnTargetNetwork.go +++ b/service/ec2/api_op_ApplySecurityGroupsToClientVpnTargetNetwork.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ApplySecurityGroupsToClientVpnTargetNetwork(ctx context.Context addawsEc2query_serdeOpApplySecurityGroupsToClientVpnTargetNetworkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AssignIpv6Addresses.go b/service/ec2/api_op_AssignIpv6Addresses.go index 507ba52ad54..158c929250a 100644 --- a/service/ec2/api_op_AssignIpv6Addresses.go +++ b/service/ec2/api_op_AssignIpv6Addresses.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) AssignIpv6Addresses(ctx context.Context, params *AssignIpv6Addr addawsEc2query_serdeOpAssignIpv6AddressesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AssignPrivateIpAddresses.go b/service/ec2/api_op_AssignPrivateIpAddresses.go index e260afd8f13..d026d649c75 100644 --- a/service/ec2/api_op_AssignPrivateIpAddresses.go +++ b/service/ec2/api_op_AssignPrivateIpAddresses.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) AssignPrivateIpAddresses(ctx context.Context, params *AssignPri addawsEc2query_serdeOpAssignPrivateIpAddressesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AssociateAddress.go b/service/ec2/api_op_AssociateAddress.go index bdf5de8b326..9299f6fa6ca 100644 --- a/service/ec2/api_op_AssociateAddress.go +++ b/service/ec2/api_op_AssociateAddress.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -43,9 +42,9 @@ func (c *Client) AssociateAddress(ctx context.Context, params *AssociateAddressI addawsEc2query_serdeOpAssociateAddressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AssociateClientVpnTargetNetwork.go b/service/ec2/api_op_AssociateClientVpnTargetNetwork.go index b40fb5ee82f..1ddbc5b47b3 100644 --- a/service/ec2/api_op_AssociateClientVpnTargetNetwork.go +++ b/service/ec2/api_op_AssociateClientVpnTargetNetwork.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) AssociateClientVpnTargetNetwork(ctx context.Context, params *As addawsEc2query_serdeOpAssociateClientVpnTargetNetworkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AssociateDhcpOptions.go b/service/ec2/api_op_AssociateDhcpOptions.go index 4e917e281aa..37d29389eef 100644 --- a/service/ec2/api_op_AssociateDhcpOptions.go +++ b/service/ec2/api_op_AssociateDhcpOptions.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) AssociateDhcpOptions(ctx context.Context, params *AssociateDhcp addawsEc2query_serdeOpAssociateDhcpOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AssociateIamInstanceProfile.go b/service/ec2/api_op_AssociateIamInstanceProfile.go index e8efacc9fc0..ae7f31e2228 100644 --- a/service/ec2/api_op_AssociateIamInstanceProfile.go +++ b/service/ec2/api_op_AssociateIamInstanceProfile.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AssociateIamInstanceProfile(ctx context.Context, params *Associ addawsEc2query_serdeOpAssociateIamInstanceProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AssociateRouteTable.go b/service/ec2/api_op_AssociateRouteTable.go index 9ff923baad3..99db6aa717f 100644 --- a/service/ec2/api_op_AssociateRouteTable.go +++ b/service/ec2/api_op_AssociateRouteTable.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) AssociateRouteTable(ctx context.Context, params *AssociateRoute addawsEc2query_serdeOpAssociateRouteTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AssociateSubnetCidrBlock.go b/service/ec2/api_op_AssociateSubnetCidrBlock.go index b0a6413fbbd..eb06788e8ae 100644 --- a/service/ec2/api_op_AssociateSubnetCidrBlock.go +++ b/service/ec2/api_op_AssociateSubnetCidrBlock.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) AssociateSubnetCidrBlock(ctx context.Context, params *Associate addawsEc2query_serdeOpAssociateSubnetCidrBlockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AssociateTransitGatewayMulticastDomain.go b/service/ec2/api_op_AssociateTransitGatewayMulticastDomain.go index 537af809983..7c58fa27f9f 100644 --- a/service/ec2/api_op_AssociateTransitGatewayMulticastDomain.go +++ b/service/ec2/api_op_AssociateTransitGatewayMulticastDomain.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) AssociateTransitGatewayMulticastDomain(ctx context.Context, par addawsEc2query_serdeOpAssociateTransitGatewayMulticastDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AssociateTransitGatewayRouteTable.go b/service/ec2/api_op_AssociateTransitGatewayRouteTable.go index 7ec0379ef0c..69d3d161450 100644 --- a/service/ec2/api_op_AssociateTransitGatewayRouteTable.go +++ b/service/ec2/api_op_AssociateTransitGatewayRouteTable.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AssociateTransitGatewayRouteTable(ctx context.Context, params * addawsEc2query_serdeOpAssociateTransitGatewayRouteTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AssociateVpcCidrBlock.go b/service/ec2/api_op_AssociateVpcCidrBlock.go index a0b90b99108..6487a696b26 100644 --- a/service/ec2/api_op_AssociateVpcCidrBlock.go +++ b/service/ec2/api_op_AssociateVpcCidrBlock.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) AssociateVpcCidrBlock(ctx context.Context, params *AssociateVpc addawsEc2query_serdeOpAssociateVpcCidrBlockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AttachClassicLinkVpc.go b/service/ec2/api_op_AttachClassicLinkVpc.go index db9da6a5dcb..0a26777e7d8 100644 --- a/service/ec2/api_op_AttachClassicLinkVpc.go +++ b/service/ec2/api_op_AttachClassicLinkVpc.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) AttachClassicLinkVpc(ctx context.Context, params *AttachClassic addawsEc2query_serdeOpAttachClassicLinkVpcMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AttachInternetGateway.go b/service/ec2/api_op_AttachInternetGateway.go index 9cb5f467a1c..fc0e9e56aa5 100644 --- a/service/ec2/api_op_AttachInternetGateway.go +++ b/service/ec2/api_op_AttachInternetGateway.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) AttachInternetGateway(ctx context.Context, params *AttachIntern addawsEc2query_serdeOpAttachInternetGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AttachNetworkInterface.go b/service/ec2/api_op_AttachNetworkInterface.go index 4ba02ccf0a3..3730f67beeb 100644 --- a/service/ec2/api_op_AttachNetworkInterface.go +++ b/service/ec2/api_op_AttachNetworkInterface.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AttachNetworkInterface(ctx context.Context, params *AttachNetwo addawsEc2query_serdeOpAttachNetworkInterfaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AttachVolume.go b/service/ec2/api_op_AttachVolume.go index 11445fb2779..e1b2b9aa17f 100644 --- a/service/ec2/api_op_AttachVolume.go +++ b/service/ec2/api_op_AttachVolume.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -50,9 +49,9 @@ func (c *Client) AttachVolume(ctx context.Context, params *AttachVolumeInput, op addawsEc2query_serdeOpAttachVolumeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AttachVpnGateway.go b/service/ec2/api_op_AttachVpnGateway.go index 87a072d3af9..8d5202983d6 100644 --- a/service/ec2/api_op_AttachVpnGateway.go +++ b/service/ec2/api_op_AttachVpnGateway.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) AttachVpnGateway(ctx context.Context, params *AttachVpnGatewayI addawsEc2query_serdeOpAttachVpnGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AuthorizeClientVpnIngress.go b/service/ec2/api_op_AuthorizeClientVpnIngress.go index 4ba98278bcc..a67c7257208 100644 --- a/service/ec2/api_op_AuthorizeClientVpnIngress.go +++ b/service/ec2/api_op_AuthorizeClientVpnIngress.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) AuthorizeClientVpnIngress(ctx context.Context, params *Authoriz addawsEc2query_serdeOpAuthorizeClientVpnIngressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AuthorizeSecurityGroupEgress.go b/service/ec2/api_op_AuthorizeSecurityGroupEgress.go index 58aeae5e5da..32716ac86e4 100644 --- a/service/ec2/api_op_AuthorizeSecurityGroupEgress.go +++ b/service/ec2/api_op_AuthorizeSecurityGroupEgress.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) AuthorizeSecurityGroupEgress(ctx context.Context, params *Autho addawsEc2query_serdeOpAuthorizeSecurityGroupEgressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_AuthorizeSecurityGroupIngress.go b/service/ec2/api_op_AuthorizeSecurityGroupIngress.go index 120ee0f348a..19cd84ccd4e 100644 --- a/service/ec2/api_op_AuthorizeSecurityGroupIngress.go +++ b/service/ec2/api_op_AuthorizeSecurityGroupIngress.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) AuthorizeSecurityGroupIngress(ctx context.Context, params *Auth addawsEc2query_serdeOpAuthorizeSecurityGroupIngressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_BundleInstance.go b/service/ec2/api_op_BundleInstance.go index 114e284fed9..f9a19ccba09 100644 --- a/service/ec2/api_op_BundleInstance.go +++ b/service/ec2/api_op_BundleInstance.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) BundleInstance(ctx context.Context, params *BundleInstanceInput addawsEc2query_serdeOpBundleInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CancelBundleTask.go b/service/ec2/api_op_CancelBundleTask.go index b48e7179d97..c3aa77c204b 100644 --- a/service/ec2/api_op_CancelBundleTask.go +++ b/service/ec2/api_op_CancelBundleTask.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CancelBundleTask(ctx context.Context, params *CancelBundleTaskI addawsEc2query_serdeOpCancelBundleTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CancelCapacityReservation.go b/service/ec2/api_op_CancelCapacityReservation.go index e4e93f29c22..950939223e2 100644 --- a/service/ec2/api_op_CancelCapacityReservation.go +++ b/service/ec2/api_op_CancelCapacityReservation.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) CancelCapacityReservation(ctx context.Context, params *CancelCa addawsEc2query_serdeOpCancelCapacityReservationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CancelConversionTask.go b/service/ec2/api_op_CancelConversionTask.go index 4c6ac3c6f72..7aa7509481f 100644 --- a/service/ec2/api_op_CancelConversionTask.go +++ b/service/ec2/api_op_CancelConversionTask.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) CancelConversionTask(ctx context.Context, params *CancelConvers addawsEc2query_serdeOpCancelConversionTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CancelExportTask.go b/service/ec2/api_op_CancelExportTask.go index c243410d10b..c673d529c01 100644 --- a/service/ec2/api_op_CancelExportTask.go +++ b/service/ec2/api_op_CancelExportTask.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) CancelExportTask(ctx context.Context, params *CancelExportTaskI addawsEc2query_serdeOpCancelExportTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CancelImportTask.go b/service/ec2/api_op_CancelImportTask.go index 08f618cd669..dbf9e8184b6 100644 --- a/service/ec2/api_op_CancelImportTask.go +++ b/service/ec2/api_op_CancelImportTask.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CancelImportTask(ctx context.Context, params *CancelImportTaskI addawsEc2query_serdeOpCancelImportTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CancelReservedInstancesListing.go b/service/ec2/api_op_CancelReservedInstancesListing.go index 9ef955f283f..d09527798e3 100644 --- a/service/ec2/api_op_CancelReservedInstancesListing.go +++ b/service/ec2/api_op_CancelReservedInstancesListing.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CancelReservedInstancesListing(ctx context.Context, params *Can addawsEc2query_serdeOpCancelReservedInstancesListingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CancelSpotFleetRequests.go b/service/ec2/api_op_CancelSpotFleetRequests.go index f4d046993e9..82135e63e59 100644 --- a/service/ec2/api_op_CancelSpotFleetRequests.go +++ b/service/ec2/api_op_CancelSpotFleetRequests.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CancelSpotFleetRequests(ctx context.Context, params *CancelSpot addawsEc2query_serdeOpCancelSpotFleetRequestsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CancelSpotInstanceRequests.go b/service/ec2/api_op_CancelSpotInstanceRequests.go index b7bb1931e01..828aadad9c3 100644 --- a/service/ec2/api_op_CancelSpotInstanceRequests.go +++ b/service/ec2/api_op_CancelSpotInstanceRequests.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CancelSpotInstanceRequests(ctx context.Context, params *CancelS addawsEc2query_serdeOpCancelSpotInstanceRequestsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ConfirmProductInstance.go b/service/ec2/api_op_ConfirmProductInstance.go index 39108c2b08b..1b25064940d 100644 --- a/service/ec2/api_op_ConfirmProductInstance.go +++ b/service/ec2/api_op_ConfirmProductInstance.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ConfirmProductInstance(ctx context.Context, params *ConfirmProd addawsEc2query_serdeOpConfirmProductInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CopyFpgaImage.go b/service/ec2/api_op_CopyFpgaImage.go index aa18ed35fcd..dc94821d985 100644 --- a/service/ec2/api_op_CopyFpgaImage.go +++ b/service/ec2/api_op_CopyFpgaImage.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CopyFpgaImage(ctx context.Context, params *CopyFpgaImageInput, addawsEc2query_serdeOpCopyFpgaImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CopyImage.go b/service/ec2/api_op_CopyImage.go index 46de979ccd1..aecf5cadc90 100644 --- a/service/ec2/api_op_CopyImage.go +++ b/service/ec2/api_op_CopyImage.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) CopyImage(ctx context.Context, params *CopyImageInput, optFns . addawsEc2query_serdeOpCopyImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CopySnapshot.go b/service/ec2/api_op_CopySnapshot.go index c9d554154fb..d1f9bfa2171 100644 --- a/service/ec2/api_op_CopySnapshot.go +++ b/service/ec2/api_op_CopySnapshot.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) CopySnapshot(ctx context.Context, params *CopySnapshotInput, op addawsEc2query_serdeOpCopySnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateCapacityReservation.go b/service/ec2/api_op_CreateCapacityReservation.go index 8b7944a2b85..773812e58ae 100644 --- a/service/ec2/api_op_CreateCapacityReservation.go +++ b/service/ec2/api_op_CreateCapacityReservation.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) CreateCapacityReservation(ctx context.Context, params *CreateCa addawsEc2query_serdeOpCreateCapacityReservationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateClientVpnEndpoint.go b/service/ec2/api_op_CreateClientVpnEndpoint.go index f3075cc8d95..2929ba1c709 100644 --- a/service/ec2/api_op_CreateClientVpnEndpoint.go +++ b/service/ec2/api_op_CreateClientVpnEndpoint.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateClientVpnEndpoint(ctx context.Context, params *CreateClie addawsEc2query_serdeOpCreateClientVpnEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateClientVpnRoute.go b/service/ec2/api_op_CreateClientVpnRoute.go index fcf264d2c72..8d660d6e303 100644 --- a/service/ec2/api_op_CreateClientVpnRoute.go +++ b/service/ec2/api_op_CreateClientVpnRoute.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateClientVpnRoute(ctx context.Context, params *CreateClientV addawsEc2query_serdeOpCreateClientVpnRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateCustomerGateway.go b/service/ec2/api_op_CreateCustomerGateway.go index a783be34aaa..092045ed008 100644 --- a/service/ec2/api_op_CreateCustomerGateway.go +++ b/service/ec2/api_op_CreateCustomerGateway.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) CreateCustomerGateway(ctx context.Context, params *CreateCustom addawsEc2query_serdeOpCreateCustomerGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateDefaultSubnet.go b/service/ec2/api_op_CreateDefaultSubnet.go index f226f146d90..12a764bb9f9 100644 --- a/service/ec2/api_op_CreateDefaultSubnet.go +++ b/service/ec2/api_op_CreateDefaultSubnet.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateDefaultSubnet(ctx context.Context, params *CreateDefaultS addawsEc2query_serdeOpCreateDefaultSubnetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateDefaultVpc.go b/service/ec2/api_op_CreateDefaultVpc.go index 981ebc16140..b29acd1e307 100644 --- a/service/ec2/api_op_CreateDefaultVpc.go +++ b/service/ec2/api_op_CreateDefaultVpc.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) CreateDefaultVpc(ctx context.Context, params *CreateDefaultVpcI addawsEc2query_serdeOpCreateDefaultVpcMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateDhcpOptions.go b/service/ec2/api_op_CreateDhcpOptions.go index 73241cdbd8a..cacfcc51a66 100644 --- a/service/ec2/api_op_CreateDhcpOptions.go +++ b/service/ec2/api_op_CreateDhcpOptions.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -66,9 +65,9 @@ func (c *Client) CreateDhcpOptions(ctx context.Context, params *CreateDhcpOption addawsEc2query_serdeOpCreateDhcpOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateEgressOnlyInternetGateway.go b/service/ec2/api_op_CreateEgressOnlyInternetGateway.go index 7158bd665ef..cfc5cf715b7 100644 --- a/service/ec2/api_op_CreateEgressOnlyInternetGateway.go +++ b/service/ec2/api_op_CreateEgressOnlyInternetGateway.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateEgressOnlyInternetGateway(ctx context.Context, params *Cr addawsEc2query_serdeOpCreateEgressOnlyInternetGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateFleet.go b/service/ec2/api_op_CreateFleet.go index dbf51f9e3a0..95d9bfbcfea 100644 --- a/service/ec2/api_op_CreateFleet.go +++ b/service/ec2/api_op_CreateFleet.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateFleet(ctx context.Context, params *CreateFleetInput, optF addawsEc2query_serdeOpCreateFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateFlowLogs.go b/service/ec2/api_op_CreateFlowLogs.go index ee26baf1e9a..cc81046782a 100644 --- a/service/ec2/api_op_CreateFlowLogs.go +++ b/service/ec2/api_op_CreateFlowLogs.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) CreateFlowLogs(ctx context.Context, params *CreateFlowLogsInput addawsEc2query_serdeOpCreateFlowLogsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateFpgaImage.go b/service/ec2/api_op_CreateFpgaImage.go index caf36530fc9..15ba139cca1 100644 --- a/service/ec2/api_op_CreateFpgaImage.go +++ b/service/ec2/api_op_CreateFpgaImage.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateFpgaImage(ctx context.Context, params *CreateFpgaImageInp addawsEc2query_serdeOpCreateFpgaImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateImage.go b/service/ec2/api_op_CreateImage.go index 169d2eed2f7..03476379f9b 100644 --- a/service/ec2/api_op_CreateImage.go +++ b/service/ec2/api_op_CreateImage.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateImage(ctx context.Context, params *CreateImageInput, optF addawsEc2query_serdeOpCreateImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateInstanceExportTask.go b/service/ec2/api_op_CreateInstanceExportTask.go index 192874322e8..16ae27562d5 100644 --- a/service/ec2/api_op_CreateInstanceExportTask.go +++ b/service/ec2/api_op_CreateInstanceExportTask.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateInstanceExportTask(ctx context.Context, params *CreateIns addawsEc2query_serdeOpCreateInstanceExportTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateInternetGateway.go b/service/ec2/api_op_CreateInternetGateway.go index f912a2c872a..8e9a4cf4285 100644 --- a/service/ec2/api_op_CreateInternetGateway.go +++ b/service/ec2/api_op_CreateInternetGateway.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateInternetGateway(ctx context.Context, params *CreateIntern addawsEc2query_serdeOpCreateInternetGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateKeyPair.go b/service/ec2/api_op_CreateKeyPair.go index 944f1c8d34a..6ea69248f0c 100644 --- a/service/ec2/api_op_CreateKeyPair.go +++ b/service/ec2/api_op_CreateKeyPair.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) CreateKeyPair(ctx context.Context, params *CreateKeyPairInput, addawsEc2query_serdeOpCreateKeyPairMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateLaunchTemplate.go b/service/ec2/api_op_CreateLaunchTemplate.go index 659c7fa50ec..38ce27e7dcd 100644 --- a/service/ec2/api_op_CreateLaunchTemplate.go +++ b/service/ec2/api_op_CreateLaunchTemplate.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateLaunchTemplate(ctx context.Context, params *CreateLaunchT addawsEc2query_serdeOpCreateLaunchTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateLaunchTemplateVersion.go b/service/ec2/api_op_CreateLaunchTemplateVersion.go index 8d2e89a0989..da59cc4d7e6 100644 --- a/service/ec2/api_op_CreateLaunchTemplateVersion.go +++ b/service/ec2/api_op_CreateLaunchTemplateVersion.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateLaunchTemplateVersion(ctx context.Context, params *Create addawsEc2query_serdeOpCreateLaunchTemplateVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateLocalGatewayRoute.go b/service/ec2/api_op_CreateLocalGatewayRoute.go index fef8eff2a3e..23bc2a3bfb1 100644 --- a/service/ec2/api_op_CreateLocalGatewayRoute.go +++ b/service/ec2/api_op_CreateLocalGatewayRoute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateLocalGatewayRoute(ctx context.Context, params *CreateLoca addawsEc2query_serdeOpCreateLocalGatewayRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateLocalGatewayRouteTableVpcAssociation.go b/service/ec2/api_op_CreateLocalGatewayRouteTableVpcAssociation.go index de50a9b5c8a..34b1f4fc84d 100644 --- a/service/ec2/api_op_CreateLocalGatewayRouteTableVpcAssociation.go +++ b/service/ec2/api_op_CreateLocalGatewayRouteTableVpcAssociation.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateLocalGatewayRouteTableVpcAssociation(ctx context.Context, addawsEc2query_serdeOpCreateLocalGatewayRouteTableVpcAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateManagedPrefixList.go b/service/ec2/api_op_CreateManagedPrefixList.go index 63796cb1b5c..8a9ec50e33a 100644 --- a/service/ec2/api_op_CreateManagedPrefixList.go +++ b/service/ec2/api_op_CreateManagedPrefixList.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateManagedPrefixList(ctx context.Context, params *CreateMana addawsEc2query_serdeOpCreateManagedPrefixListMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateNatGateway.go b/service/ec2/api_op_CreateNatGateway.go index fc24181e6bf..a8e748dd503 100644 --- a/service/ec2/api_op_CreateNatGateway.go +++ b/service/ec2/api_op_CreateNatGateway.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateNatGateway(ctx context.Context, params *CreateNatGatewayI addawsEc2query_serdeOpCreateNatGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateNetworkAcl.go b/service/ec2/api_op_CreateNetworkAcl.go index 601fffa0ede..8930198ff09 100644 --- a/service/ec2/api_op_CreateNetworkAcl.go +++ b/service/ec2/api_op_CreateNetworkAcl.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateNetworkAcl(ctx context.Context, params *CreateNetworkAclI addawsEc2query_serdeOpCreateNetworkAclMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateNetworkAclEntry.go b/service/ec2/api_op_CreateNetworkAclEntry.go index d158b77dcee..9fd371555c0 100644 --- a/service/ec2/api_op_CreateNetworkAclEntry.go +++ b/service/ec2/api_op_CreateNetworkAclEntry.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) CreateNetworkAclEntry(ctx context.Context, params *CreateNetwor addawsEc2query_serdeOpCreateNetworkAclEntryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateNetworkInterface.go b/service/ec2/api_op_CreateNetworkInterface.go index 13c5d0bc9ca..36ff825f9f6 100644 --- a/service/ec2/api_op_CreateNetworkInterface.go +++ b/service/ec2/api_op_CreateNetworkInterface.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateNetworkInterface(ctx context.Context, params *CreateNetwo addawsEc2query_serdeOpCreateNetworkInterfaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateNetworkInterfacePermission.go b/service/ec2/api_op_CreateNetworkInterfacePermission.go index 38289063a4e..cb9653e173d 100644 --- a/service/ec2/api_op_CreateNetworkInterfacePermission.go +++ b/service/ec2/api_op_CreateNetworkInterfacePermission.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateNetworkInterfacePermission(ctx context.Context, params *C addawsEc2query_serdeOpCreateNetworkInterfacePermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreatePlacementGroup.go b/service/ec2/api_op_CreatePlacementGroup.go index 43a596a2fe1..b52e0607629 100644 --- a/service/ec2/api_op_CreatePlacementGroup.go +++ b/service/ec2/api_op_CreatePlacementGroup.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) CreatePlacementGroup(ctx context.Context, params *CreatePlaceme addawsEc2query_serdeOpCreatePlacementGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateReservedInstancesListing.go b/service/ec2/api_op_CreateReservedInstancesListing.go index a9d164054af..b2548db94a2 100644 --- a/service/ec2/api_op_CreateReservedInstancesListing.go +++ b/service/ec2/api_op_CreateReservedInstancesListing.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) CreateReservedInstancesListing(ctx context.Context, params *Cre addawsEc2query_serdeOpCreateReservedInstancesListingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateRoute.go b/service/ec2/api_op_CreateRoute.go index ea6a9722bb7..250c36c7d7e 100644 --- a/service/ec2/api_op_CreateRoute.go +++ b/service/ec2/api_op_CreateRoute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -40,9 +39,9 @@ func (c *Client) CreateRoute(ctx context.Context, params *CreateRouteInput, optF addawsEc2query_serdeOpCreateRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateRouteTable.go b/service/ec2/api_op_CreateRouteTable.go index 2b88d87163d..0102a957d58 100644 --- a/service/ec2/api_op_CreateRouteTable.go +++ b/service/ec2/api_op_CreateRouteTable.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateRouteTable(ctx context.Context, params *CreateRouteTableI addawsEc2query_serdeOpCreateRouteTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateSecurityGroup.go b/service/ec2/api_op_CreateSecurityGroup.go index 58f6ab8733e..f001d4cb0e6 100644 --- a/service/ec2/api_op_CreateSecurityGroup.go +++ b/service/ec2/api_op_CreateSecurityGroup.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) CreateSecurityGroup(ctx context.Context, params *CreateSecurity addawsEc2query_serdeOpCreateSecurityGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateSnapshot.go b/service/ec2/api_op_CreateSnapshot.go index 07760e069b0..6bb9f48bf3f 100644 --- a/service/ec2/api_op_CreateSnapshot.go +++ b/service/ec2/api_op_CreateSnapshot.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -49,9 +48,9 @@ func (c *Client) CreateSnapshot(ctx context.Context, params *CreateSnapshotInput addawsEc2query_serdeOpCreateSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateSnapshots.go b/service/ec2/api_op_CreateSnapshots.go index ae472436a0a..670ca4c0387 100644 --- a/service/ec2/api_op_CreateSnapshots.go +++ b/service/ec2/api_op_CreateSnapshots.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateSnapshots(ctx context.Context, params *CreateSnapshotsInp addawsEc2query_serdeOpCreateSnapshotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateSpotDatafeedSubscription.go b/service/ec2/api_op_CreateSpotDatafeedSubscription.go index bae2d787082..2439ada8d3e 100644 --- a/service/ec2/api_op_CreateSpotDatafeedSubscription.go +++ b/service/ec2/api_op_CreateSpotDatafeedSubscription.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateSpotDatafeedSubscription(ctx context.Context, params *Cre addawsEc2query_serdeOpCreateSpotDatafeedSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateSubnet.go b/service/ec2/api_op_CreateSubnet.go index 30ce24c8f2f..a20a55d0384 100644 --- a/service/ec2/api_op_CreateSubnet.go +++ b/service/ec2/api_op_CreateSubnet.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) CreateSubnet(ctx context.Context, params *CreateSubnetInput, op addawsEc2query_serdeOpCreateSubnetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateTags.go b/service/ec2/api_op_CreateTags.go index 30dc5380fbb..fc11496ee40 100644 --- a/service/ec2/api_op_CreateTags.go +++ b/service/ec2/api_op_CreateTags.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) CreateTags(ctx context.Context, params *CreateTagsInput, optFns addawsEc2query_serdeOpCreateTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateTrafficMirrorFilter.go b/service/ec2/api_op_CreateTrafficMirrorFilter.go index 75ff27f51c3..dd0b9d155a6 100644 --- a/service/ec2/api_op_CreateTrafficMirrorFilter.go +++ b/service/ec2/api_op_CreateTrafficMirrorFilter.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateTrafficMirrorFilter(ctx context.Context, params *CreateTr addawsEc2query_serdeOpCreateTrafficMirrorFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateTrafficMirrorFilterRule.go b/service/ec2/api_op_CreateTrafficMirrorFilterRule.go index 3494ad80193..b3a5fbf833a 100644 --- a/service/ec2/api_op_CreateTrafficMirrorFilterRule.go +++ b/service/ec2/api_op_CreateTrafficMirrorFilterRule.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateTrafficMirrorFilterRule(ctx context.Context, params *Crea addawsEc2query_serdeOpCreateTrafficMirrorFilterRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateTrafficMirrorSession.go b/service/ec2/api_op_CreateTrafficMirrorSession.go index b719f6aafb4..449127da8f7 100644 --- a/service/ec2/api_op_CreateTrafficMirrorSession.go +++ b/service/ec2/api_op_CreateTrafficMirrorSession.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) CreateTrafficMirrorSession(ctx context.Context, params *CreateT addawsEc2query_serdeOpCreateTrafficMirrorSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateTrafficMirrorTarget.go b/service/ec2/api_op_CreateTrafficMirrorTarget.go index 428746f8f87..bb99f5ce42a 100644 --- a/service/ec2/api_op_CreateTrafficMirrorTarget.go +++ b/service/ec2/api_op_CreateTrafficMirrorTarget.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateTrafficMirrorTarget(ctx context.Context, params *CreateTr addawsEc2query_serdeOpCreateTrafficMirrorTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateTransitGateway.go b/service/ec2/api_op_CreateTransitGateway.go index c32b001fb4c..d7d18890463 100644 --- a/service/ec2/api_op_CreateTransitGateway.go +++ b/service/ec2/api_op_CreateTransitGateway.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) CreateTransitGateway(ctx context.Context, params *CreateTransit addawsEc2query_serdeOpCreateTransitGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateTransitGatewayMulticastDomain.go b/service/ec2/api_op_CreateTransitGatewayMulticastDomain.go index 883839ed757..c213b2aec43 100644 --- a/service/ec2/api_op_CreateTransitGatewayMulticastDomain.go +++ b/service/ec2/api_op_CreateTransitGatewayMulticastDomain.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateTransitGatewayMulticastDomain(ctx context.Context, params addawsEc2query_serdeOpCreateTransitGatewayMulticastDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateTransitGatewayPeeringAttachment.go b/service/ec2/api_op_CreateTransitGatewayPeeringAttachment.go index 09a3b329a7c..7000af6e412 100644 --- a/service/ec2/api_op_CreateTransitGatewayPeeringAttachment.go +++ b/service/ec2/api_op_CreateTransitGatewayPeeringAttachment.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateTransitGatewayPeeringAttachment(ctx context.Context, para addawsEc2query_serdeOpCreateTransitGatewayPeeringAttachmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateTransitGatewayRoute.go b/service/ec2/api_op_CreateTransitGatewayRoute.go index d4bf8f0292a..2b1f5a6ec91 100644 --- a/service/ec2/api_op_CreateTransitGatewayRoute.go +++ b/service/ec2/api_op_CreateTransitGatewayRoute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateTransitGatewayRoute(ctx context.Context, params *CreateTr addawsEc2query_serdeOpCreateTransitGatewayRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateTransitGatewayRouteTable.go b/service/ec2/api_op_CreateTransitGatewayRouteTable.go index af7dc458f4e..8d42f15ad20 100644 --- a/service/ec2/api_op_CreateTransitGatewayRouteTable.go +++ b/service/ec2/api_op_CreateTransitGatewayRouteTable.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateTransitGatewayRouteTable(ctx context.Context, params *Cre addawsEc2query_serdeOpCreateTransitGatewayRouteTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateTransitGatewayVpcAttachment.go b/service/ec2/api_op_CreateTransitGatewayVpcAttachment.go index c44399ee529..5d85c81d2de 100644 --- a/service/ec2/api_op_CreateTransitGatewayVpcAttachment.go +++ b/service/ec2/api_op_CreateTransitGatewayVpcAttachment.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateTransitGatewayVpcAttachment(ctx context.Context, params * addawsEc2query_serdeOpCreateTransitGatewayVpcAttachmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateVolume.go b/service/ec2/api_op_CreateVolume.go index 4a11b9388a6..6800b957013 100644 --- a/service/ec2/api_op_CreateVolume.go +++ b/service/ec2/api_op_CreateVolume.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) CreateVolume(ctx context.Context, params *CreateVolumeInput, op addawsEc2query_serdeOpCreateVolumeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateVpc.go b/service/ec2/api_op_CreateVpc.go index ae280591f31..65ef961c972 100644 --- a/service/ec2/api_op_CreateVpc.go +++ b/service/ec2/api_op_CreateVpc.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) CreateVpc(ctx context.Context, params *CreateVpcInput, optFns . addawsEc2query_serdeOpCreateVpcMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateVpcEndpoint.go b/service/ec2/api_op_CreateVpcEndpoint.go index c205c462f60..2a3d4225f56 100644 --- a/service/ec2/api_op_CreateVpcEndpoint.go +++ b/service/ec2/api_op_CreateVpcEndpoint.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) CreateVpcEndpoint(ctx context.Context, params *CreateVpcEndpoin addawsEc2query_serdeOpCreateVpcEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateVpcEndpointConnectionNotification.go b/service/ec2/api_op_CreateVpcEndpointConnectionNotification.go index e3baf96e353..c3962e15744 100644 --- a/service/ec2/api_op_CreateVpcEndpointConnectionNotification.go +++ b/service/ec2/api_op_CreateVpcEndpointConnectionNotification.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateVpcEndpointConnectionNotification(ctx context.Context, pa addawsEc2query_serdeOpCreateVpcEndpointConnectionNotificationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateVpcEndpointServiceConfiguration.go b/service/ec2/api_op_CreateVpcEndpointServiceConfiguration.go index 343c89dd186..9529d328345 100644 --- a/service/ec2/api_op_CreateVpcEndpointServiceConfiguration.go +++ b/service/ec2/api_op_CreateVpcEndpointServiceConfiguration.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) CreateVpcEndpointServiceConfiguration(ctx context.Context, para addawsEc2query_serdeOpCreateVpcEndpointServiceConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateVpcPeeringConnection.go b/service/ec2/api_op_CreateVpcPeeringConnection.go index a7b38d8077f..295945ee132 100644 --- a/service/ec2/api_op_CreateVpcPeeringConnection.go +++ b/service/ec2/api_op_CreateVpcPeeringConnection.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) CreateVpcPeeringConnection(ctx context.Context, params *CreateV addawsEc2query_serdeOpCreateVpcPeeringConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateVpnConnection.go b/service/ec2/api_op_CreateVpnConnection.go index 71b8ba661b4..de2e7e8c252 100644 --- a/service/ec2/api_op_CreateVpnConnection.go +++ b/service/ec2/api_op_CreateVpnConnection.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) CreateVpnConnection(ctx context.Context, params *CreateVpnConne addawsEc2query_serdeOpCreateVpnConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateVpnConnectionRoute.go b/service/ec2/api_op_CreateVpnConnectionRoute.go index 296dc82fe3a..1ea7aa606bc 100644 --- a/service/ec2/api_op_CreateVpnConnectionRoute.go +++ b/service/ec2/api_op_CreateVpnConnectionRoute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) CreateVpnConnectionRoute(ctx context.Context, params *CreateVpn addawsEc2query_serdeOpCreateVpnConnectionRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_CreateVpnGateway.go b/service/ec2/api_op_CreateVpnGateway.go index f07837a87c4..0a50b29d094 100644 --- a/service/ec2/api_op_CreateVpnGateway.go +++ b/service/ec2/api_op_CreateVpnGateway.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateVpnGateway(ctx context.Context, params *CreateVpnGatewayI addawsEc2query_serdeOpCreateVpnGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteClientVpnEndpoint.go b/service/ec2/api_op_DeleteClientVpnEndpoint.go index d30979776e0..9d498e67735 100644 --- a/service/ec2/api_op_DeleteClientVpnEndpoint.go +++ b/service/ec2/api_op_DeleteClientVpnEndpoint.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteClientVpnEndpoint(ctx context.Context, params *DeleteClie addawsEc2query_serdeOpDeleteClientVpnEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteClientVpnRoute.go b/service/ec2/api_op_DeleteClientVpnRoute.go index a1c07266492..089f36a86dd 100644 --- a/service/ec2/api_op_DeleteClientVpnRoute.go +++ b/service/ec2/api_op_DeleteClientVpnRoute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeleteClientVpnRoute(ctx context.Context, params *DeleteClientV addawsEc2query_serdeOpDeleteClientVpnRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteCustomerGateway.go b/service/ec2/api_op_DeleteCustomerGateway.go index 49f54e893a2..b3a82fca8a6 100644 --- a/service/ec2/api_op_DeleteCustomerGateway.go +++ b/service/ec2/api_op_DeleteCustomerGateway.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteCustomerGateway(ctx context.Context, params *DeleteCustom addawsEc2query_serdeOpDeleteCustomerGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteDhcpOptions.go b/service/ec2/api_op_DeleteDhcpOptions.go index 3348637d374..f55d94d868e 100644 --- a/service/ec2/api_op_DeleteDhcpOptions.go +++ b/service/ec2/api_op_DeleteDhcpOptions.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteDhcpOptions(ctx context.Context, params *DeleteDhcpOption addawsEc2query_serdeOpDeleteDhcpOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteEgressOnlyInternetGateway.go b/service/ec2/api_op_DeleteEgressOnlyInternetGateway.go index 68efe5f50f0..3dcc88035b0 100644 --- a/service/ec2/api_op_DeleteEgressOnlyInternetGateway.go +++ b/service/ec2/api_op_DeleteEgressOnlyInternetGateway.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteEgressOnlyInternetGateway(ctx context.Context, params *De addawsEc2query_serdeOpDeleteEgressOnlyInternetGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteFleets.go b/service/ec2/api_op_DeleteFleets.go index 1a1673fcf1c..33c94825923 100644 --- a/service/ec2/api_op_DeleteFleets.go +++ b/service/ec2/api_op_DeleteFleets.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DeleteFleets(ctx context.Context, params *DeleteFleetsInput, op addawsEc2query_serdeOpDeleteFleetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteFlowLogs.go b/service/ec2/api_op_DeleteFlowLogs.go index e6950b401f2..be8ab8c1d32 100644 --- a/service/ec2/api_op_DeleteFlowLogs.go +++ b/service/ec2/api_op_DeleteFlowLogs.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteFlowLogs(ctx context.Context, params *DeleteFlowLogsInput addawsEc2query_serdeOpDeleteFlowLogsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteFpgaImage.go b/service/ec2/api_op_DeleteFpgaImage.go index 0671e2a3fdd..7989ae238c1 100644 --- a/service/ec2/api_op_DeleteFpgaImage.go +++ b/service/ec2/api_op_DeleteFpgaImage.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteFpgaImage(ctx context.Context, params *DeleteFpgaImageInp addawsEc2query_serdeOpDeleteFpgaImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteInternetGateway.go b/service/ec2/api_op_DeleteInternetGateway.go index 629c29eeef4..5326afb7e85 100644 --- a/service/ec2/api_op_DeleteInternetGateway.go +++ b/service/ec2/api_op_DeleteInternetGateway.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteInternetGateway(ctx context.Context, params *DeleteIntern addawsEc2query_serdeOpDeleteInternetGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteKeyPair.go b/service/ec2/api_op_DeleteKeyPair.go index e534c7881bd..5616f140cb7 100644 --- a/service/ec2/api_op_DeleteKeyPair.go +++ b/service/ec2/api_op_DeleteKeyPair.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteKeyPair(ctx context.Context, params *DeleteKeyPairInput, addawsEc2query_serdeOpDeleteKeyPairMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteLaunchTemplate.go b/service/ec2/api_op_DeleteLaunchTemplate.go index a14031f5a51..1c8e35246e4 100644 --- a/service/ec2/api_op_DeleteLaunchTemplate.go +++ b/service/ec2/api_op_DeleteLaunchTemplate.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteLaunchTemplate(ctx context.Context, params *DeleteLaunchT addawsEc2query_serdeOpDeleteLaunchTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteLaunchTemplateVersions.go b/service/ec2/api_op_DeleteLaunchTemplateVersions.go index 57ad2020096..97414b36512 100644 --- a/service/ec2/api_op_DeleteLaunchTemplateVersions.go +++ b/service/ec2/api_op_DeleteLaunchTemplateVersions.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteLaunchTemplateVersions(ctx context.Context, params *Delet addawsEc2query_serdeOpDeleteLaunchTemplateVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteLocalGatewayRoute.go b/service/ec2/api_op_DeleteLocalGatewayRoute.go index b4d20f5a3a7..0851a9ddd83 100644 --- a/service/ec2/api_op_DeleteLocalGatewayRoute.go +++ b/service/ec2/api_op_DeleteLocalGatewayRoute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteLocalGatewayRoute(ctx context.Context, params *DeleteLoca addawsEc2query_serdeOpDeleteLocalGatewayRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteLocalGatewayRouteTableVpcAssociation.go b/service/ec2/api_op_DeleteLocalGatewayRouteTableVpcAssociation.go index 9e6b865f6af..58668d9b55e 100644 --- a/service/ec2/api_op_DeleteLocalGatewayRouteTableVpcAssociation.go +++ b/service/ec2/api_op_DeleteLocalGatewayRouteTableVpcAssociation.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteLocalGatewayRouteTableVpcAssociation(ctx context.Context, addawsEc2query_serdeOpDeleteLocalGatewayRouteTableVpcAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteManagedPrefixList.go b/service/ec2/api_op_DeleteManagedPrefixList.go index c0ac1597ccf..5e1c3177a53 100644 --- a/service/ec2/api_op_DeleteManagedPrefixList.go +++ b/service/ec2/api_op_DeleteManagedPrefixList.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteManagedPrefixList(ctx context.Context, params *DeleteMana addawsEc2query_serdeOpDeleteManagedPrefixListMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteNatGateway.go b/service/ec2/api_op_DeleteNatGateway.go index 7f29f384b16..19831507950 100644 --- a/service/ec2/api_op_DeleteNatGateway.go +++ b/service/ec2/api_op_DeleteNatGateway.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteNatGateway(ctx context.Context, params *DeleteNatGatewayI addawsEc2query_serdeOpDeleteNatGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteNetworkAcl.go b/service/ec2/api_op_DeleteNetworkAcl.go index 25635570456..3b2a49ed695 100644 --- a/service/ec2/api_op_DeleteNetworkAcl.go +++ b/service/ec2/api_op_DeleteNetworkAcl.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteNetworkAcl(ctx context.Context, params *DeleteNetworkAclI addawsEc2query_serdeOpDeleteNetworkAclMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteNetworkAclEntry.go b/service/ec2/api_op_DeleteNetworkAclEntry.go index a89a1d4fa2b..186e480c562 100644 --- a/service/ec2/api_op_DeleteNetworkAclEntry.go +++ b/service/ec2/api_op_DeleteNetworkAclEntry.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteNetworkAclEntry(ctx context.Context, params *DeleteNetwor addawsEc2query_serdeOpDeleteNetworkAclEntryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteNetworkInterface.go b/service/ec2/api_op_DeleteNetworkInterface.go index 8267bd90be0..0493eafc588 100644 --- a/service/ec2/api_op_DeleteNetworkInterface.go +++ b/service/ec2/api_op_DeleteNetworkInterface.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteNetworkInterface(ctx context.Context, params *DeleteNetwo addawsEc2query_serdeOpDeleteNetworkInterfaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteNetworkInterfacePermission.go b/service/ec2/api_op_DeleteNetworkInterfacePermission.go index 65fa6a81bea..5eaa33fcbd2 100644 --- a/service/ec2/api_op_DeleteNetworkInterfacePermission.go +++ b/service/ec2/api_op_DeleteNetworkInterfacePermission.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteNetworkInterfacePermission(ctx context.Context, params *D addawsEc2query_serdeOpDeleteNetworkInterfacePermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeletePlacementGroup.go b/service/ec2/api_op_DeletePlacementGroup.go index 37487968b4e..d486e4d49a2 100644 --- a/service/ec2/api_op_DeletePlacementGroup.go +++ b/service/ec2/api_op_DeletePlacementGroup.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeletePlacementGroup(ctx context.Context, params *DeletePlaceme addawsEc2query_serdeOpDeletePlacementGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteQueuedReservedInstances.go b/service/ec2/api_op_DeleteQueuedReservedInstances.go index 7cbe091de2d..6fa72cb4577 100644 --- a/service/ec2/api_op_DeleteQueuedReservedInstances.go +++ b/service/ec2/api_op_DeleteQueuedReservedInstances.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteQueuedReservedInstances(ctx context.Context, params *Dele addawsEc2query_serdeOpDeleteQueuedReservedInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteRoute.go b/service/ec2/api_op_DeleteRoute.go index 70c7976a80e..af5caa6b961 100644 --- a/service/ec2/api_op_DeleteRoute.go +++ b/service/ec2/api_op_DeleteRoute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRoute(ctx context.Context, params *DeleteRouteInput, optF addawsEc2query_serdeOpDeleteRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteRouteTable.go b/service/ec2/api_op_DeleteRouteTable.go index c1d3fbe8e09..26e40e102ff 100644 --- a/service/ec2/api_op_DeleteRouteTable.go +++ b/service/ec2/api_op_DeleteRouteTable.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteRouteTable(ctx context.Context, params *DeleteRouteTableI addawsEc2query_serdeOpDeleteRouteTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteSecurityGroup.go b/service/ec2/api_op_DeleteSecurityGroup.go index 8e809b69409..9471c05bc91 100644 --- a/service/ec2/api_op_DeleteSecurityGroup.go +++ b/service/ec2/api_op_DeleteSecurityGroup.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteSecurityGroup(ctx context.Context, params *DeleteSecurity addawsEc2query_serdeOpDeleteSecurityGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteSnapshot.go b/service/ec2/api_op_DeleteSnapshot.go index d7fd855f281..f7cac2b024f 100644 --- a/service/ec2/api_op_DeleteSnapshot.go +++ b/service/ec2/api_op_DeleteSnapshot.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) DeleteSnapshot(ctx context.Context, params *DeleteSnapshotInput addawsEc2query_serdeOpDeleteSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteSpotDatafeedSubscription.go b/service/ec2/api_op_DeleteSpotDatafeedSubscription.go index 4d44b006eba..76dff828792 100644 --- a/service/ec2/api_op_DeleteSpotDatafeedSubscription.go +++ b/service/ec2/api_op_DeleteSpotDatafeedSubscription.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSpotDatafeedSubscription(ctx context.Context, params *Del addawsEc2query_serdeOpDeleteSpotDatafeedSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteSubnet.go b/service/ec2/api_op_DeleteSubnet.go index 62e3017e208..2f899c0bec0 100644 --- a/service/ec2/api_op_DeleteSubnet.go +++ b/service/ec2/api_op_DeleteSubnet.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteSubnet(ctx context.Context, params *DeleteSubnetInput, op addawsEc2query_serdeOpDeleteSubnetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteTags.go b/service/ec2/api_op_DeleteTags.go index 8b918bbd643..e1b510c1eba 100644 --- a/service/ec2/api_op_DeleteTags.go +++ b/service/ec2/api_op_DeleteTags.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeleteTags(ctx context.Context, params *DeleteTagsInput, optFns addawsEc2query_serdeOpDeleteTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteTrafficMirrorFilter.go b/service/ec2/api_op_DeleteTrafficMirrorFilter.go index 17807b64f59..a967b122d31 100644 --- a/service/ec2/api_op_DeleteTrafficMirrorFilter.go +++ b/service/ec2/api_op_DeleteTrafficMirrorFilter.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteTrafficMirrorFilter(ctx context.Context, params *DeleteTr addawsEc2query_serdeOpDeleteTrafficMirrorFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteTrafficMirrorFilterRule.go b/service/ec2/api_op_DeleteTrafficMirrorFilterRule.go index 0d4a51a390f..b28cc4c5160 100644 --- a/service/ec2/api_op_DeleteTrafficMirrorFilterRule.go +++ b/service/ec2/api_op_DeleteTrafficMirrorFilterRule.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteTrafficMirrorFilterRule(ctx context.Context, params *Dele addawsEc2query_serdeOpDeleteTrafficMirrorFilterRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteTrafficMirrorSession.go b/service/ec2/api_op_DeleteTrafficMirrorSession.go index 354b88937b0..2f7242f45a1 100644 --- a/service/ec2/api_op_DeleteTrafficMirrorSession.go +++ b/service/ec2/api_op_DeleteTrafficMirrorSession.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteTrafficMirrorSession(ctx context.Context, params *DeleteT addawsEc2query_serdeOpDeleteTrafficMirrorSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteTrafficMirrorTarget.go b/service/ec2/api_op_DeleteTrafficMirrorTarget.go index 04515a45514..28b355c45fb 100644 --- a/service/ec2/api_op_DeleteTrafficMirrorTarget.go +++ b/service/ec2/api_op_DeleteTrafficMirrorTarget.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteTrafficMirrorTarget(ctx context.Context, params *DeleteTr addawsEc2query_serdeOpDeleteTrafficMirrorTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteTransitGateway.go b/service/ec2/api_op_DeleteTransitGateway.go index c04860d284c..f6dbd48e0cc 100644 --- a/service/ec2/api_op_DeleteTransitGateway.go +++ b/service/ec2/api_op_DeleteTransitGateway.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteTransitGateway(ctx context.Context, params *DeleteTransit addawsEc2query_serdeOpDeleteTransitGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteTransitGatewayMulticastDomain.go b/service/ec2/api_op_DeleteTransitGatewayMulticastDomain.go index 6ba809df0eb..22b2ab03e49 100644 --- a/service/ec2/api_op_DeleteTransitGatewayMulticastDomain.go +++ b/service/ec2/api_op_DeleteTransitGatewayMulticastDomain.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteTransitGatewayMulticastDomain(ctx context.Context, params addawsEc2query_serdeOpDeleteTransitGatewayMulticastDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteTransitGatewayPeeringAttachment.go b/service/ec2/api_op_DeleteTransitGatewayPeeringAttachment.go index c93c13df84b..fb9eaee78b1 100644 --- a/service/ec2/api_op_DeleteTransitGatewayPeeringAttachment.go +++ b/service/ec2/api_op_DeleteTransitGatewayPeeringAttachment.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteTransitGatewayPeeringAttachment(ctx context.Context, para addawsEc2query_serdeOpDeleteTransitGatewayPeeringAttachmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteTransitGatewayRoute.go b/service/ec2/api_op_DeleteTransitGatewayRoute.go index 852ae7271ff..a644fa50fb9 100644 --- a/service/ec2/api_op_DeleteTransitGatewayRoute.go +++ b/service/ec2/api_op_DeleteTransitGatewayRoute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteTransitGatewayRoute(ctx context.Context, params *DeleteTr addawsEc2query_serdeOpDeleteTransitGatewayRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteTransitGatewayRouteTable.go b/service/ec2/api_op_DeleteTransitGatewayRouteTable.go index 5e694dfbc75..6b05bbdc10c 100644 --- a/service/ec2/api_op_DeleteTransitGatewayRouteTable.go +++ b/service/ec2/api_op_DeleteTransitGatewayRouteTable.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteTransitGatewayRouteTable(ctx context.Context, params *Del addawsEc2query_serdeOpDeleteTransitGatewayRouteTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteTransitGatewayVpcAttachment.go b/service/ec2/api_op_DeleteTransitGatewayVpcAttachment.go index 2d6bc50037b..b3630ea2055 100644 --- a/service/ec2/api_op_DeleteTransitGatewayVpcAttachment.go +++ b/service/ec2/api_op_DeleteTransitGatewayVpcAttachment.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteTransitGatewayVpcAttachment(ctx context.Context, params * addawsEc2query_serdeOpDeleteTransitGatewayVpcAttachmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteVolume.go b/service/ec2/api_op_DeleteVolume.go index 3ae1403e4a6..ca785223e7a 100644 --- a/service/ec2/api_op_DeleteVolume.go +++ b/service/ec2/api_op_DeleteVolume.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteVolume(ctx context.Context, params *DeleteVolumeInput, op addawsEc2query_serdeOpDeleteVolumeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteVpc.go b/service/ec2/api_op_DeleteVpc.go index dbb90c07378..acd9b8bd6ae 100644 --- a/service/ec2/api_op_DeleteVpc.go +++ b/service/ec2/api_op_DeleteVpc.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteVpc(ctx context.Context, params *DeleteVpcInput, optFns . addawsEc2query_serdeOpDeleteVpcMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteVpcEndpointConnectionNotifications.go b/service/ec2/api_op_DeleteVpcEndpointConnectionNotifications.go index 86a22af2af0..1a9ad52e08a 100644 --- a/service/ec2/api_op_DeleteVpcEndpointConnectionNotifications.go +++ b/service/ec2/api_op_DeleteVpcEndpointConnectionNotifications.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteVpcEndpointConnectionNotifications(ctx context.Context, p addawsEc2query_serdeOpDeleteVpcEndpointConnectionNotificationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteVpcEndpointServiceConfigurations.go b/service/ec2/api_op_DeleteVpcEndpointServiceConfigurations.go index 3b595667ede..8570b69ff77 100644 --- a/service/ec2/api_op_DeleteVpcEndpointServiceConfigurations.go +++ b/service/ec2/api_op_DeleteVpcEndpointServiceConfigurations.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteVpcEndpointServiceConfigurations(ctx context.Context, par addawsEc2query_serdeOpDeleteVpcEndpointServiceConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteVpcEndpoints.go b/service/ec2/api_op_DeleteVpcEndpoints.go index ec7cdc0798c..acd36137fdd 100644 --- a/service/ec2/api_op_DeleteVpcEndpoints.go +++ b/service/ec2/api_op_DeleteVpcEndpoints.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteVpcEndpoints(ctx context.Context, params *DeleteVpcEndpoi addawsEc2query_serdeOpDeleteVpcEndpointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteVpcPeeringConnection.go b/service/ec2/api_op_DeleteVpcPeeringConnection.go index 161799cdca8..2842132ca9e 100644 --- a/service/ec2/api_op_DeleteVpcPeeringConnection.go +++ b/service/ec2/api_op_DeleteVpcPeeringConnection.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteVpcPeeringConnection(ctx context.Context, params *DeleteV addawsEc2query_serdeOpDeleteVpcPeeringConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteVpnConnection.go b/service/ec2/api_op_DeleteVpnConnection.go index d1aec6f7d04..5bd50dfa70d 100644 --- a/service/ec2/api_op_DeleteVpnConnection.go +++ b/service/ec2/api_op_DeleteVpnConnection.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) DeleteVpnConnection(ctx context.Context, params *DeleteVpnConne addawsEc2query_serdeOpDeleteVpnConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteVpnConnectionRoute.go b/service/ec2/api_op_DeleteVpnConnectionRoute.go index 447a9c258cd..6300523e56a 100644 --- a/service/ec2/api_op_DeleteVpnConnectionRoute.go +++ b/service/ec2/api_op_DeleteVpnConnectionRoute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteVpnConnectionRoute(ctx context.Context, params *DeleteVpn addawsEc2query_serdeOpDeleteVpnConnectionRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeleteVpnGateway.go b/service/ec2/api_op_DeleteVpnGateway.go index f9c81627fa8..19e142af5b1 100644 --- a/service/ec2/api_op_DeleteVpnGateway.go +++ b/service/ec2/api_op_DeleteVpnGateway.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteVpnGateway(ctx context.Context, params *DeleteVpnGatewayI addawsEc2query_serdeOpDeleteVpnGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeprovisionByoipCidr.go b/service/ec2/api_op_DeprovisionByoipCidr.go index 38887f20759..28b980ce665 100644 --- a/service/ec2/api_op_DeprovisionByoipCidr.go +++ b/service/ec2/api_op_DeprovisionByoipCidr.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeprovisionByoipCidr(ctx context.Context, params *DeprovisionBy addawsEc2query_serdeOpDeprovisionByoipCidrMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeregisterImage.go b/service/ec2/api_op_DeregisterImage.go index 8d54acd8f4e..27bcf5b15b3 100644 --- a/service/ec2/api_op_DeregisterImage.go +++ b/service/ec2/api_op_DeregisterImage.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DeregisterImage(ctx context.Context, params *DeregisterImageInp addawsEc2query_serdeOpDeregisterImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeregisterInstanceEventNotificationAttributes.go b/service/ec2/api_op_DeregisterInstanceEventNotificationAttributes.go index f7911fc2b97..670d7020fa3 100644 --- a/service/ec2/api_op_DeregisterInstanceEventNotificationAttributes.go +++ b/service/ec2/api_op_DeregisterInstanceEventNotificationAttributes.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeregisterInstanceEventNotificationAttributes(ctx context.Conte addawsEc2query_serdeOpDeregisterInstanceEventNotificationAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeregisterTransitGatewayMulticastGroupMembers.go b/service/ec2/api_op_DeregisterTransitGatewayMulticastGroupMembers.go index d405650ff2a..d0872e08554 100644 --- a/service/ec2/api_op_DeregisterTransitGatewayMulticastGroupMembers.go +++ b/service/ec2/api_op_DeregisterTransitGatewayMulticastGroupMembers.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeregisterTransitGatewayMulticastGroupMembers(ctx context.Conte addawsEc2query_serdeOpDeregisterTransitGatewayMulticastGroupMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DeregisterTransitGatewayMulticastGroupSources.go b/service/ec2/api_op_DeregisterTransitGatewayMulticastGroupSources.go index 9a9015de54c..e8b933284af 100644 --- a/service/ec2/api_op_DeregisterTransitGatewayMulticastGroupSources.go +++ b/service/ec2/api_op_DeregisterTransitGatewayMulticastGroupSources.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeregisterTransitGatewayMulticastGroupSources(ctx context.Conte addawsEc2query_serdeOpDeregisterTransitGatewayMulticastGroupSourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeAccountAttributes.go b/service/ec2/api_op_DescribeAccountAttributes.go index c8326b53329..0cf0878eda7 100644 --- a/service/ec2/api_op_DescribeAccountAttributes.go +++ b/service/ec2/api_op_DescribeAccountAttributes.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -48,9 +47,9 @@ func (c *Client) DescribeAccountAttributes(ctx context.Context, params *Describe addawsEc2query_serdeOpDescribeAccountAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeAddresses.go b/service/ec2/api_op_DescribeAddresses.go index 541c682036d..58981055f12 100644 --- a/service/ec2/api_op_DescribeAddresses.go +++ b/service/ec2/api_op_DescribeAddresses.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeAddresses(ctx context.Context, params *DescribeAddresse addawsEc2query_serdeOpDescribeAddressesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeAggregateIdFormat.go b/service/ec2/api_op_DescribeAggregateIdFormat.go index a4d6a735b46..40a67e65cf7 100644 --- a/service/ec2/api_op_DescribeAggregateIdFormat.go +++ b/service/ec2/api_op_DescribeAggregateIdFormat.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) DescribeAggregateIdFormat(ctx context.Context, params *Describe addawsEc2query_serdeOpDescribeAggregateIdFormatMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeAvailabilityZones.go b/service/ec2/api_op_DescribeAvailabilityZones.go index f14f237cfd7..3a5c54bc1d7 100644 --- a/service/ec2/api_op_DescribeAvailabilityZones.go +++ b/service/ec2/api_op_DescribeAvailabilityZones.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeAvailabilityZones(ctx context.Context, params *Describe addawsEc2query_serdeOpDescribeAvailabilityZonesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeBundleTasks.go b/service/ec2/api_op_DescribeBundleTasks.go index 8b3c427cf85..8a0e84ac745 100644 --- a/service/ec2/api_op_DescribeBundleTasks.go +++ b/service/ec2/api_op_DescribeBundleTasks.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeBundleTasks(ctx context.Context, params *DescribeBundle addawsEc2query_serdeOpDescribeBundleTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeByoipCidrs.go b/service/ec2/api_op_DescribeByoipCidrs.go index 201995acd79..1c72583c1d4 100644 --- a/service/ec2/api_op_DescribeByoipCidrs.go +++ b/service/ec2/api_op_DescribeByoipCidrs.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeByoipCidrs(ctx context.Context, params *DescribeByoipCi addawsEc2query_serdeOpDescribeByoipCidrsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeCapacityReservations.go b/service/ec2/api_op_DescribeCapacityReservations.go index 6aa1ed4c8f3..4c8a5b512ff 100644 --- a/service/ec2/api_op_DescribeCapacityReservations.go +++ b/service/ec2/api_op_DescribeCapacityReservations.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeCapacityReservations(ctx context.Context, params *Descr addawsEc2query_serdeOpDescribeCapacityReservationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeClassicLinkInstances.go b/service/ec2/api_op_DescribeClassicLinkInstances.go index 3d3450788a4..d4bba9967fa 100644 --- a/service/ec2/api_op_DescribeClassicLinkInstances.go +++ b/service/ec2/api_op_DescribeClassicLinkInstances.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeClassicLinkInstances(ctx context.Context, params *Descr addawsEc2query_serdeOpDescribeClassicLinkInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeClientVpnAuthorizationRules.go b/service/ec2/api_op_DescribeClientVpnAuthorizationRules.go index dfb1718d530..d9a43be950f 100644 --- a/service/ec2/api_op_DescribeClientVpnAuthorizationRules.go +++ b/service/ec2/api_op_DescribeClientVpnAuthorizationRules.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeClientVpnAuthorizationRules(ctx context.Context, params addawsEc2query_serdeOpDescribeClientVpnAuthorizationRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeClientVpnConnections.go b/service/ec2/api_op_DescribeClientVpnConnections.go index 54e13a4c0b9..20cd9c0f287 100644 --- a/service/ec2/api_op_DescribeClientVpnConnections.go +++ b/service/ec2/api_op_DescribeClientVpnConnections.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeClientVpnConnections(ctx context.Context, params *Descr addawsEc2query_serdeOpDescribeClientVpnConnectionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeClientVpnEndpoints.go b/service/ec2/api_op_DescribeClientVpnEndpoints.go index 4b064da6a4d..8435b2e999d 100644 --- a/service/ec2/api_op_DescribeClientVpnEndpoints.go +++ b/service/ec2/api_op_DescribeClientVpnEndpoints.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeClientVpnEndpoints(ctx context.Context, params *Describ addawsEc2query_serdeOpDescribeClientVpnEndpointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeClientVpnRoutes.go b/service/ec2/api_op_DescribeClientVpnRoutes.go index 0f2dc67ee48..1eb1d6344bc 100644 --- a/service/ec2/api_op_DescribeClientVpnRoutes.go +++ b/service/ec2/api_op_DescribeClientVpnRoutes.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeClientVpnRoutes(ctx context.Context, params *DescribeCl addawsEc2query_serdeOpDescribeClientVpnRoutesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeClientVpnTargetNetworks.go b/service/ec2/api_op_DescribeClientVpnTargetNetworks.go index 7e8cc4b260b..46b0ddedcf7 100644 --- a/service/ec2/api_op_DescribeClientVpnTargetNetworks.go +++ b/service/ec2/api_op_DescribeClientVpnTargetNetworks.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeClientVpnTargetNetworks(ctx context.Context, params *De addawsEc2query_serdeOpDescribeClientVpnTargetNetworksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeCoipPools.go b/service/ec2/api_op_DescribeCoipPools.go index 99b7b176334..be1a22588f7 100644 --- a/service/ec2/api_op_DescribeCoipPools.go +++ b/service/ec2/api_op_DescribeCoipPools.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeCoipPools(ctx context.Context, params *DescribeCoipPool addawsEc2query_serdeOpDescribeCoipPoolsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeConversionTasks.go b/service/ec2/api_op_DescribeConversionTasks.go index 30af292f3f4..a6931c7582e 100644 --- a/service/ec2/api_op_DescribeConversionTasks.go +++ b/service/ec2/api_op_DescribeConversionTasks.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeConversionTasks(ctx context.Context, params *DescribeCo addawsEc2query_serdeOpDescribeConversionTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeCustomerGateways.go b/service/ec2/api_op_DescribeCustomerGateways.go index af3ba3d443d..f24027e9b45 100644 --- a/service/ec2/api_op_DescribeCustomerGateways.go +++ b/service/ec2/api_op_DescribeCustomerGateways.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeCustomerGateways(ctx context.Context, params *DescribeC addawsEc2query_serdeOpDescribeCustomerGatewaysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeDhcpOptions.go b/service/ec2/api_op_DescribeDhcpOptions.go index c41a33a5e68..be50801ab54 100644 --- a/service/ec2/api_op_DescribeDhcpOptions.go +++ b/service/ec2/api_op_DescribeDhcpOptions.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeDhcpOptions(ctx context.Context, params *DescribeDhcpOp addawsEc2query_serdeOpDescribeDhcpOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeEgressOnlyInternetGateways.go b/service/ec2/api_op_DescribeEgressOnlyInternetGateways.go index e006329b775..e0eae742e29 100644 --- a/service/ec2/api_op_DescribeEgressOnlyInternetGateways.go +++ b/service/ec2/api_op_DescribeEgressOnlyInternetGateways.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeEgressOnlyInternetGateways(ctx context.Context, params addawsEc2query_serdeOpDescribeEgressOnlyInternetGatewaysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeElasticGpus.go b/service/ec2/api_op_DescribeElasticGpus.go index 161cf2ad9b4..345b7a69e74 100644 --- a/service/ec2/api_op_DescribeElasticGpus.go +++ b/service/ec2/api_op_DescribeElasticGpus.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeElasticGpus(ctx context.Context, params *DescribeElasti addawsEc2query_serdeOpDescribeElasticGpusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeExportImageTasks.go b/service/ec2/api_op_DescribeExportImageTasks.go index f1fb57f74d4..3a71a520b4b 100644 --- a/service/ec2/api_op_DescribeExportImageTasks.go +++ b/service/ec2/api_op_DescribeExportImageTasks.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeExportImageTasks(ctx context.Context, params *DescribeE addawsEc2query_serdeOpDescribeExportImageTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeExportTasks.go b/service/ec2/api_op_DescribeExportTasks.go index d666b75e54e..a7d32dafbaf 100644 --- a/service/ec2/api_op_DescribeExportTasks.go +++ b/service/ec2/api_op_DescribeExportTasks.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeExportTasks(ctx context.Context, params *DescribeExport addawsEc2query_serdeOpDescribeExportTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeFastSnapshotRestores.go b/service/ec2/api_op_DescribeFastSnapshotRestores.go index cdeadf9cc8a..691e1c1e985 100644 --- a/service/ec2/api_op_DescribeFastSnapshotRestores.go +++ b/service/ec2/api_op_DescribeFastSnapshotRestores.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeFastSnapshotRestores(ctx context.Context, params *Descr addawsEc2query_serdeOpDescribeFastSnapshotRestoresMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeFleetHistory.go b/service/ec2/api_op_DescribeFleetHistory.go index cba962d526b..e49e70a90c5 100644 --- a/service/ec2/api_op_DescribeFleetHistory.go +++ b/service/ec2/api_op_DescribeFleetHistory.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeFleetHistory(ctx context.Context, params *DescribeFleet addawsEc2query_serdeOpDescribeFleetHistoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeFleetInstances.go b/service/ec2/api_op_DescribeFleetInstances.go index 45ec54500f7..6b7fcb5937d 100644 --- a/service/ec2/api_op_DescribeFleetInstances.go +++ b/service/ec2/api_op_DescribeFleetInstances.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeFleetInstances(ctx context.Context, params *DescribeFle addawsEc2query_serdeOpDescribeFleetInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeFleets.go b/service/ec2/api_op_DescribeFleets.go index 7418297593a..6c09c5a591d 100644 --- a/service/ec2/api_op_DescribeFleets.go +++ b/service/ec2/api_op_DescribeFleets.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeFleets(ctx context.Context, params *DescribeFleetsInput addawsEc2query_serdeOpDescribeFleetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeFlowLogs.go b/service/ec2/api_op_DescribeFlowLogs.go index 2bf2555647c..f0e7ca54a2a 100644 --- a/service/ec2/api_op_DescribeFlowLogs.go +++ b/service/ec2/api_op_DescribeFlowLogs.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeFlowLogs(ctx context.Context, params *DescribeFlowLogsI addawsEc2query_serdeOpDescribeFlowLogsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeFpgaImageAttribute.go b/service/ec2/api_op_DescribeFpgaImageAttribute.go index 22715bc3646..00f5a2737f3 100644 --- a/service/ec2/api_op_DescribeFpgaImageAttribute.go +++ b/service/ec2/api_op_DescribeFpgaImageAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeFpgaImageAttribute(ctx context.Context, params *Describ addawsEc2query_serdeOpDescribeFpgaImageAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeFpgaImages.go b/service/ec2/api_op_DescribeFpgaImages.go index e32ed4f1849..29b9cb7da1f 100644 --- a/service/ec2/api_op_DescribeFpgaImages.go +++ b/service/ec2/api_op_DescribeFpgaImages.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeFpgaImages(ctx context.Context, params *DescribeFpgaIma addawsEc2query_serdeOpDescribeFpgaImagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeHostReservationOfferings.go b/service/ec2/api_op_DescribeHostReservationOfferings.go index 683df733a9f..669845b13e5 100644 --- a/service/ec2/api_op_DescribeHostReservationOfferings.go +++ b/service/ec2/api_op_DescribeHostReservationOfferings.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DescribeHostReservationOfferings(ctx context.Context, params *D addawsEc2query_serdeOpDescribeHostReservationOfferingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeHostReservations.go b/service/ec2/api_op_DescribeHostReservations.go index 856ccc5b4f4..a513db9686a 100644 --- a/service/ec2/api_op_DescribeHostReservations.go +++ b/service/ec2/api_op_DescribeHostReservations.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeHostReservations(ctx context.Context, params *DescribeH addawsEc2query_serdeOpDescribeHostReservationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeHosts.go b/service/ec2/api_op_DescribeHosts.go index ee0621b1915..7d85f6e9a20 100644 --- a/service/ec2/api_op_DescribeHosts.go +++ b/service/ec2/api_op_DescribeHosts.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeHosts(ctx context.Context, params *DescribeHostsInput, addawsEc2query_serdeOpDescribeHostsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeIamInstanceProfileAssociations.go b/service/ec2/api_op_DescribeIamInstanceProfileAssociations.go index 7f22412ee0f..4fd483c6f9f 100644 --- a/service/ec2/api_op_DescribeIamInstanceProfileAssociations.go +++ b/service/ec2/api_op_DescribeIamInstanceProfileAssociations.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeIamInstanceProfileAssociations(ctx context.Context, par addawsEc2query_serdeOpDescribeIamInstanceProfileAssociationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeIdFormat.go b/service/ec2/api_op_DescribeIdFormat.go index 0323b214cc1..5e7e08e5fe7 100644 --- a/service/ec2/api_op_DescribeIdFormat.go +++ b/service/ec2/api_op_DescribeIdFormat.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) DescribeIdFormat(ctx context.Context, params *DescribeIdFormatI addawsEc2query_serdeOpDescribeIdFormatMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeIdentityIdFormat.go b/service/ec2/api_op_DescribeIdentityIdFormat.go index e0712770ce9..61226043d34 100644 --- a/service/ec2/api_op_DescribeIdentityIdFormat.go +++ b/service/ec2/api_op_DescribeIdentityIdFormat.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) DescribeIdentityIdFormat(ctx context.Context, params *DescribeI addawsEc2query_serdeOpDescribeIdentityIdFormatMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeImageAttribute.go b/service/ec2/api_op_DescribeImageAttribute.go index 16f6c89f947..0e0f038e5b0 100644 --- a/service/ec2/api_op_DescribeImageAttribute.go +++ b/service/ec2/api_op_DescribeImageAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeImageAttribute(ctx context.Context, params *DescribeIma addawsEc2query_serdeOpDescribeImageAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeImages.go b/service/ec2/api_op_DescribeImages.go index 7d44394c797..7461d0010db 100644 --- a/service/ec2/api_op_DescribeImages.go +++ b/service/ec2/api_op_DescribeImages.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DescribeImages(ctx context.Context, params *DescribeImagesInput addawsEc2query_serdeOpDescribeImagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeImportImageTasks.go b/service/ec2/api_op_DescribeImportImageTasks.go index 8e629e03d82..be19e461f42 100644 --- a/service/ec2/api_op_DescribeImportImageTasks.go +++ b/service/ec2/api_op_DescribeImportImageTasks.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeImportImageTasks(ctx context.Context, params *DescribeI addawsEc2query_serdeOpDescribeImportImageTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeImportSnapshotTasks.go b/service/ec2/api_op_DescribeImportSnapshotTasks.go index ad12230563f..600ce1bf769 100644 --- a/service/ec2/api_op_DescribeImportSnapshotTasks.go +++ b/service/ec2/api_op_DescribeImportSnapshotTasks.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeImportSnapshotTasks(ctx context.Context, params *Descri addawsEc2query_serdeOpDescribeImportSnapshotTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeInstanceAttribute.go b/service/ec2/api_op_DescribeInstanceAttribute.go index f7560c8a192..53ce67c27f4 100644 --- a/service/ec2/api_op_DescribeInstanceAttribute.go +++ b/service/ec2/api_op_DescribeInstanceAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeInstanceAttribute(ctx context.Context, params *Describe addawsEc2query_serdeOpDescribeInstanceAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeInstanceCreditSpecifications.go b/service/ec2/api_op_DescribeInstanceCreditSpecifications.go index 5febffd8b3b..a95397c5ef7 100644 --- a/service/ec2/api_op_DescribeInstanceCreditSpecifications.go +++ b/service/ec2/api_op_DescribeInstanceCreditSpecifications.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) DescribeInstanceCreditSpecifications(ctx context.Context, param addawsEc2query_serdeOpDescribeInstanceCreditSpecificationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeInstanceEventNotificationAttributes.go b/service/ec2/api_op_DescribeInstanceEventNotificationAttributes.go index 6dd2f7bbd9b..04fc5fc67b0 100644 --- a/service/ec2/api_op_DescribeInstanceEventNotificationAttributes.go +++ b/service/ec2/api_op_DescribeInstanceEventNotificationAttributes.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeInstanceEventNotificationAttributes(ctx context.Context addawsEc2query_serdeOpDescribeInstanceEventNotificationAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeInstanceStatus.go b/service/ec2/api_op_DescribeInstanceStatus.go index 9c3ab501e63..1d86d4c180d 100644 --- a/service/ec2/api_op_DescribeInstanceStatus.go +++ b/service/ec2/api_op_DescribeInstanceStatus.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) DescribeInstanceStatus(ctx context.Context, params *DescribeIns addawsEc2query_serdeOpDescribeInstanceStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeInstanceTypeOfferings.go b/service/ec2/api_op_DescribeInstanceTypeOfferings.go index 63945cb6b20..37520710061 100644 --- a/service/ec2/api_op_DescribeInstanceTypeOfferings.go +++ b/service/ec2/api_op_DescribeInstanceTypeOfferings.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeInstanceTypeOfferings(ctx context.Context, params *Desc addawsEc2query_serdeOpDescribeInstanceTypeOfferingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeInstanceTypes.go b/service/ec2/api_op_DescribeInstanceTypes.go index 7b1234c6a0c..9ef20f97e52 100644 --- a/service/ec2/api_op_DescribeInstanceTypes.go +++ b/service/ec2/api_op_DescribeInstanceTypes.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeInstanceTypes(ctx context.Context, params *DescribeInst addawsEc2query_serdeOpDescribeInstanceTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeInstances.go b/service/ec2/api_op_DescribeInstances.go index 87d79e96838..db6554e3c8b 100644 --- a/service/ec2/api_op_DescribeInstances.go +++ b/service/ec2/api_op_DescribeInstances.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) DescribeInstances(ctx context.Context, params *DescribeInstance addawsEc2query_serdeOpDescribeInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeInternetGateways.go b/service/ec2/api_op_DescribeInternetGateways.go index e8607ec8de3..c49575893b1 100644 --- a/service/ec2/api_op_DescribeInternetGateways.go +++ b/service/ec2/api_op_DescribeInternetGateways.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeInternetGateways(ctx context.Context, params *DescribeI addawsEc2query_serdeOpDescribeInternetGatewaysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeIpv6Pools.go b/service/ec2/api_op_DescribeIpv6Pools.go index 95f382be4eb..1f327c771aa 100644 --- a/service/ec2/api_op_DescribeIpv6Pools.go +++ b/service/ec2/api_op_DescribeIpv6Pools.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeIpv6Pools(ctx context.Context, params *DescribeIpv6Pool addawsEc2query_serdeOpDescribeIpv6PoolsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeKeyPairs.go b/service/ec2/api_op_DescribeKeyPairs.go index de9b032cacd..ddfd9912d1b 100644 --- a/service/ec2/api_op_DescribeKeyPairs.go +++ b/service/ec2/api_op_DescribeKeyPairs.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeKeyPairs(ctx context.Context, params *DescribeKeyPairsI addawsEc2query_serdeOpDescribeKeyPairsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeLaunchTemplateVersions.go b/service/ec2/api_op_DescribeLaunchTemplateVersions.go index 7bcce79152e..14ba55aba07 100644 --- a/service/ec2/api_op_DescribeLaunchTemplateVersions.go +++ b/service/ec2/api_op_DescribeLaunchTemplateVersions.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeLaunchTemplateVersions(ctx context.Context, params *Des addawsEc2query_serdeOpDescribeLaunchTemplateVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeLaunchTemplates.go b/service/ec2/api_op_DescribeLaunchTemplates.go index d5c8edd1b85..babeed311c2 100644 --- a/service/ec2/api_op_DescribeLaunchTemplates.go +++ b/service/ec2/api_op_DescribeLaunchTemplates.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeLaunchTemplates(ctx context.Context, params *DescribeLa addawsEc2query_serdeOpDescribeLaunchTemplatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociations.go b/service/ec2/api_op_DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociations.go index f5cc9320ad4..a2f8a55555b 100644 --- a/service/ec2/api_op_DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociations.go +++ b/service/ec2/api_op_DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociations.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociations addawsEc2query_serdeOpDescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeLocalGatewayRouteTableVpcAssociations.go b/service/ec2/api_op_DescribeLocalGatewayRouteTableVpcAssociations.go index 5a48909ba69..b69079ed908 100644 --- a/service/ec2/api_op_DescribeLocalGatewayRouteTableVpcAssociations.go +++ b/service/ec2/api_op_DescribeLocalGatewayRouteTableVpcAssociations.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeLocalGatewayRouteTableVpcAssociations(ctx context.Conte addawsEc2query_serdeOpDescribeLocalGatewayRouteTableVpcAssociationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeLocalGatewayRouteTables.go b/service/ec2/api_op_DescribeLocalGatewayRouteTables.go index 40cf7dec7cc..f552776b2cb 100644 --- a/service/ec2/api_op_DescribeLocalGatewayRouteTables.go +++ b/service/ec2/api_op_DescribeLocalGatewayRouteTables.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeLocalGatewayRouteTables(ctx context.Context, params *De addawsEc2query_serdeOpDescribeLocalGatewayRouteTablesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeLocalGatewayVirtualInterfaceGroups.go b/service/ec2/api_op_DescribeLocalGatewayVirtualInterfaceGroups.go index 0208418497b..8eed4ed2eac 100644 --- a/service/ec2/api_op_DescribeLocalGatewayVirtualInterfaceGroups.go +++ b/service/ec2/api_op_DescribeLocalGatewayVirtualInterfaceGroups.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeLocalGatewayVirtualInterfaceGroups(ctx context.Context, addawsEc2query_serdeOpDescribeLocalGatewayVirtualInterfaceGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeLocalGatewayVirtualInterfaces.go b/service/ec2/api_op_DescribeLocalGatewayVirtualInterfaces.go index 1a366350cfb..c3b164783a8 100644 --- a/service/ec2/api_op_DescribeLocalGatewayVirtualInterfaces.go +++ b/service/ec2/api_op_DescribeLocalGatewayVirtualInterfaces.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeLocalGatewayVirtualInterfaces(ctx context.Context, para addawsEc2query_serdeOpDescribeLocalGatewayVirtualInterfacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeLocalGateways.go b/service/ec2/api_op_DescribeLocalGateways.go index afe82437a14..ea78e4c4965 100644 --- a/service/ec2/api_op_DescribeLocalGateways.go +++ b/service/ec2/api_op_DescribeLocalGateways.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeLocalGateways(ctx context.Context, params *DescribeLoca addawsEc2query_serdeOpDescribeLocalGatewaysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeManagedPrefixLists.go b/service/ec2/api_op_DescribeManagedPrefixLists.go index 07ede54a33c..10583c2f5fd 100644 --- a/service/ec2/api_op_DescribeManagedPrefixLists.go +++ b/service/ec2/api_op_DescribeManagedPrefixLists.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeManagedPrefixLists(ctx context.Context, params *Describ addawsEc2query_serdeOpDescribeManagedPrefixListsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeMovingAddresses.go b/service/ec2/api_op_DescribeMovingAddresses.go index 6324bd55647..aa249abbf77 100644 --- a/service/ec2/api_op_DescribeMovingAddresses.go +++ b/service/ec2/api_op_DescribeMovingAddresses.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeMovingAddresses(ctx context.Context, params *DescribeMo addawsEc2query_serdeOpDescribeMovingAddressesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeNatGateways.go b/service/ec2/api_op_DescribeNatGateways.go index 557c966ea48..d63efa49831 100644 --- a/service/ec2/api_op_DescribeNatGateways.go +++ b/service/ec2/api_op_DescribeNatGateways.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeNatGateways(ctx context.Context, params *DescribeNatGat addawsEc2query_serdeOpDescribeNatGatewaysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeNetworkAcls.go b/service/ec2/api_op_DescribeNetworkAcls.go index 55bf08874e3..8dbe2d98b6f 100644 --- a/service/ec2/api_op_DescribeNetworkAcls.go +++ b/service/ec2/api_op_DescribeNetworkAcls.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeNetworkAcls(ctx context.Context, params *DescribeNetwor addawsEc2query_serdeOpDescribeNetworkAclsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeNetworkInterfaceAttribute.go b/service/ec2/api_op_DescribeNetworkInterfaceAttribute.go index ee3b4ba8260..4d9b0ba0a47 100644 --- a/service/ec2/api_op_DescribeNetworkInterfaceAttribute.go +++ b/service/ec2/api_op_DescribeNetworkInterfaceAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeNetworkInterfaceAttribute(ctx context.Context, params * addawsEc2query_serdeOpDescribeNetworkInterfaceAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeNetworkInterfacePermissions.go b/service/ec2/api_op_DescribeNetworkInterfacePermissions.go index 2514281039d..4408b6f3798 100644 --- a/service/ec2/api_op_DescribeNetworkInterfacePermissions.go +++ b/service/ec2/api_op_DescribeNetworkInterfacePermissions.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeNetworkInterfacePermissions(ctx context.Context, params addawsEc2query_serdeOpDescribeNetworkInterfacePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeNetworkInterfaces.go b/service/ec2/api_op_DescribeNetworkInterfaces.go index 47a50e201d6..d77121f5ce1 100644 --- a/service/ec2/api_op_DescribeNetworkInterfaces.go +++ b/service/ec2/api_op_DescribeNetworkInterfaces.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeNetworkInterfaces(ctx context.Context, params *Describe addawsEc2query_serdeOpDescribeNetworkInterfacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribePlacementGroups.go b/service/ec2/api_op_DescribePlacementGroups.go index c8107030210..65c080881da 100644 --- a/service/ec2/api_op_DescribePlacementGroups.go +++ b/service/ec2/api_op_DescribePlacementGroups.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribePlacementGroups(ctx context.Context, params *DescribePl addawsEc2query_serdeOpDescribePlacementGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribePrefixLists.go b/service/ec2/api_op_DescribePrefixLists.go index 7b5ba1bb5ba..4691390dfe0 100644 --- a/service/ec2/api_op_DescribePrefixLists.go +++ b/service/ec2/api_op_DescribePrefixLists.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribePrefixLists(ctx context.Context, params *DescribePrefix addawsEc2query_serdeOpDescribePrefixListsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribePrincipalIdFormat.go b/service/ec2/api_op_DescribePrincipalIdFormat.go index 42ec657a970..9fa03b7f06a 100644 --- a/service/ec2/api_op_DescribePrincipalIdFormat.go +++ b/service/ec2/api_op_DescribePrincipalIdFormat.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) DescribePrincipalIdFormat(ctx context.Context, params *Describe addawsEc2query_serdeOpDescribePrincipalIdFormatMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribePublicIpv4Pools.go b/service/ec2/api_op_DescribePublicIpv4Pools.go index 06e5b378196..5ff91512508 100644 --- a/service/ec2/api_op_DescribePublicIpv4Pools.go +++ b/service/ec2/api_op_DescribePublicIpv4Pools.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribePublicIpv4Pools(ctx context.Context, params *DescribePu addawsEc2query_serdeOpDescribePublicIpv4PoolsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeRegions.go b/service/ec2/api_op_DescribeRegions.go index 87ddaa36d87..41016dee901 100644 --- a/service/ec2/api_op_DescribeRegions.go +++ b/service/ec2/api_op_DescribeRegions.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeRegions(ctx context.Context, params *DescribeRegionsInp addawsEc2query_serdeOpDescribeRegionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeReservedInstances.go b/service/ec2/api_op_DescribeReservedInstances.go index 1be7664ae79..0ed0e50d263 100644 --- a/service/ec2/api_op_DescribeReservedInstances.go +++ b/service/ec2/api_op_DescribeReservedInstances.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeReservedInstances(ctx context.Context, params *Describe addawsEc2query_serdeOpDescribeReservedInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeReservedInstancesListings.go b/service/ec2/api_op_DescribeReservedInstancesListings.go index 388563e668b..a5adc55320f 100644 --- a/service/ec2/api_op_DescribeReservedInstancesListings.go +++ b/service/ec2/api_op_DescribeReservedInstancesListings.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) DescribeReservedInstancesListings(ctx context.Context, params * addawsEc2query_serdeOpDescribeReservedInstancesListingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeReservedInstancesModifications.go b/service/ec2/api_op_DescribeReservedInstancesModifications.go index e536b7acf95..abf39f456a2 100644 --- a/service/ec2/api_op_DescribeReservedInstancesModifications.go +++ b/service/ec2/api_op_DescribeReservedInstancesModifications.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeReservedInstancesModifications(ctx context.Context, par addawsEc2query_serdeOpDescribeReservedInstancesModificationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeReservedInstancesOfferings.go b/service/ec2/api_op_DescribeReservedInstancesOfferings.go index 3ca8668f4f6..6c85a2c0edb 100644 --- a/service/ec2/api_op_DescribeReservedInstancesOfferings.go +++ b/service/ec2/api_op_DescribeReservedInstancesOfferings.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) DescribeReservedInstancesOfferings(ctx context.Context, params addawsEc2query_serdeOpDescribeReservedInstancesOfferingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeRouteTables.go b/service/ec2/api_op_DescribeRouteTables.go index b86cec9aef9..bd06cb10835 100644 --- a/service/ec2/api_op_DescribeRouteTables.go +++ b/service/ec2/api_op_DescribeRouteTables.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeRouteTables(ctx context.Context, params *DescribeRouteT addawsEc2query_serdeOpDescribeRouteTablesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeScheduledInstanceAvailability.go b/service/ec2/api_op_DescribeScheduledInstanceAvailability.go index 16c91405087..b6ad7eebc34 100644 --- a/service/ec2/api_op_DescribeScheduledInstanceAvailability.go +++ b/service/ec2/api_op_DescribeScheduledInstanceAvailability.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeScheduledInstanceAvailability(ctx context.Context, para addawsEc2query_serdeOpDescribeScheduledInstanceAvailabilityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeScheduledInstances.go b/service/ec2/api_op_DescribeScheduledInstances.go index 6ca743fb74f..cabc1858cde 100644 --- a/service/ec2/api_op_DescribeScheduledInstances.go +++ b/service/ec2/api_op_DescribeScheduledInstances.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeScheduledInstances(ctx context.Context, params *Describ addawsEc2query_serdeOpDescribeScheduledInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeSecurityGroupReferences.go b/service/ec2/api_op_DescribeSecurityGroupReferences.go index 9637ee623a1..b4226040122 100644 --- a/service/ec2/api_op_DescribeSecurityGroupReferences.go +++ b/service/ec2/api_op_DescribeSecurityGroupReferences.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeSecurityGroupReferences(ctx context.Context, params *De addawsEc2query_serdeOpDescribeSecurityGroupReferencesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeSecurityGroups.go b/service/ec2/api_op_DescribeSecurityGroups.go index c9af246ffb4..d5a6362956b 100644 --- a/service/ec2/api_op_DescribeSecurityGroups.go +++ b/service/ec2/api_op_DescribeSecurityGroups.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeSecurityGroups(ctx context.Context, params *DescribeSec addawsEc2query_serdeOpDescribeSecurityGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeSnapshotAttribute.go b/service/ec2/api_op_DescribeSnapshotAttribute.go index 6f488b7dfac..e5fca7e3b56 100644 --- a/service/ec2/api_op_DescribeSnapshotAttribute.go +++ b/service/ec2/api_op_DescribeSnapshotAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeSnapshotAttribute(ctx context.Context, params *Describe addawsEc2query_serdeOpDescribeSnapshotAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeSnapshots.go b/service/ec2/api_op_DescribeSnapshots.go index 6ba455ca101..2ffa9614244 100644 --- a/service/ec2/api_op_DescribeSnapshots.go +++ b/service/ec2/api_op_DescribeSnapshots.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -64,9 +63,9 @@ func (c *Client) DescribeSnapshots(ctx context.Context, params *DescribeSnapshot addawsEc2query_serdeOpDescribeSnapshotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeSpotDatafeedSubscription.go b/service/ec2/api_op_DescribeSpotDatafeedSubscription.go index feb439a8f07..023f9ed89b7 100644 --- a/service/ec2/api_op_DescribeSpotDatafeedSubscription.go +++ b/service/ec2/api_op_DescribeSpotDatafeedSubscription.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeSpotDatafeedSubscription(ctx context.Context, params *D addawsEc2query_serdeOpDescribeSpotDatafeedSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeSpotFleetInstances.go b/service/ec2/api_op_DescribeSpotFleetInstances.go index c098a2fcfc6..c7e5ea74025 100644 --- a/service/ec2/api_op_DescribeSpotFleetInstances.go +++ b/service/ec2/api_op_DescribeSpotFleetInstances.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeSpotFleetInstances(ctx context.Context, params *Describ addawsEc2query_serdeOpDescribeSpotFleetInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeSpotFleetRequestHistory.go b/service/ec2/api_op_DescribeSpotFleetRequestHistory.go index 4324de55c77..d3a9600bcf8 100644 --- a/service/ec2/api_op_DescribeSpotFleetRequestHistory.go +++ b/service/ec2/api_op_DescribeSpotFleetRequestHistory.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeSpotFleetRequestHistory(ctx context.Context, params *De addawsEc2query_serdeOpDescribeSpotFleetRequestHistoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeSpotFleetRequests.go b/service/ec2/api_op_DescribeSpotFleetRequests.go index cdc375900b8..b583831014b 100644 --- a/service/ec2/api_op_DescribeSpotFleetRequests.go +++ b/service/ec2/api_op_DescribeSpotFleetRequests.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeSpotFleetRequests(ctx context.Context, params *Describe addawsEc2query_serdeOpDescribeSpotFleetRequestsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeSpotInstanceRequests.go b/service/ec2/api_op_DescribeSpotInstanceRequests.go index 660919a9935..6887978bfdd 100644 --- a/service/ec2/api_op_DescribeSpotInstanceRequests.go +++ b/service/ec2/api_op_DescribeSpotInstanceRequests.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) DescribeSpotInstanceRequests(ctx context.Context, params *Descr addawsEc2query_serdeOpDescribeSpotInstanceRequestsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeSpotPriceHistory.go b/service/ec2/api_op_DescribeSpotPriceHistory.go index ede2ee8e6cd..826d1cd4d26 100644 --- a/service/ec2/api_op_DescribeSpotPriceHistory.go +++ b/service/ec2/api_op_DescribeSpotPriceHistory.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DescribeSpotPriceHistory(ctx context.Context, params *DescribeS addawsEc2query_serdeOpDescribeSpotPriceHistoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeStaleSecurityGroups.go b/service/ec2/api_op_DescribeStaleSecurityGroups.go index 078057f92dc..0f65a1643a1 100644 --- a/service/ec2/api_op_DescribeStaleSecurityGroups.go +++ b/service/ec2/api_op_DescribeStaleSecurityGroups.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeStaleSecurityGroups(ctx context.Context, params *Descri addawsEc2query_serdeOpDescribeStaleSecurityGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeSubnets.go b/service/ec2/api_op_DescribeSubnets.go index 59d09667cfe..477eb1d99e9 100644 --- a/service/ec2/api_op_DescribeSubnets.go +++ b/service/ec2/api_op_DescribeSubnets.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeSubnets(ctx context.Context, params *DescribeSubnetsInp addawsEc2query_serdeOpDescribeSubnetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeTags.go b/service/ec2/api_op_DescribeTags.go index e033a4eb1c4..027857882f7 100644 --- a/service/ec2/api_op_DescribeTags.go +++ b/service/ec2/api_op_DescribeTags.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeTags(ctx context.Context, params *DescribeTagsInput, op addawsEc2query_serdeOpDescribeTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeTrafficMirrorFilters.go b/service/ec2/api_op_DescribeTrafficMirrorFilters.go index 7ad5ff6991b..4c86bc504b8 100644 --- a/service/ec2/api_op_DescribeTrafficMirrorFilters.go +++ b/service/ec2/api_op_DescribeTrafficMirrorFilters.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeTrafficMirrorFilters(ctx context.Context, params *Descr addawsEc2query_serdeOpDescribeTrafficMirrorFiltersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeTrafficMirrorSessions.go b/service/ec2/api_op_DescribeTrafficMirrorSessions.go index 638b59e7510..f1ec796eb20 100644 --- a/service/ec2/api_op_DescribeTrafficMirrorSessions.go +++ b/service/ec2/api_op_DescribeTrafficMirrorSessions.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeTrafficMirrorSessions(ctx context.Context, params *Desc addawsEc2query_serdeOpDescribeTrafficMirrorSessionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeTrafficMirrorTargets.go b/service/ec2/api_op_DescribeTrafficMirrorTargets.go index 11c30e523e9..32cf96bdea5 100644 --- a/service/ec2/api_op_DescribeTrafficMirrorTargets.go +++ b/service/ec2/api_op_DescribeTrafficMirrorTargets.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeTrafficMirrorTargets(ctx context.Context, params *Descr addawsEc2query_serdeOpDescribeTrafficMirrorTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeTransitGatewayAttachments.go b/service/ec2/api_op_DescribeTransitGatewayAttachments.go index 928289eed1c..84f01fe936f 100644 --- a/service/ec2/api_op_DescribeTransitGatewayAttachments.go +++ b/service/ec2/api_op_DescribeTransitGatewayAttachments.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeTransitGatewayAttachments(ctx context.Context, params * addawsEc2query_serdeOpDescribeTransitGatewayAttachmentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeTransitGatewayMulticastDomains.go b/service/ec2/api_op_DescribeTransitGatewayMulticastDomains.go index e6312736033..696ad96f966 100644 --- a/service/ec2/api_op_DescribeTransitGatewayMulticastDomains.go +++ b/service/ec2/api_op_DescribeTransitGatewayMulticastDomains.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeTransitGatewayMulticastDomains(ctx context.Context, par addawsEc2query_serdeOpDescribeTransitGatewayMulticastDomainsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeTransitGatewayPeeringAttachments.go b/service/ec2/api_op_DescribeTransitGatewayPeeringAttachments.go index 51a79c2391e..cbb0beaa0f7 100644 --- a/service/ec2/api_op_DescribeTransitGatewayPeeringAttachments.go +++ b/service/ec2/api_op_DescribeTransitGatewayPeeringAttachments.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeTransitGatewayPeeringAttachments(ctx context.Context, p addawsEc2query_serdeOpDescribeTransitGatewayPeeringAttachmentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeTransitGatewayRouteTables.go b/service/ec2/api_op_DescribeTransitGatewayRouteTables.go index 50b9165027b..7871ab8bd72 100644 --- a/service/ec2/api_op_DescribeTransitGatewayRouteTables.go +++ b/service/ec2/api_op_DescribeTransitGatewayRouteTables.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeTransitGatewayRouteTables(ctx context.Context, params * addawsEc2query_serdeOpDescribeTransitGatewayRouteTablesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeTransitGatewayVpcAttachments.go b/service/ec2/api_op_DescribeTransitGatewayVpcAttachments.go index 6efc86f705a..f7148075b78 100644 --- a/service/ec2/api_op_DescribeTransitGatewayVpcAttachments.go +++ b/service/ec2/api_op_DescribeTransitGatewayVpcAttachments.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeTransitGatewayVpcAttachments(ctx context.Context, param addawsEc2query_serdeOpDescribeTransitGatewayVpcAttachmentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeTransitGateways.go b/service/ec2/api_op_DescribeTransitGateways.go index ea60c8c6f5a..9ee50c6a185 100644 --- a/service/ec2/api_op_DescribeTransitGateways.go +++ b/service/ec2/api_op_DescribeTransitGateways.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeTransitGateways(ctx context.Context, params *DescribeTr addawsEc2query_serdeOpDescribeTransitGatewaysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeVolumeAttribute.go b/service/ec2/api_op_DescribeVolumeAttribute.go index a097e673034..af8470c4cd2 100644 --- a/service/ec2/api_op_DescribeVolumeAttribute.go +++ b/service/ec2/api_op_DescribeVolumeAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeVolumeAttribute(ctx context.Context, params *DescribeVo addawsEc2query_serdeOpDescribeVolumeAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeVolumeStatus.go b/service/ec2/api_op_DescribeVolumeStatus.go index 22e99022595..57960545f86 100644 --- a/service/ec2/api_op_DescribeVolumeStatus.go +++ b/service/ec2/api_op_DescribeVolumeStatus.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -51,9 +50,9 @@ func (c *Client) DescribeVolumeStatus(ctx context.Context, params *DescribeVolum addawsEc2query_serdeOpDescribeVolumeStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeVolumes.go b/service/ec2/api_op_DescribeVolumes.go index 0476d20b66f..4f5303ac32b 100644 --- a/service/ec2/api_op_DescribeVolumes.go +++ b/service/ec2/api_op_DescribeVolumes.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DescribeVolumes(ctx context.Context, params *DescribeVolumesInp addawsEc2query_serdeOpDescribeVolumesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeVolumesModifications.go b/service/ec2/api_op_DescribeVolumesModifications.go index 7e417f29ffb..854eacec8dc 100644 --- a/service/ec2/api_op_DescribeVolumesModifications.go +++ b/service/ec2/api_op_DescribeVolumesModifications.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) DescribeVolumesModifications(ctx context.Context, params *Descr addawsEc2query_serdeOpDescribeVolumesModificationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeVpcAttribute.go b/service/ec2/api_op_DescribeVpcAttribute.go index 6775c8177a6..e6af93968ef 100644 --- a/service/ec2/api_op_DescribeVpcAttribute.go +++ b/service/ec2/api_op_DescribeVpcAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeVpcAttribute(ctx context.Context, params *DescribeVpcAt addawsEc2query_serdeOpDescribeVpcAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeVpcClassicLink.go b/service/ec2/api_op_DescribeVpcClassicLink.go index b7cc8f40d59..fd8e2e03582 100644 --- a/service/ec2/api_op_DescribeVpcClassicLink.go +++ b/service/ec2/api_op_DescribeVpcClassicLink.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeVpcClassicLink(ctx context.Context, params *DescribeVpc addawsEc2query_serdeOpDescribeVpcClassicLinkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeVpcClassicLinkDnsSupport.go b/service/ec2/api_op_DescribeVpcClassicLinkDnsSupport.go index 028b667e103..4661593d949 100644 --- a/service/ec2/api_op_DescribeVpcClassicLinkDnsSupport.go +++ b/service/ec2/api_op_DescribeVpcClassicLinkDnsSupport.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DescribeVpcClassicLinkDnsSupport(ctx context.Context, params *D addawsEc2query_serdeOpDescribeVpcClassicLinkDnsSupportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeVpcEndpointConnectionNotifications.go b/service/ec2/api_op_DescribeVpcEndpointConnectionNotifications.go index f7db491e339..98bd7121f3e 100644 --- a/service/ec2/api_op_DescribeVpcEndpointConnectionNotifications.go +++ b/service/ec2/api_op_DescribeVpcEndpointConnectionNotifications.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeVpcEndpointConnectionNotifications(ctx context.Context, addawsEc2query_serdeOpDescribeVpcEndpointConnectionNotificationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeVpcEndpointConnections.go b/service/ec2/api_op_DescribeVpcEndpointConnections.go index 56045dc8cb2..cbd86176ea7 100644 --- a/service/ec2/api_op_DescribeVpcEndpointConnections.go +++ b/service/ec2/api_op_DescribeVpcEndpointConnections.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeVpcEndpointConnections(ctx context.Context, params *Des addawsEc2query_serdeOpDescribeVpcEndpointConnectionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeVpcEndpointServiceConfigurations.go b/service/ec2/api_op_DescribeVpcEndpointServiceConfigurations.go index f084f17fdf0..780fce259ed 100644 --- a/service/ec2/api_op_DescribeVpcEndpointServiceConfigurations.go +++ b/service/ec2/api_op_DescribeVpcEndpointServiceConfigurations.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeVpcEndpointServiceConfigurations(ctx context.Context, p addawsEc2query_serdeOpDescribeVpcEndpointServiceConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeVpcEndpointServicePermissions.go b/service/ec2/api_op_DescribeVpcEndpointServicePermissions.go index 6acf2c6f918..7a75bf77a2c 100644 --- a/service/ec2/api_op_DescribeVpcEndpointServicePermissions.go +++ b/service/ec2/api_op_DescribeVpcEndpointServicePermissions.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeVpcEndpointServicePermissions(ctx context.Context, para addawsEc2query_serdeOpDescribeVpcEndpointServicePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeVpcEndpointServices.go b/service/ec2/api_op_DescribeVpcEndpointServices.go index 2309a0b439e..6bacf36fba5 100644 --- a/service/ec2/api_op_DescribeVpcEndpointServices.go +++ b/service/ec2/api_op_DescribeVpcEndpointServices.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeVpcEndpointServices(ctx context.Context, params *Descri addawsEc2query_serdeOpDescribeVpcEndpointServicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeVpcEndpoints.go b/service/ec2/api_op_DescribeVpcEndpoints.go index 006fca6dbdd..cfb77e0331f 100644 --- a/service/ec2/api_op_DescribeVpcEndpoints.go +++ b/service/ec2/api_op_DescribeVpcEndpoints.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeVpcEndpoints(ctx context.Context, params *DescribeVpcEn addawsEc2query_serdeOpDescribeVpcEndpointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeVpcPeeringConnections.go b/service/ec2/api_op_DescribeVpcPeeringConnections.go index 45f90139536..738abdf9ee3 100644 --- a/service/ec2/api_op_DescribeVpcPeeringConnections.go +++ b/service/ec2/api_op_DescribeVpcPeeringConnections.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeVpcPeeringConnections(ctx context.Context, params *Desc addawsEc2query_serdeOpDescribeVpcPeeringConnectionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeVpcs.go b/service/ec2/api_op_DescribeVpcs.go index 218100215bd..89d6c5b0d5f 100644 --- a/service/ec2/api_op_DescribeVpcs.go +++ b/service/ec2/api_op_DescribeVpcs.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeVpcs(ctx context.Context, params *DescribeVpcsInput, op addawsEc2query_serdeOpDescribeVpcsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeVpnConnections.go b/service/ec2/api_op_DescribeVpnConnections.go index b616a7ebf82..1b716913768 100644 --- a/service/ec2/api_op_DescribeVpnConnections.go +++ b/service/ec2/api_op_DescribeVpnConnections.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeVpnConnections(ctx context.Context, params *DescribeVpn addawsEc2query_serdeOpDescribeVpnConnectionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DescribeVpnGateways.go b/service/ec2/api_op_DescribeVpnGateways.go index 22306a4f8d3..add84d6149a 100644 --- a/service/ec2/api_op_DescribeVpnGateways.go +++ b/service/ec2/api_op_DescribeVpnGateways.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeVpnGateways(ctx context.Context, params *DescribeVpnGat addawsEc2query_serdeOpDescribeVpnGatewaysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DetachClassicLinkVpc.go b/service/ec2/api_op_DetachClassicLinkVpc.go index 73a74fdb885..36866f03a8c 100644 --- a/service/ec2/api_op_DetachClassicLinkVpc.go +++ b/service/ec2/api_op_DetachClassicLinkVpc.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DetachClassicLinkVpc(ctx context.Context, params *DetachClassic addawsEc2query_serdeOpDetachClassicLinkVpcMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DetachInternetGateway.go b/service/ec2/api_op_DetachInternetGateway.go index 4add7dcd28b..68111997c83 100644 --- a/service/ec2/api_op_DetachInternetGateway.go +++ b/service/ec2/api_op_DetachInternetGateway.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DetachInternetGateway(ctx context.Context, params *DetachIntern addawsEc2query_serdeOpDetachInternetGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DetachNetworkInterface.go b/service/ec2/api_op_DetachNetworkInterface.go index fd610a6d545..3904b97ff9e 100644 --- a/service/ec2/api_op_DetachNetworkInterface.go +++ b/service/ec2/api_op_DetachNetworkInterface.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DetachNetworkInterface(ctx context.Context, params *DetachNetwo addawsEc2query_serdeOpDetachNetworkInterfaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DetachVolume.go b/service/ec2/api_op_DetachVolume.go index 7b37f4fd97a..99cafe8d142 100644 --- a/service/ec2/api_op_DetachVolume.go +++ b/service/ec2/api_op_DetachVolume.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) DetachVolume(ctx context.Context, params *DetachVolumeInput, op addawsEc2query_serdeOpDetachVolumeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DetachVpnGateway.go b/service/ec2/api_op_DetachVpnGateway.go index 4d251bebd2e..d8086bc975f 100644 --- a/service/ec2/api_op_DetachVpnGateway.go +++ b/service/ec2/api_op_DetachVpnGateway.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DetachVpnGateway(ctx context.Context, params *DetachVpnGatewayI addawsEc2query_serdeOpDetachVpnGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DisableEbsEncryptionByDefault.go b/service/ec2/api_op_DisableEbsEncryptionByDefault.go index b7945eed599..a6790bbffca 100644 --- a/service/ec2/api_op_DisableEbsEncryptionByDefault.go +++ b/service/ec2/api_op_DisableEbsEncryptionByDefault.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DisableEbsEncryptionByDefault(ctx context.Context, params *Disa addawsEc2query_serdeOpDisableEbsEncryptionByDefaultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DisableFastSnapshotRestores.go b/service/ec2/api_op_DisableFastSnapshotRestores.go index e5ebd93596d..affc8a94f23 100644 --- a/service/ec2/api_op_DisableFastSnapshotRestores.go +++ b/service/ec2/api_op_DisableFastSnapshotRestores.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DisableFastSnapshotRestores(ctx context.Context, params *Disabl addawsEc2query_serdeOpDisableFastSnapshotRestoresMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DisableTransitGatewayRouteTablePropagation.go b/service/ec2/api_op_DisableTransitGatewayRouteTablePropagation.go index 7ca0d790319..84eccc322ea 100644 --- a/service/ec2/api_op_DisableTransitGatewayRouteTablePropagation.go +++ b/service/ec2/api_op_DisableTransitGatewayRouteTablePropagation.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DisableTransitGatewayRouteTablePropagation(ctx context.Context, addawsEc2query_serdeOpDisableTransitGatewayRouteTablePropagationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DisableVgwRoutePropagation.go b/service/ec2/api_op_DisableVgwRoutePropagation.go index 6928058ae35..c84e12f8ea8 100644 --- a/service/ec2/api_op_DisableVgwRoutePropagation.go +++ b/service/ec2/api_op_DisableVgwRoutePropagation.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisableVgwRoutePropagation(ctx context.Context, params *Disable addawsEc2query_serdeOpDisableVgwRoutePropagationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DisableVpcClassicLink.go b/service/ec2/api_op_DisableVpcClassicLink.go index d598363daf7..b1688509914 100644 --- a/service/ec2/api_op_DisableVpcClassicLink.go +++ b/service/ec2/api_op_DisableVpcClassicLink.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisableVpcClassicLink(ctx context.Context, params *DisableVpcCl addawsEc2query_serdeOpDisableVpcClassicLinkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DisableVpcClassicLinkDnsSupport.go b/service/ec2/api_op_DisableVpcClassicLinkDnsSupport.go index 98f9abdb67b..911706ebc24 100644 --- a/service/ec2/api_op_DisableVpcClassicLinkDnsSupport.go +++ b/service/ec2/api_op_DisableVpcClassicLinkDnsSupport.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DisableVpcClassicLinkDnsSupport(ctx context.Context, params *Di addawsEc2query_serdeOpDisableVpcClassicLinkDnsSupportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DisassociateAddress.go b/service/ec2/api_op_DisassociateAddress.go index 2d3441a7a54..3708ccbba12 100644 --- a/service/ec2/api_op_DisassociateAddress.go +++ b/service/ec2/api_op_DisassociateAddress.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DisassociateAddress(ctx context.Context, params *DisassociateAd addawsEc2query_serdeOpDisassociateAddressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DisassociateClientVpnTargetNetwork.go b/service/ec2/api_op_DisassociateClientVpnTargetNetwork.go index e2e38bf5dea..4d165bec91e 100644 --- a/service/ec2/api_op_DisassociateClientVpnTargetNetwork.go +++ b/service/ec2/api_op_DisassociateClientVpnTargetNetwork.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) DisassociateClientVpnTargetNetwork(ctx context.Context, params addawsEc2query_serdeOpDisassociateClientVpnTargetNetworkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DisassociateIamInstanceProfile.go b/service/ec2/api_op_DisassociateIamInstanceProfile.go index 474ae8015db..215ed32b63a 100644 --- a/service/ec2/api_op_DisassociateIamInstanceProfile.go +++ b/service/ec2/api_op_DisassociateIamInstanceProfile.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DisassociateIamInstanceProfile(ctx context.Context, params *Dis addawsEc2query_serdeOpDisassociateIamInstanceProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DisassociateRouteTable.go b/service/ec2/api_op_DisassociateRouteTable.go index f2e1ef03baa..0ebc54dd1c8 100644 --- a/service/ec2/api_op_DisassociateRouteTable.go +++ b/service/ec2/api_op_DisassociateRouteTable.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DisassociateRouteTable(ctx context.Context, params *Disassociat addawsEc2query_serdeOpDisassociateRouteTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DisassociateSubnetCidrBlock.go b/service/ec2/api_op_DisassociateSubnetCidrBlock.go index ad396c2cff4..266db603bca 100644 --- a/service/ec2/api_op_DisassociateSubnetCidrBlock.go +++ b/service/ec2/api_op_DisassociateSubnetCidrBlock.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DisassociateSubnetCidrBlock(ctx context.Context, params *Disass addawsEc2query_serdeOpDisassociateSubnetCidrBlockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DisassociateTransitGatewayMulticastDomain.go b/service/ec2/api_op_DisassociateTransitGatewayMulticastDomain.go index 43238db4eb6..f6febbe3f6f 100644 --- a/service/ec2/api_op_DisassociateTransitGatewayMulticastDomain.go +++ b/service/ec2/api_op_DisassociateTransitGatewayMulticastDomain.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DisassociateTransitGatewayMulticastDomain(ctx context.Context, addawsEc2query_serdeOpDisassociateTransitGatewayMulticastDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DisassociateTransitGatewayRouteTable.go b/service/ec2/api_op_DisassociateTransitGatewayRouteTable.go index fe5556e97e3..47570ab7b4a 100644 --- a/service/ec2/api_op_DisassociateTransitGatewayRouteTable.go +++ b/service/ec2/api_op_DisassociateTransitGatewayRouteTable.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DisassociateTransitGatewayRouteTable(ctx context.Context, param addawsEc2query_serdeOpDisassociateTransitGatewayRouteTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_DisassociateVpcCidrBlock.go b/service/ec2/api_op_DisassociateVpcCidrBlock.go index 0a56a1f4063..646b1ac41c0 100644 --- a/service/ec2/api_op_DisassociateVpcCidrBlock.go +++ b/service/ec2/api_op_DisassociateVpcCidrBlock.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DisassociateVpcCidrBlock(ctx context.Context, params *Disassoci addawsEc2query_serdeOpDisassociateVpcCidrBlockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_EnableEbsEncryptionByDefault.go b/service/ec2/api_op_EnableEbsEncryptionByDefault.go index 31a59bb1f7d..da0c6c60b09 100644 --- a/service/ec2/api_op_EnableEbsEncryptionByDefault.go +++ b/service/ec2/api_op_EnableEbsEncryptionByDefault.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) EnableEbsEncryptionByDefault(ctx context.Context, params *Enabl addawsEc2query_serdeOpEnableEbsEncryptionByDefaultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_EnableFastSnapshotRestores.go b/service/ec2/api_op_EnableFastSnapshotRestores.go index a1698e79ad9..7dcaebbc4da 100644 --- a/service/ec2/api_op_EnableFastSnapshotRestores.go +++ b/service/ec2/api_op_EnableFastSnapshotRestores.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) EnableFastSnapshotRestores(ctx context.Context, params *EnableF addawsEc2query_serdeOpEnableFastSnapshotRestoresMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_EnableTransitGatewayRouteTablePropagation.go b/service/ec2/api_op_EnableTransitGatewayRouteTablePropagation.go index 901bf2224c2..1ce8f7f321a 100644 --- a/service/ec2/api_op_EnableTransitGatewayRouteTablePropagation.go +++ b/service/ec2/api_op_EnableTransitGatewayRouteTablePropagation.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) EnableTransitGatewayRouteTablePropagation(ctx context.Context, addawsEc2query_serdeOpEnableTransitGatewayRouteTablePropagationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_EnableVgwRoutePropagation.go b/service/ec2/api_op_EnableVgwRoutePropagation.go index 78ee91862b4..422f73c6ae4 100644 --- a/service/ec2/api_op_EnableVgwRoutePropagation.go +++ b/service/ec2/api_op_EnableVgwRoutePropagation.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) EnableVgwRoutePropagation(ctx context.Context, params *EnableVg addawsEc2query_serdeOpEnableVgwRoutePropagationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_EnableVolumeIO.go b/service/ec2/api_op_EnableVolumeIO.go index 45050983654..a173fa8a555 100644 --- a/service/ec2/api_op_EnableVolumeIO.go +++ b/service/ec2/api_op_EnableVolumeIO.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) EnableVolumeIO(ctx context.Context, params *EnableVolumeIOInput addawsEc2query_serdeOpEnableVolumeIOMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_EnableVpcClassicLink.go b/service/ec2/api_op_EnableVpcClassicLink.go index 4fc7cf8e053..93f6ee20a1a 100644 --- a/service/ec2/api_op_EnableVpcClassicLink.go +++ b/service/ec2/api_op_EnableVpcClassicLink.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) EnableVpcClassicLink(ctx context.Context, params *EnableVpcClas addawsEc2query_serdeOpEnableVpcClassicLinkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_EnableVpcClassicLinkDnsSupport.go b/service/ec2/api_op_EnableVpcClassicLinkDnsSupport.go index c3b7c7ce986..1982540c4ae 100644 --- a/service/ec2/api_op_EnableVpcClassicLinkDnsSupport.go +++ b/service/ec2/api_op_EnableVpcClassicLinkDnsSupport.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) EnableVpcClassicLinkDnsSupport(ctx context.Context, params *Ena addawsEc2query_serdeOpEnableVpcClassicLinkDnsSupportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ExportClientVpnClientCertificateRevocationList.go b/service/ec2/api_op_ExportClientVpnClientCertificateRevocationList.go index f3364167160..23e735519d3 100644 --- a/service/ec2/api_op_ExportClientVpnClientCertificateRevocationList.go +++ b/service/ec2/api_op_ExportClientVpnClientCertificateRevocationList.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ExportClientVpnClientCertificateRevocationList(ctx context.Cont addawsEc2query_serdeOpExportClientVpnClientCertificateRevocationListMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ExportClientVpnClientConfiguration.go b/service/ec2/api_op_ExportClientVpnClientConfiguration.go index 3d3476e3fd9..184f570ff63 100644 --- a/service/ec2/api_op_ExportClientVpnClientConfiguration.go +++ b/service/ec2/api_op_ExportClientVpnClientConfiguration.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) ExportClientVpnClientConfiguration(ctx context.Context, params addawsEc2query_serdeOpExportClientVpnClientConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ExportImage.go b/service/ec2/api_op_ExportImage.go index 640986d5b53..0281a1ef120 100644 --- a/service/ec2/api_op_ExportImage.go +++ b/service/ec2/api_op_ExportImage.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ExportImage(ctx context.Context, params *ExportImageInput, optF addawsEc2query_serdeOpExportImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ExportTransitGatewayRoutes.go b/service/ec2/api_op_ExportTransitGatewayRoutes.go index 81ef41f977c..1c7e8b96af5 100644 --- a/service/ec2/api_op_ExportTransitGatewayRoutes.go +++ b/service/ec2/api_op_ExportTransitGatewayRoutes.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ExportTransitGatewayRoutes(ctx context.Context, params *ExportT addawsEc2query_serdeOpExportTransitGatewayRoutesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetAssociatedIpv6PoolCidrs.go b/service/ec2/api_op_GetAssociatedIpv6PoolCidrs.go index e9c8d156c3c..2d72f606414 100644 --- a/service/ec2/api_op_GetAssociatedIpv6PoolCidrs.go +++ b/service/ec2/api_op_GetAssociatedIpv6PoolCidrs.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetAssociatedIpv6PoolCidrs(ctx context.Context, params *GetAsso addawsEc2query_serdeOpGetAssociatedIpv6PoolCidrsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetCapacityReservationUsage.go b/service/ec2/api_op_GetCapacityReservationUsage.go index 43c4bdef6c6..ca1277cfdea 100644 --- a/service/ec2/api_op_GetCapacityReservationUsage.go +++ b/service/ec2/api_op_GetCapacityReservationUsage.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetCapacityReservationUsage(ctx context.Context, params *GetCap addawsEc2query_serdeOpGetCapacityReservationUsageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetCoipPoolUsage.go b/service/ec2/api_op_GetCoipPoolUsage.go index 06b819cc298..6f8e34daef0 100644 --- a/service/ec2/api_op_GetCoipPoolUsage.go +++ b/service/ec2/api_op_GetCoipPoolUsage.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetCoipPoolUsage(ctx context.Context, params *GetCoipPoolUsageI addawsEc2query_serdeOpGetCoipPoolUsageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetConsoleOutput.go b/service/ec2/api_op_GetConsoleOutput.go index ff8453fdab6..6cbb94e0488 100644 --- a/service/ec2/api_op_GetConsoleOutput.go +++ b/service/ec2/api_op_GetConsoleOutput.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) GetConsoleOutput(ctx context.Context, params *GetConsoleOutputI addawsEc2query_serdeOpGetConsoleOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetConsoleScreenshot.go b/service/ec2/api_op_GetConsoleScreenshot.go index e095f58a59f..061d3e7d0d8 100644 --- a/service/ec2/api_op_GetConsoleScreenshot.go +++ b/service/ec2/api_op_GetConsoleScreenshot.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetConsoleScreenshot(ctx context.Context, params *GetConsoleScr addawsEc2query_serdeOpGetConsoleScreenshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetDefaultCreditSpecification.go b/service/ec2/api_op_GetDefaultCreditSpecification.go index 8c4a1b66e01..514f0ccbf47 100644 --- a/service/ec2/api_op_GetDefaultCreditSpecification.go +++ b/service/ec2/api_op_GetDefaultCreditSpecification.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetDefaultCreditSpecification(ctx context.Context, params *GetD addawsEc2query_serdeOpGetDefaultCreditSpecificationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetEbsDefaultKmsKeyId.go b/service/ec2/api_op_GetEbsDefaultKmsKeyId.go index e3baabc43d4..56949a1ffec 100644 --- a/service/ec2/api_op_GetEbsDefaultKmsKeyId.go +++ b/service/ec2/api_op_GetEbsDefaultKmsKeyId.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) GetEbsDefaultKmsKeyId(ctx context.Context, params *GetEbsDefaul addawsEc2query_serdeOpGetEbsDefaultKmsKeyIdMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetEbsEncryptionByDefault.go b/service/ec2/api_op_GetEbsEncryptionByDefault.go index 04359ff8632..7648d072cec 100644 --- a/service/ec2/api_op_GetEbsEncryptionByDefault.go +++ b/service/ec2/api_op_GetEbsEncryptionByDefault.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) GetEbsEncryptionByDefault(ctx context.Context, params *GetEbsEn addawsEc2query_serdeOpGetEbsEncryptionByDefaultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetGroupsForCapacityReservation.go b/service/ec2/api_op_GetGroupsForCapacityReservation.go index d7cf6cff8a2..c600cce315b 100644 --- a/service/ec2/api_op_GetGroupsForCapacityReservation.go +++ b/service/ec2/api_op_GetGroupsForCapacityReservation.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetGroupsForCapacityReservation(ctx context.Context, params *Ge addawsEc2query_serdeOpGetGroupsForCapacityReservationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetHostReservationPurchasePreview.go b/service/ec2/api_op_GetHostReservationPurchasePreview.go index 3aabc0bef97..7a55750a59b 100644 --- a/service/ec2/api_op_GetHostReservationPurchasePreview.go +++ b/service/ec2/api_op_GetHostReservationPurchasePreview.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetHostReservationPurchasePreview(ctx context.Context, params * addawsEc2query_serdeOpGetHostReservationPurchasePreviewMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetLaunchTemplateData.go b/service/ec2/api_op_GetLaunchTemplateData.go index 06623bb44d8..ec1a0855500 100644 --- a/service/ec2/api_op_GetLaunchTemplateData.go +++ b/service/ec2/api_op_GetLaunchTemplateData.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetLaunchTemplateData(ctx context.Context, params *GetLaunchTem addawsEc2query_serdeOpGetLaunchTemplateDataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetManagedPrefixListAssociations.go b/service/ec2/api_op_GetManagedPrefixListAssociations.go index 4755b13f397..937cd8eac18 100644 --- a/service/ec2/api_op_GetManagedPrefixListAssociations.go +++ b/service/ec2/api_op_GetManagedPrefixListAssociations.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetManagedPrefixListAssociations(ctx context.Context, params *G addawsEc2query_serdeOpGetManagedPrefixListAssociationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetManagedPrefixListEntries.go b/service/ec2/api_op_GetManagedPrefixListEntries.go index bf3bca9c900..7a43702997c 100644 --- a/service/ec2/api_op_GetManagedPrefixListEntries.go +++ b/service/ec2/api_op_GetManagedPrefixListEntries.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetManagedPrefixListEntries(ctx context.Context, params *GetMan addawsEc2query_serdeOpGetManagedPrefixListEntriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetPasswordData.go b/service/ec2/api_op_GetPasswordData.go index 5d9d4397bfe..56fe7569872 100644 --- a/service/ec2/api_op_GetPasswordData.go +++ b/service/ec2/api_op_GetPasswordData.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -37,9 +36,9 @@ func (c *Client) GetPasswordData(ctx context.Context, params *GetPasswordDataInp addawsEc2query_serdeOpGetPasswordDataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetReservedInstancesExchangeQuote.go b/service/ec2/api_op_GetReservedInstancesExchangeQuote.go index 623c816d21a..48a8344a8f6 100644 --- a/service/ec2/api_op_GetReservedInstancesExchangeQuote.go +++ b/service/ec2/api_op_GetReservedInstancesExchangeQuote.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetReservedInstancesExchangeQuote(ctx context.Context, params * addawsEc2query_serdeOpGetReservedInstancesExchangeQuoteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetTransitGatewayAttachmentPropagations.go b/service/ec2/api_op_GetTransitGatewayAttachmentPropagations.go index 052feaf91be..24c19d24f1b 100644 --- a/service/ec2/api_op_GetTransitGatewayAttachmentPropagations.go +++ b/service/ec2/api_op_GetTransitGatewayAttachmentPropagations.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetTransitGatewayAttachmentPropagations(ctx context.Context, pa addawsEc2query_serdeOpGetTransitGatewayAttachmentPropagationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetTransitGatewayMulticastDomainAssociations.go b/service/ec2/api_op_GetTransitGatewayMulticastDomainAssociations.go index ca933ae4fe6..f007fa639e5 100644 --- a/service/ec2/api_op_GetTransitGatewayMulticastDomainAssociations.go +++ b/service/ec2/api_op_GetTransitGatewayMulticastDomainAssociations.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetTransitGatewayMulticastDomainAssociations(ctx context.Contex addawsEc2query_serdeOpGetTransitGatewayMulticastDomainAssociationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetTransitGatewayRouteTableAssociations.go b/service/ec2/api_op_GetTransitGatewayRouteTableAssociations.go index 006fd503214..078ae649bd8 100644 --- a/service/ec2/api_op_GetTransitGatewayRouteTableAssociations.go +++ b/service/ec2/api_op_GetTransitGatewayRouteTableAssociations.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetTransitGatewayRouteTableAssociations(ctx context.Context, pa addawsEc2query_serdeOpGetTransitGatewayRouteTableAssociationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_GetTransitGatewayRouteTablePropagations.go b/service/ec2/api_op_GetTransitGatewayRouteTablePropagations.go index bd119bad1c1..72161b16ffd 100644 --- a/service/ec2/api_op_GetTransitGatewayRouteTablePropagations.go +++ b/service/ec2/api_op_GetTransitGatewayRouteTablePropagations.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetTransitGatewayRouteTablePropagations(ctx context.Context, pa addawsEc2query_serdeOpGetTransitGatewayRouteTablePropagationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ImportClientVpnClientCertificateRevocationList.go b/service/ec2/api_op_ImportClientVpnClientCertificateRevocationList.go index dd6c4eb1772..7fe38768861 100644 --- a/service/ec2/api_op_ImportClientVpnClientCertificateRevocationList.go +++ b/service/ec2/api_op_ImportClientVpnClientCertificateRevocationList.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) ImportClientVpnClientCertificateRevocationList(ctx context.Cont addawsEc2query_serdeOpImportClientVpnClientCertificateRevocationListMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ImportImage.go b/service/ec2/api_op_ImportImage.go index 519d017a351..1fd94ded7bd 100644 --- a/service/ec2/api_op_ImportImage.go +++ b/service/ec2/api_op_ImportImage.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ImportImage(ctx context.Context, params *ImportImageInput, optF addawsEc2query_serdeOpImportImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ImportInstance.go b/service/ec2/api_op_ImportInstance.go index b1225199a17..f279c01814d 100644 --- a/service/ec2/api_op_ImportInstance.go +++ b/service/ec2/api_op_ImportInstance.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ImportInstance(ctx context.Context, params *ImportInstanceInput addawsEc2query_serdeOpImportInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ImportKeyPair.go b/service/ec2/api_op_ImportKeyPair.go index e5aa9b61332..2541962ef93 100644 --- a/service/ec2/api_op_ImportKeyPair.go +++ b/service/ec2/api_op_ImportKeyPair.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ImportKeyPair(ctx context.Context, params *ImportKeyPairInput, addawsEc2query_serdeOpImportKeyPairMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ImportSnapshot.go b/service/ec2/api_op_ImportSnapshot.go index fe2c109d2f7..34c32aa82f4 100644 --- a/service/ec2/api_op_ImportSnapshot.go +++ b/service/ec2/api_op_ImportSnapshot.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ImportSnapshot(ctx context.Context, params *ImportSnapshotInput addawsEc2query_serdeOpImportSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ImportVolume.go b/service/ec2/api_op_ImportVolume.go index aacc26d0bf2..7f762a16d96 100644 --- a/service/ec2/api_op_ImportVolume.go +++ b/service/ec2/api_op_ImportVolume.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ImportVolume(ctx context.Context, params *ImportVolumeInput, op addawsEc2query_serdeOpImportVolumeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyAvailabilityZoneGroup.go b/service/ec2/api_op_ModifyAvailabilityZoneGroup.go index ef58e4b0d09..814f430edb4 100644 --- a/service/ec2/api_op_ModifyAvailabilityZoneGroup.go +++ b/service/ec2/api_op_ModifyAvailabilityZoneGroup.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ModifyAvailabilityZoneGroup(ctx context.Context, params *Modify addawsEc2query_serdeOpModifyAvailabilityZoneGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyCapacityReservation.go b/service/ec2/api_op_ModifyCapacityReservation.go index a633e04bc69..4a858f458d0 100644 --- a/service/ec2/api_op_ModifyCapacityReservation.go +++ b/service/ec2/api_op_ModifyCapacityReservation.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ModifyCapacityReservation(ctx context.Context, params *ModifyCa addawsEc2query_serdeOpModifyCapacityReservationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyClientVpnEndpoint.go b/service/ec2/api_op_ModifyClientVpnEndpoint.go index 170851dfbd4..2e7dd15d5e7 100644 --- a/service/ec2/api_op_ModifyClientVpnEndpoint.go +++ b/service/ec2/api_op_ModifyClientVpnEndpoint.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ModifyClientVpnEndpoint(ctx context.Context, params *ModifyClie addawsEc2query_serdeOpModifyClientVpnEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyDefaultCreditSpecification.go b/service/ec2/api_op_ModifyDefaultCreditSpecification.go index 29f72efbaa6..f98f091ea01 100644 --- a/service/ec2/api_op_ModifyDefaultCreditSpecification.go +++ b/service/ec2/api_op_ModifyDefaultCreditSpecification.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) ModifyDefaultCreditSpecification(ctx context.Context, params *M addawsEc2query_serdeOpModifyDefaultCreditSpecificationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyEbsDefaultKmsKeyId.go b/service/ec2/api_op_ModifyEbsDefaultKmsKeyId.go index e53b3544736..e3af58e248a 100644 --- a/service/ec2/api_op_ModifyEbsDefaultKmsKeyId.go +++ b/service/ec2/api_op_ModifyEbsDefaultKmsKeyId.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) ModifyEbsDefaultKmsKeyId(ctx context.Context, params *ModifyEbs addawsEc2query_serdeOpModifyEbsDefaultKmsKeyIdMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyFleet.go b/service/ec2/api_op_ModifyFleet.go index 00be34a0053..e09f832f47f 100644 --- a/service/ec2/api_op_ModifyFleet.go +++ b/service/ec2/api_op_ModifyFleet.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) ModifyFleet(ctx context.Context, params *ModifyFleetInput, optF addawsEc2query_serdeOpModifyFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyFpgaImageAttribute.go b/service/ec2/api_op_ModifyFpgaImageAttribute.go index 6ec525f6db7..75d4ce45af9 100644 --- a/service/ec2/api_op_ModifyFpgaImageAttribute.go +++ b/service/ec2/api_op_ModifyFpgaImageAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifyFpgaImageAttribute(ctx context.Context, params *ModifyFpg addawsEc2query_serdeOpModifyFpgaImageAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyHosts.go b/service/ec2/api_op_ModifyHosts.go index e9d6c3ef4cc..6123275adeb 100644 --- a/service/ec2/api_op_ModifyHosts.go +++ b/service/ec2/api_op_ModifyHosts.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) ModifyHosts(ctx context.Context, params *ModifyHostsInput, optF addawsEc2query_serdeOpModifyHostsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyIdFormat.go b/service/ec2/api_op_ModifyIdFormat.go index ff3d08c3d92..03b4674e54f 100644 --- a/service/ec2/api_op_ModifyIdFormat.go +++ b/service/ec2/api_op_ModifyIdFormat.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -42,9 +41,9 @@ func (c *Client) ModifyIdFormat(ctx context.Context, params *ModifyIdFormatInput addawsEc2query_serdeOpModifyIdFormatMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyIdentityIdFormat.go b/service/ec2/api_op_ModifyIdentityIdFormat.go index a86d9f1a524..d1d7de4c235 100644 --- a/service/ec2/api_op_ModifyIdentityIdFormat.go +++ b/service/ec2/api_op_ModifyIdentityIdFormat.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -40,9 +39,9 @@ func (c *Client) ModifyIdentityIdFormat(ctx context.Context, params *ModifyIdent addawsEc2query_serdeOpModifyIdentityIdFormatMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyImageAttribute.go b/service/ec2/api_op_ModifyImageAttribute.go index b2ff3f3ea54..cda8c603049 100644 --- a/service/ec2/api_op_ModifyImageAttribute.go +++ b/service/ec2/api_op_ModifyImageAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ModifyImageAttribute(ctx context.Context, params *ModifyImageAt addawsEc2query_serdeOpModifyImageAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyInstanceAttribute.go b/service/ec2/api_op_ModifyInstanceAttribute.go index 3a6d65f0bae..337d16e8112 100644 --- a/service/ec2/api_op_ModifyInstanceAttribute.go +++ b/service/ec2/api_op_ModifyInstanceAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) ModifyInstanceAttribute(ctx context.Context, params *ModifyInst addawsEc2query_serdeOpModifyInstanceAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyInstanceCapacityReservationAttributes.go b/service/ec2/api_op_ModifyInstanceCapacityReservationAttributes.go index dd8143664e5..4d0dd5b0bd3 100644 --- a/service/ec2/api_op_ModifyInstanceCapacityReservationAttributes.go +++ b/service/ec2/api_op_ModifyInstanceCapacityReservationAttributes.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ModifyInstanceCapacityReservationAttributes(ctx context.Context addawsEc2query_serdeOpModifyInstanceCapacityReservationAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyInstanceCreditSpecification.go b/service/ec2/api_op_ModifyInstanceCreditSpecification.go index 37994e037d5..5dcf7f9bb02 100644 --- a/service/ec2/api_op_ModifyInstanceCreditSpecification.go +++ b/service/ec2/api_op_ModifyInstanceCreditSpecification.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ModifyInstanceCreditSpecification(ctx context.Context, params * addawsEc2query_serdeOpModifyInstanceCreditSpecificationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyInstanceEventStartTime.go b/service/ec2/api_op_ModifyInstanceEventStartTime.go index 3ad747145c3..c16e76242de 100644 --- a/service/ec2/api_op_ModifyInstanceEventStartTime.go +++ b/service/ec2/api_op_ModifyInstanceEventStartTime.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ModifyInstanceEventStartTime(ctx context.Context, params *Modif addawsEc2query_serdeOpModifyInstanceEventStartTimeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyInstanceMetadataOptions.go b/service/ec2/api_op_ModifyInstanceMetadataOptions.go index c3405c030f3..f3ba728d7a5 100644 --- a/service/ec2/api_op_ModifyInstanceMetadataOptions.go +++ b/service/ec2/api_op_ModifyInstanceMetadataOptions.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ModifyInstanceMetadataOptions(ctx context.Context, params *Modi addawsEc2query_serdeOpModifyInstanceMetadataOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyInstancePlacement.go b/service/ec2/api_op_ModifyInstancePlacement.go index 9c3f6a91afa..79dce76614d 100644 --- a/service/ec2/api_op_ModifyInstancePlacement.go +++ b/service/ec2/api_op_ModifyInstancePlacement.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) ModifyInstancePlacement(ctx context.Context, params *ModifyInst addawsEc2query_serdeOpModifyInstancePlacementMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyLaunchTemplate.go b/service/ec2/api_op_ModifyLaunchTemplate.go index 4b88f5c6ae5..c2b78ded2b8 100644 --- a/service/ec2/api_op_ModifyLaunchTemplate.go +++ b/service/ec2/api_op_ModifyLaunchTemplate.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ModifyLaunchTemplate(ctx context.Context, params *ModifyLaunchT addawsEc2query_serdeOpModifyLaunchTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyManagedPrefixList.go b/service/ec2/api_op_ModifyManagedPrefixList.go index 7a8a0838862..e36ef3ed798 100644 --- a/service/ec2/api_op_ModifyManagedPrefixList.go +++ b/service/ec2/api_op_ModifyManagedPrefixList.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ModifyManagedPrefixList(ctx context.Context, params *ModifyMana addawsEc2query_serdeOpModifyManagedPrefixListMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyNetworkInterfaceAttribute.go b/service/ec2/api_op_ModifyNetworkInterfaceAttribute.go index 079c30d0859..c72055c81d4 100644 --- a/service/ec2/api_op_ModifyNetworkInterfaceAttribute.go +++ b/service/ec2/api_op_ModifyNetworkInterfaceAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ModifyNetworkInterfaceAttribute(ctx context.Context, params *Mo addawsEc2query_serdeOpModifyNetworkInterfaceAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyReservedInstances.go b/service/ec2/api_op_ModifyReservedInstances.go index b4b0c7008f0..0ae5c072053 100644 --- a/service/ec2/api_op_ModifyReservedInstances.go +++ b/service/ec2/api_op_ModifyReservedInstances.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ModifyReservedInstances(ctx context.Context, params *ModifyRese addawsEc2query_serdeOpModifyReservedInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifySnapshotAttribute.go b/service/ec2/api_op_ModifySnapshotAttribute.go index 184d03d1df5..b549f9829f3 100644 --- a/service/ec2/api_op_ModifySnapshotAttribute.go +++ b/service/ec2/api_op_ModifySnapshotAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) ModifySnapshotAttribute(ctx context.Context, params *ModifySnap addawsEc2query_serdeOpModifySnapshotAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifySpotFleetRequest.go b/service/ec2/api_op_ModifySpotFleetRequest.go index 8e7856b8989..84f728976c0 100644 --- a/service/ec2/api_op_ModifySpotFleetRequest.go +++ b/service/ec2/api_op_ModifySpotFleetRequest.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) ModifySpotFleetRequest(ctx context.Context, params *ModifySpotF addawsEc2query_serdeOpModifySpotFleetRequestMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifySubnetAttribute.go b/service/ec2/api_op_ModifySubnetAttribute.go index 54e788f3f9c..025c4cb2e1e 100644 --- a/service/ec2/api_op_ModifySubnetAttribute.go +++ b/service/ec2/api_op_ModifySubnetAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifySubnetAttribute(ctx context.Context, params *ModifySubnet addawsEc2query_serdeOpModifySubnetAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyTrafficMirrorFilterNetworkServices.go b/service/ec2/api_op_ModifyTrafficMirrorFilterNetworkServices.go index b7b53d9afa1..4c51032758b 100644 --- a/service/ec2/api_op_ModifyTrafficMirrorFilterNetworkServices.go +++ b/service/ec2/api_op_ModifyTrafficMirrorFilterNetworkServices.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) ModifyTrafficMirrorFilterNetworkServices(ctx context.Context, p addawsEc2query_serdeOpModifyTrafficMirrorFilterNetworkServicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyTrafficMirrorFilterRule.go b/service/ec2/api_op_ModifyTrafficMirrorFilterRule.go index 9b6124e36b8..9e757c45c05 100644 --- a/service/ec2/api_op_ModifyTrafficMirrorFilterRule.go +++ b/service/ec2/api_op_ModifyTrafficMirrorFilterRule.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ModifyTrafficMirrorFilterRule(ctx context.Context, params *Modi addawsEc2query_serdeOpModifyTrafficMirrorFilterRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyTrafficMirrorSession.go b/service/ec2/api_op_ModifyTrafficMirrorSession.go index fa9706e5742..b6b58cbce07 100644 --- a/service/ec2/api_op_ModifyTrafficMirrorSession.go +++ b/service/ec2/api_op_ModifyTrafficMirrorSession.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifyTrafficMirrorSession(ctx context.Context, params *ModifyT addawsEc2query_serdeOpModifyTrafficMirrorSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyTransitGatewayVpcAttachment.go b/service/ec2/api_op_ModifyTransitGatewayVpcAttachment.go index caf6e0a5166..025307c1268 100644 --- a/service/ec2/api_op_ModifyTransitGatewayVpcAttachment.go +++ b/service/ec2/api_op_ModifyTransitGatewayVpcAttachment.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifyTransitGatewayVpcAttachment(ctx context.Context, params * addawsEc2query_serdeOpModifyTransitGatewayVpcAttachmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyVolume.go b/service/ec2/api_op_ModifyVolume.go index 7834299f8f0..3ce94ea66c7 100644 --- a/service/ec2/api_op_ModifyVolume.go +++ b/service/ec2/api_op_ModifyVolume.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -57,9 +56,9 @@ func (c *Client) ModifyVolume(ctx context.Context, params *ModifyVolumeInput, op addawsEc2query_serdeOpModifyVolumeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyVolumeAttribute.go b/service/ec2/api_op_ModifyVolumeAttribute.go index c372f2dd9b3..9b6d891ac81 100644 --- a/service/ec2/api_op_ModifyVolumeAttribute.go +++ b/service/ec2/api_op_ModifyVolumeAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ModifyVolumeAttribute(ctx context.Context, params *ModifyVolume addawsEc2query_serdeOpModifyVolumeAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyVpcAttribute.go b/service/ec2/api_op_ModifyVpcAttribute.go index 919d98ad12b..7296eaee9c6 100644 --- a/service/ec2/api_op_ModifyVpcAttribute.go +++ b/service/ec2/api_op_ModifyVpcAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifyVpcAttribute(ctx context.Context, params *ModifyVpcAttrib addawsEc2query_serdeOpModifyVpcAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyVpcEndpoint.go b/service/ec2/api_op_ModifyVpcEndpoint.go index 6e52ce64b38..33845a725d7 100644 --- a/service/ec2/api_op_ModifyVpcEndpoint.go +++ b/service/ec2/api_op_ModifyVpcEndpoint.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) ModifyVpcEndpoint(ctx context.Context, params *ModifyVpcEndpoin addawsEc2query_serdeOpModifyVpcEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyVpcEndpointConnectionNotification.go b/service/ec2/api_op_ModifyVpcEndpointConnectionNotification.go index 39697124953..0d9bbeb33d6 100644 --- a/service/ec2/api_op_ModifyVpcEndpointConnectionNotification.go +++ b/service/ec2/api_op_ModifyVpcEndpointConnectionNotification.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ModifyVpcEndpointConnectionNotification(ctx context.Context, pa addawsEc2query_serdeOpModifyVpcEndpointConnectionNotificationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyVpcEndpointServiceConfiguration.go b/service/ec2/api_op_ModifyVpcEndpointServiceConfiguration.go index 4d1983c7b3e..24c515a7fc9 100644 --- a/service/ec2/api_op_ModifyVpcEndpointServiceConfiguration.go +++ b/service/ec2/api_op_ModifyVpcEndpointServiceConfiguration.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) ModifyVpcEndpointServiceConfiguration(ctx context.Context, para addawsEc2query_serdeOpModifyVpcEndpointServiceConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyVpcEndpointServicePermissions.go b/service/ec2/api_op_ModifyVpcEndpointServicePermissions.go index f1d62fae640..4983137ef29 100644 --- a/service/ec2/api_op_ModifyVpcEndpointServicePermissions.go +++ b/service/ec2/api_op_ModifyVpcEndpointServicePermissions.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) ModifyVpcEndpointServicePermissions(ctx context.Context, params addawsEc2query_serdeOpModifyVpcEndpointServicePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyVpcPeeringConnectionOptions.go b/service/ec2/api_op_ModifyVpcPeeringConnectionOptions.go index f1497a4b289..104b5ca0481 100644 --- a/service/ec2/api_op_ModifyVpcPeeringConnectionOptions.go +++ b/service/ec2/api_op_ModifyVpcPeeringConnectionOptions.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -48,9 +47,9 @@ func (c *Client) ModifyVpcPeeringConnectionOptions(ctx context.Context, params * addawsEc2query_serdeOpModifyVpcPeeringConnectionOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyVpcTenancy.go b/service/ec2/api_op_ModifyVpcTenancy.go index b0602bb286e..c9766973d09 100644 --- a/service/ec2/api_op_ModifyVpcTenancy.go +++ b/service/ec2/api_op_ModifyVpcTenancy.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) ModifyVpcTenancy(ctx context.Context, params *ModifyVpcTenancyI addawsEc2query_serdeOpModifyVpcTenancyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyVpnConnection.go b/service/ec2/api_op_ModifyVpnConnection.go index 1e5560fa9e4..d8fa5194864 100644 --- a/service/ec2/api_op_ModifyVpnConnection.go +++ b/service/ec2/api_op_ModifyVpnConnection.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -57,9 +56,9 @@ func (c *Client) ModifyVpnConnection(ctx context.Context, params *ModifyVpnConne addawsEc2query_serdeOpModifyVpnConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyVpnTunnelCertificate.go b/service/ec2/api_op_ModifyVpnTunnelCertificate.go index 5e2296763f8..967a22e7f00 100644 --- a/service/ec2/api_op_ModifyVpnTunnelCertificate.go +++ b/service/ec2/api_op_ModifyVpnTunnelCertificate.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifyVpnTunnelCertificate(ctx context.Context, params *ModifyV addawsEc2query_serdeOpModifyVpnTunnelCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ModifyVpnTunnelOptions.go b/service/ec2/api_op_ModifyVpnTunnelOptions.go index 9f3d8b646a4..6e1cb99f0f0 100644 --- a/service/ec2/api_op_ModifyVpnTunnelOptions.go +++ b/service/ec2/api_op_ModifyVpnTunnelOptions.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ModifyVpnTunnelOptions(ctx context.Context, params *ModifyVpnTu addawsEc2query_serdeOpModifyVpnTunnelOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_MonitorInstances.go b/service/ec2/api_op_MonitorInstances.go index c85e065fb0f..bd0b72becc9 100644 --- a/service/ec2/api_op_MonitorInstances.go +++ b/service/ec2/api_op_MonitorInstances.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) MonitorInstances(ctx context.Context, params *MonitorInstancesI addawsEc2query_serdeOpMonitorInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_MoveAddressToVpc.go b/service/ec2/api_op_MoveAddressToVpc.go index 3a026d1fdb8..bba5874c3db 100644 --- a/service/ec2/api_op_MoveAddressToVpc.go +++ b/service/ec2/api_op_MoveAddressToVpc.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) MoveAddressToVpc(ctx context.Context, params *MoveAddressToVpcI addawsEc2query_serdeOpMoveAddressToVpcMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ProvisionByoipCidr.go b/service/ec2/api_op_ProvisionByoipCidr.go index b9c8be90944..ddac19f1724 100644 --- a/service/ec2/api_op_ProvisionByoipCidr.go +++ b/service/ec2/api_op_ProvisionByoipCidr.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) ProvisionByoipCidr(ctx context.Context, params *ProvisionByoipC addawsEc2query_serdeOpProvisionByoipCidrMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_PurchaseHostReservation.go b/service/ec2/api_op_PurchaseHostReservation.go index e2a7dc04e3b..f83cd50992f 100644 --- a/service/ec2/api_op_PurchaseHostReservation.go +++ b/service/ec2/api_op_PurchaseHostReservation.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) PurchaseHostReservation(ctx context.Context, params *PurchaseHo addawsEc2query_serdeOpPurchaseHostReservationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_PurchaseReservedInstancesOffering.go b/service/ec2/api_op_PurchaseReservedInstancesOffering.go index 3d59120dd87..b037ae180f5 100644 --- a/service/ec2/api_op_PurchaseReservedInstancesOffering.go +++ b/service/ec2/api_op_PurchaseReservedInstancesOffering.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) PurchaseReservedInstancesOffering(ctx context.Context, params * addawsEc2query_serdeOpPurchaseReservedInstancesOfferingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_PurchaseScheduledInstances.go b/service/ec2/api_op_PurchaseScheduledInstances.go index 5b38f1ba551..bdc5357e84a 100644 --- a/service/ec2/api_op_PurchaseScheduledInstances.go +++ b/service/ec2/api_op_PurchaseScheduledInstances.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) PurchaseScheduledInstances(ctx context.Context, params *Purchas addawsEc2query_serdeOpPurchaseScheduledInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_RebootInstances.go b/service/ec2/api_op_RebootInstances.go index ef43cc73d21..11fc62eeec7 100644 --- a/service/ec2/api_op_RebootInstances.go +++ b/service/ec2/api_op_RebootInstances.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) RebootInstances(ctx context.Context, params *RebootInstancesInp addawsEc2query_serdeOpRebootInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_RegisterImage.go b/service/ec2/api_op_RegisterImage.go index ce4aba74f57..ed70467d7d9 100644 --- a/service/ec2/api_op_RegisterImage.go +++ b/service/ec2/api_op_RegisterImage.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -56,9 +55,9 @@ func (c *Client) RegisterImage(ctx context.Context, params *RegisterImageInput, addawsEc2query_serdeOpRegisterImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_RegisterInstanceEventNotificationAttributes.go b/service/ec2/api_op_RegisterInstanceEventNotificationAttributes.go index 1842a98645d..a4c2104af39 100644 --- a/service/ec2/api_op_RegisterInstanceEventNotificationAttributes.go +++ b/service/ec2/api_op_RegisterInstanceEventNotificationAttributes.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) RegisterInstanceEventNotificationAttributes(ctx context.Context addawsEc2query_serdeOpRegisterInstanceEventNotificationAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_RegisterTransitGatewayMulticastGroupMembers.go b/service/ec2/api_op_RegisterTransitGatewayMulticastGroupMembers.go index c27c652e1d3..d6c76cefbcc 100644 --- a/service/ec2/api_op_RegisterTransitGatewayMulticastGroupMembers.go +++ b/service/ec2/api_op_RegisterTransitGatewayMulticastGroupMembers.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) RegisterTransitGatewayMulticastGroupMembers(ctx context.Context addawsEc2query_serdeOpRegisterTransitGatewayMulticastGroupMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_RegisterTransitGatewayMulticastGroupSources.go b/service/ec2/api_op_RegisterTransitGatewayMulticastGroupSources.go index f18eeb1eb6e..02784d2e949 100644 --- a/service/ec2/api_op_RegisterTransitGatewayMulticastGroupSources.go +++ b/service/ec2/api_op_RegisterTransitGatewayMulticastGroupSources.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) RegisterTransitGatewayMulticastGroupSources(ctx context.Context addawsEc2query_serdeOpRegisterTransitGatewayMulticastGroupSourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_RejectTransitGatewayPeeringAttachment.go b/service/ec2/api_op_RejectTransitGatewayPeeringAttachment.go index b7b4bff249c..8ecd6620e3c 100644 --- a/service/ec2/api_op_RejectTransitGatewayPeeringAttachment.go +++ b/service/ec2/api_op_RejectTransitGatewayPeeringAttachment.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RejectTransitGatewayPeeringAttachment(ctx context.Context, para addawsEc2query_serdeOpRejectTransitGatewayPeeringAttachmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_RejectTransitGatewayVpcAttachment.go b/service/ec2/api_op_RejectTransitGatewayVpcAttachment.go index c20d3187c7b..e90912795b2 100644 --- a/service/ec2/api_op_RejectTransitGatewayVpcAttachment.go +++ b/service/ec2/api_op_RejectTransitGatewayVpcAttachment.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) RejectTransitGatewayVpcAttachment(ctx context.Context, params * addawsEc2query_serdeOpRejectTransitGatewayVpcAttachmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_RejectVpcEndpointConnections.go b/service/ec2/api_op_RejectVpcEndpointConnections.go index 519e7ad35c0..22b0b1a9579 100644 --- a/service/ec2/api_op_RejectVpcEndpointConnections.go +++ b/service/ec2/api_op_RejectVpcEndpointConnections.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) RejectVpcEndpointConnections(ctx context.Context, params *Rejec addawsEc2query_serdeOpRejectVpcEndpointConnectionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_RejectVpcPeeringConnection.go b/service/ec2/api_op_RejectVpcPeeringConnection.go index 57b2121f580..35b04900c6a 100644 --- a/service/ec2/api_op_RejectVpcPeeringConnection.go +++ b/service/ec2/api_op_RejectVpcPeeringConnection.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) RejectVpcPeeringConnection(ctx context.Context, params *RejectV addawsEc2query_serdeOpRejectVpcPeeringConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ReleaseAddress.go b/service/ec2/api_op_ReleaseAddress.go index b11f868fc96..2a02372258a 100644 --- a/service/ec2/api_op_ReleaseAddress.go +++ b/service/ec2/api_op_ReleaseAddress.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) ReleaseAddress(ctx context.Context, params *ReleaseAddressInput addawsEc2query_serdeOpReleaseAddressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ReleaseHosts.go b/service/ec2/api_op_ReleaseHosts.go index b5f28dd7831..e431e7fe7a8 100644 --- a/service/ec2/api_op_ReleaseHosts.go +++ b/service/ec2/api_op_ReleaseHosts.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) ReleaseHosts(ctx context.Context, params *ReleaseHostsInput, op addawsEc2query_serdeOpReleaseHostsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ReplaceIamInstanceProfileAssociation.go b/service/ec2/api_op_ReplaceIamInstanceProfileAssociation.go index d6de55d6934..f5e09a7da31 100644 --- a/service/ec2/api_op_ReplaceIamInstanceProfileAssociation.go +++ b/service/ec2/api_op_ReplaceIamInstanceProfileAssociation.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ReplaceIamInstanceProfileAssociation(ctx context.Context, param addawsEc2query_serdeOpReplaceIamInstanceProfileAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ReplaceNetworkAclAssociation.go b/service/ec2/api_op_ReplaceNetworkAclAssociation.go index f00c5620963..72244a316ae 100644 --- a/service/ec2/api_op_ReplaceNetworkAclAssociation.go +++ b/service/ec2/api_op_ReplaceNetworkAclAssociation.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) ReplaceNetworkAclAssociation(ctx context.Context, params *Repla addawsEc2query_serdeOpReplaceNetworkAclAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ReplaceNetworkAclEntry.go b/service/ec2/api_op_ReplaceNetworkAclEntry.go index 5e0c1a72075..983f1cd078e 100644 --- a/service/ec2/api_op_ReplaceNetworkAclEntry.go +++ b/service/ec2/api_op_ReplaceNetworkAclEntry.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ReplaceNetworkAclEntry(ctx context.Context, params *ReplaceNetw addawsEc2query_serdeOpReplaceNetworkAclEntryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ReplaceRoute.go b/service/ec2/api_op_ReplaceRoute.go index b5797ee7ea0..edd61ad9faa 100644 --- a/service/ec2/api_op_ReplaceRoute.go +++ b/service/ec2/api_op_ReplaceRoute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) ReplaceRoute(ctx context.Context, params *ReplaceRouteInput, op addawsEc2query_serdeOpReplaceRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ReplaceRouteTableAssociation.go b/service/ec2/api_op_ReplaceRouteTableAssociation.go index aa9dfb3a330..7a2825e6869 100644 --- a/service/ec2/api_op_ReplaceRouteTableAssociation.go +++ b/service/ec2/api_op_ReplaceRouteTableAssociation.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ReplaceRouteTableAssociation(ctx context.Context, params *Repla addawsEc2query_serdeOpReplaceRouteTableAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ReplaceTransitGatewayRoute.go b/service/ec2/api_op_ReplaceTransitGatewayRoute.go index 7567a7cf4f2..604e514d74f 100644 --- a/service/ec2/api_op_ReplaceTransitGatewayRoute.go +++ b/service/ec2/api_op_ReplaceTransitGatewayRoute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ReplaceTransitGatewayRoute(ctx context.Context, params *Replace addawsEc2query_serdeOpReplaceTransitGatewayRouteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ReportInstanceStatus.go b/service/ec2/api_op_ReportInstanceStatus.go index cf33736919d..74ce65a59c3 100644 --- a/service/ec2/api_op_ReportInstanceStatus.go +++ b/service/ec2/api_op_ReportInstanceStatus.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ReportInstanceStatus(ctx context.Context, params *ReportInstanc addawsEc2query_serdeOpReportInstanceStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_RequestSpotFleet.go b/service/ec2/api_op_RequestSpotFleet.go index 211abcd85d6..08545c2ba0b 100644 --- a/service/ec2/api_op_RequestSpotFleet.go +++ b/service/ec2/api_op_RequestSpotFleet.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) RequestSpotFleet(ctx context.Context, params *RequestSpotFleetI addawsEc2query_serdeOpRequestSpotFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_RequestSpotInstances.go b/service/ec2/api_op_RequestSpotInstances.go index fd865db62d3..cbfc4d002c3 100644 --- a/service/ec2/api_op_RequestSpotInstances.go +++ b/service/ec2/api_op_RequestSpotInstances.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) RequestSpotInstances(ctx context.Context, params *RequestSpotIn addawsEc2query_serdeOpRequestSpotInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ResetEbsDefaultKmsKeyId.go b/service/ec2/api_op_ResetEbsDefaultKmsKeyId.go index e9cc099ec9d..8a8659f95c3 100644 --- a/service/ec2/api_op_ResetEbsDefaultKmsKeyId.go +++ b/service/ec2/api_op_ResetEbsDefaultKmsKeyId.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) ResetEbsDefaultKmsKeyId(ctx context.Context, params *ResetEbsDe addawsEc2query_serdeOpResetEbsDefaultKmsKeyIdMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ResetFpgaImageAttribute.go b/service/ec2/api_op_ResetFpgaImageAttribute.go index 66b253d4ffe..29c137a8517 100644 --- a/service/ec2/api_op_ResetFpgaImageAttribute.go +++ b/service/ec2/api_op_ResetFpgaImageAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ResetFpgaImageAttribute(ctx context.Context, params *ResetFpgaI addawsEc2query_serdeOpResetFpgaImageAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ResetImageAttribute.go b/service/ec2/api_op_ResetImageAttribute.go index 3609524830f..5b6e08cf55f 100644 --- a/service/ec2/api_op_ResetImageAttribute.go +++ b/service/ec2/api_op_ResetImageAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ResetImageAttribute(ctx context.Context, params *ResetImageAttr addawsEc2query_serdeOpResetImageAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ResetInstanceAttribute.go b/service/ec2/api_op_ResetInstanceAttribute.go index e423fc2e1ed..56e5f6585f0 100644 --- a/service/ec2/api_op_ResetInstanceAttribute.go +++ b/service/ec2/api_op_ResetInstanceAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ResetInstanceAttribute(ctx context.Context, params *ResetInstan addawsEc2query_serdeOpResetInstanceAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ResetNetworkInterfaceAttribute.go b/service/ec2/api_op_ResetNetworkInterfaceAttribute.go index 6e7fb3222db..e50b1781525 100644 --- a/service/ec2/api_op_ResetNetworkInterfaceAttribute.go +++ b/service/ec2/api_op_ResetNetworkInterfaceAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ResetNetworkInterfaceAttribute(ctx context.Context, params *Res addawsEc2query_serdeOpResetNetworkInterfaceAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_ResetSnapshotAttribute.go b/service/ec2/api_op_ResetSnapshotAttribute.go index a7298bb0a86..6aed2c53800 100644 --- a/service/ec2/api_op_ResetSnapshotAttribute.go +++ b/service/ec2/api_op_ResetSnapshotAttribute.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ResetSnapshotAttribute(ctx context.Context, params *ResetSnapsh addawsEc2query_serdeOpResetSnapshotAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_RestoreAddressToClassic.go b/service/ec2/api_op_RestoreAddressToClassic.go index 16020edb760..36574e36636 100644 --- a/service/ec2/api_op_RestoreAddressToClassic.go +++ b/service/ec2/api_op_RestoreAddressToClassic.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) RestoreAddressToClassic(ctx context.Context, params *RestoreAdd addawsEc2query_serdeOpRestoreAddressToClassicMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_RestoreManagedPrefixListVersion.go b/service/ec2/api_op_RestoreManagedPrefixListVersion.go index dfb9753455f..27935c2b59b 100644 --- a/service/ec2/api_op_RestoreManagedPrefixListVersion.go +++ b/service/ec2/api_op_RestoreManagedPrefixListVersion.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) RestoreManagedPrefixListVersion(ctx context.Context, params *Re addawsEc2query_serdeOpRestoreManagedPrefixListVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_RevokeClientVpnIngress.go b/service/ec2/api_op_RevokeClientVpnIngress.go index 73b979b0169..6b9e3b90899 100644 --- a/service/ec2/api_op_RevokeClientVpnIngress.go +++ b/service/ec2/api_op_RevokeClientVpnIngress.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RevokeClientVpnIngress(ctx context.Context, params *RevokeClien addawsEc2query_serdeOpRevokeClientVpnIngressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_RevokeSecurityGroupEgress.go b/service/ec2/api_op_RevokeSecurityGroupEgress.go index 31e95541248..e871e255059 100644 --- a/service/ec2/api_op_RevokeSecurityGroupEgress.go +++ b/service/ec2/api_op_RevokeSecurityGroupEgress.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) RevokeSecurityGroupEgress(ctx context.Context, params *RevokeSe addawsEc2query_serdeOpRevokeSecurityGroupEgressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_RevokeSecurityGroupIngress.go b/service/ec2/api_op_RevokeSecurityGroupIngress.go index 72b326e3b42..077fa0199f6 100644 --- a/service/ec2/api_op_RevokeSecurityGroupIngress.go +++ b/service/ec2/api_op_RevokeSecurityGroupIngress.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) RevokeSecurityGroupIngress(ctx context.Context, params *RevokeS addawsEc2query_serdeOpRevokeSecurityGroupIngressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_RunInstances.go b/service/ec2/api_op_RunInstances.go index 319ebdaa7da..e3c46a12cad 100644 --- a/service/ec2/api_op_RunInstances.go +++ b/service/ec2/api_op_RunInstances.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -81,9 +80,9 @@ func (c *Client) RunInstances(ctx context.Context, params *RunInstancesInput, op addawsEc2query_serdeOpRunInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_RunScheduledInstances.go b/service/ec2/api_op_RunScheduledInstances.go index 714b23b645e..4ff62610190 100644 --- a/service/ec2/api_op_RunScheduledInstances.go +++ b/service/ec2/api_op_RunScheduledInstances.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) RunScheduledInstances(ctx context.Context, params *RunScheduled addawsEc2query_serdeOpRunScheduledInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_SearchLocalGatewayRoutes.go b/service/ec2/api_op_SearchLocalGatewayRoutes.go index 6b957f21c1c..ad8331b58e7 100644 --- a/service/ec2/api_op_SearchLocalGatewayRoutes.go +++ b/service/ec2/api_op_SearchLocalGatewayRoutes.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SearchLocalGatewayRoutes(ctx context.Context, params *SearchLoc addawsEc2query_serdeOpSearchLocalGatewayRoutesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_SearchTransitGatewayMulticastGroups.go b/service/ec2/api_op_SearchTransitGatewayMulticastGroups.go index 152a0d6a803..00f738facd4 100644 --- a/service/ec2/api_op_SearchTransitGatewayMulticastGroups.go +++ b/service/ec2/api_op_SearchTransitGatewayMulticastGroups.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) SearchTransitGatewayMulticastGroups(ctx context.Context, params addawsEc2query_serdeOpSearchTransitGatewayMulticastGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_SearchTransitGatewayRoutes.go b/service/ec2/api_op_SearchTransitGatewayRoutes.go index e7eb3607470..fdcaeecea8b 100644 --- a/service/ec2/api_op_SearchTransitGatewayRoutes.go +++ b/service/ec2/api_op_SearchTransitGatewayRoutes.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SearchTransitGatewayRoutes(ctx context.Context, params *SearchT addawsEc2query_serdeOpSearchTransitGatewayRoutesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_SendDiagnosticInterrupt.go b/service/ec2/api_op_SendDiagnosticInterrupt.go index bcdbd1a1336..34ef6a45506 100644 --- a/service/ec2/api_op_SendDiagnosticInterrupt.go +++ b/service/ec2/api_op_SendDiagnosticInterrupt.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -36,9 +35,9 @@ func (c *Client) SendDiagnosticInterrupt(ctx context.Context, params *SendDiagno addawsEc2query_serdeOpSendDiagnosticInterruptMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_StartInstances.go b/service/ec2/api_op_StartInstances.go index 9104d9a3089..9bcc7a27e0c 100644 --- a/service/ec2/api_op_StartInstances.go +++ b/service/ec2/api_op_StartInstances.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) StartInstances(ctx context.Context, params *StartInstancesInput addawsEc2query_serdeOpStartInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_StartVpcEndpointServicePrivateDnsVerification.go b/service/ec2/api_op_StartVpcEndpointServicePrivateDnsVerification.go index 0b65c2a1192..8499360183f 100644 --- a/service/ec2/api_op_StartVpcEndpointServicePrivateDnsVerification.go +++ b/service/ec2/api_op_StartVpcEndpointServicePrivateDnsVerification.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) StartVpcEndpointServicePrivateDnsVerification(ctx context.Conte addawsEc2query_serdeOpStartVpcEndpointServicePrivateDnsVerificationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_StopInstances.go b/service/ec2/api_op_StopInstances.go index de0a667833a..4d61f21fe48 100644 --- a/service/ec2/api_op_StopInstances.go +++ b/service/ec2/api_op_StopInstances.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -63,9 +62,9 @@ func (c *Client) StopInstances(ctx context.Context, params *StopInstancesInput, addawsEc2query_serdeOpStopInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_TerminateClientVpnConnections.go b/service/ec2/api_op_TerminateClientVpnConnections.go index 4a50f82b903..b4d51db698b 100644 --- a/service/ec2/api_op_TerminateClientVpnConnections.go +++ b/service/ec2/api_op_TerminateClientVpnConnections.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) TerminateClientVpnConnections(ctx context.Context, params *Term addawsEc2query_serdeOpTerminateClientVpnConnectionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_TerminateInstances.go b/service/ec2/api_op_TerminateInstances.go index 9203fa7ea01..26ad0a01d4f 100644 --- a/service/ec2/api_op_TerminateInstances.go +++ b/service/ec2/api_op_TerminateInstances.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) TerminateInstances(ctx context.Context, params *TerminateInstan addawsEc2query_serdeOpTerminateInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_UnassignIpv6Addresses.go b/service/ec2/api_op_UnassignIpv6Addresses.go index 323812729f9..e3c9fa4a93e 100644 --- a/service/ec2/api_op_UnassignIpv6Addresses.go +++ b/service/ec2/api_op_UnassignIpv6Addresses.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UnassignIpv6Addresses(ctx context.Context, params *UnassignIpv6 addawsEc2query_serdeOpUnassignIpv6AddressesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_UnassignPrivateIpAddresses.go b/service/ec2/api_op_UnassignPrivateIpAddresses.go index 0426fb42d19..b3f5a0b29ea 100644 --- a/service/ec2/api_op_UnassignPrivateIpAddresses.go +++ b/service/ec2/api_op_UnassignPrivateIpAddresses.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UnassignPrivateIpAddresses(ctx context.Context, params *Unassig addawsEc2query_serdeOpUnassignPrivateIpAddressesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_UnmonitorInstances.go b/service/ec2/api_op_UnmonitorInstances.go index e890e069495..b6a922ebfb5 100644 --- a/service/ec2/api_op_UnmonitorInstances.go +++ b/service/ec2/api_op_UnmonitorInstances.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UnmonitorInstances(ctx context.Context, params *UnmonitorInstan addawsEc2query_serdeOpUnmonitorInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_UpdateSecurityGroupRuleDescriptionsEgress.go b/service/ec2/api_op_UpdateSecurityGroupRuleDescriptionsEgress.go index f319dc907db..074456ea9dc 100644 --- a/service/ec2/api_op_UpdateSecurityGroupRuleDescriptionsEgress.go +++ b/service/ec2/api_op_UpdateSecurityGroupRuleDescriptionsEgress.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateSecurityGroupRuleDescriptionsEgress(ctx context.Context, addawsEc2query_serdeOpUpdateSecurityGroupRuleDescriptionsEgressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_UpdateSecurityGroupRuleDescriptionsIngress.go b/service/ec2/api_op_UpdateSecurityGroupRuleDescriptionsIngress.go index 94ebbe145b4..a83686e6d81 100644 --- a/service/ec2/api_op_UpdateSecurityGroupRuleDescriptionsIngress.go +++ b/service/ec2/api_op_UpdateSecurityGroupRuleDescriptionsIngress.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateSecurityGroupRuleDescriptionsIngress(ctx context.Context, addawsEc2query_serdeOpUpdateSecurityGroupRuleDescriptionsIngressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/api_op_WithdrawByoipCidr.go b/service/ec2/api_op_WithdrawByoipCidr.go index 9e92b74c2ed..9771abe1e9b 100644 --- a/service/ec2/api_op_WithdrawByoipCidr.go +++ b/service/ec2/api_op_WithdrawByoipCidr.go @@ -5,7 +5,6 @@ package ec2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ec2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) WithdrawByoipCidr(ctx context.Context, params *WithdrawByoipCid addawsEc2query_serdeOpWithdrawByoipCidrMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2/endpoints.go b/service/ec2/endpoints.go index dd5a198c38d..3601c89bb29 100644 --- a/service/ec2/endpoints.go +++ b/service/ec2/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/ec2instanceconnect/api_client.go b/service/ec2instanceconnect/api_client.go index ee48d4fea31..30c85e3c672 100644 --- a/service/ec2instanceconnect/api_client.go +++ b/service/ec2instanceconnect/api_client.go @@ -80,30 +80,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -169,6 +145,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/ec2instanceconnect/api_op_SendSSHPublicKey.go b/service/ec2instanceconnect/api_op_SendSSHPublicKey.go index a7f63808ce0..c3b436f8608 100644 --- a/service/ec2instanceconnect/api_op_SendSSHPublicKey.go +++ b/service/ec2instanceconnect/api_op_SendSSHPublicKey.go @@ -5,7 +5,6 @@ package ec2instanceconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) SendSSHPublicKey(ctx context.Context, params *SendSSHPublicKeyI addawsAwsjson11_serdeOpSendSSHPublicKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ec2instanceconnect/endpoints.go b/service/ec2instanceconnect/endpoints.go index 3c896ee2cad..98327ad0c53 100644 --- a/service/ec2instanceconnect/endpoints.go +++ b/service/ec2instanceconnect/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/ecr/api_client.go b/service/ecr/api_client.go index 8e010e3960f..c207761bfef 100644 --- a/service/ecr/api_client.go +++ b/service/ecr/api_client.go @@ -83,30 +83,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -172,6 +148,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/ecr/api_op_BatchCheckLayerAvailability.go b/service/ecr/api_op_BatchCheckLayerAvailability.go index cb8af5fc314..9f1b7ea8979 100644 --- a/service/ecr/api_op_BatchCheckLayerAvailability.go +++ b/service/ecr/api_op_BatchCheckLayerAvailability.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecr/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) BatchCheckLayerAvailability(ctx context.Context, params *BatchC addawsAwsjson11_serdeOpBatchCheckLayerAvailabilityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_BatchDeleteImage.go b/service/ecr/api_op_BatchDeleteImage.go index 387f8581f4a..1b621146813 100644 --- a/service/ecr/api_op_BatchDeleteImage.go +++ b/service/ecr/api_op_BatchDeleteImage.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecr/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) BatchDeleteImage(ctx context.Context, params *BatchDeleteImageI addawsAwsjson11_serdeOpBatchDeleteImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_BatchGetImage.go b/service/ecr/api_op_BatchGetImage.go index 07e437cb311..cd0e05f15d2 100644 --- a/service/ecr/api_op_BatchGetImage.go +++ b/service/ecr/api_op_BatchGetImage.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecr/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) BatchGetImage(ctx context.Context, params *BatchGetImageInput, addawsAwsjson11_serdeOpBatchGetImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_CompleteLayerUpload.go b/service/ecr/api_op_CompleteLayerUpload.go index 4724c40f6c7..fb25fd54a6f 100644 --- a/service/ecr/api_op_CompleteLayerUpload.go +++ b/service/ecr/api_op_CompleteLayerUpload.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) CompleteLayerUpload(ctx context.Context, params *CompleteLayerU addawsAwsjson11_serdeOpCompleteLayerUploadMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_CreateRepository.go b/service/ecr/api_op_CreateRepository.go index f35351860e6..9db1ec238c9 100644 --- a/service/ecr/api_op_CreateRepository.go +++ b/service/ecr/api_op_CreateRepository.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecr/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateRepository(ctx context.Context, params *CreateRepositoryI addawsAwsjson11_serdeOpCreateRepositoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_DeleteLifecyclePolicy.go b/service/ecr/api_op_DeleteLifecyclePolicy.go index 09e7039e496..729c5a2f360 100644 --- a/service/ecr/api_op_DeleteLifecyclePolicy.go +++ b/service/ecr/api_op_DeleteLifecyclePolicy.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteLifecyclePolicy(ctx context.Context, params *DeleteLifecy addawsAwsjson11_serdeOpDeleteLifecyclePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_DeleteRepository.go b/service/ecr/api_op_DeleteRepository.go index 3f0c1fe83cc..c0a9e25500f 100644 --- a/service/ecr/api_op_DeleteRepository.go +++ b/service/ecr/api_op_DeleteRepository.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecr/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteRepository(ctx context.Context, params *DeleteRepositoryI addawsAwsjson11_serdeOpDeleteRepositoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_DeleteRepositoryPolicy.go b/service/ecr/api_op_DeleteRepositoryPolicy.go index 4ec677bc3aa..952eaf62512 100644 --- a/service/ecr/api_op_DeleteRepositoryPolicy.go +++ b/service/ecr/api_op_DeleteRepositoryPolicy.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRepositoryPolicy(ctx context.Context, params *DeleteRepos addawsAwsjson11_serdeOpDeleteRepositoryPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_DescribeImageScanFindings.go b/service/ecr/api_op_DescribeImageScanFindings.go index b9d45c34d1e..d92f6415b38 100644 --- a/service/ecr/api_op_DescribeImageScanFindings.go +++ b/service/ecr/api_op_DescribeImageScanFindings.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecr/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeImageScanFindings(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeImageScanFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_DescribeImages.go b/service/ecr/api_op_DescribeImages.go index e73b6ac9460..51652ac88ea 100644 --- a/service/ecr/api_op_DescribeImages.go +++ b/service/ecr/api_op_DescribeImages.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecr/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeImages(ctx context.Context, params *DescribeImagesInput addawsAwsjson11_serdeOpDescribeImagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_DescribeRepositories.go b/service/ecr/api_op_DescribeRepositories.go index 67626a3390a..1a5f4ffcc85 100644 --- a/service/ecr/api_op_DescribeRepositories.go +++ b/service/ecr/api_op_DescribeRepositories.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecr/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeRepositories(ctx context.Context, params *DescribeRepos addawsAwsjson11_serdeOpDescribeRepositoriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_GetAuthorizationToken.go b/service/ecr/api_op_GetAuthorizationToken.go index 08ffa5dc221..923e9874d9e 100644 --- a/service/ecr/api_op_GetAuthorizationToken.go +++ b/service/ecr/api_op_GetAuthorizationToken.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecr/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) GetAuthorizationToken(ctx context.Context, params *GetAuthoriza addawsAwsjson11_serdeOpGetAuthorizationTokenMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_GetDownloadUrlForLayer.go b/service/ecr/api_op_GetDownloadUrlForLayer.go index d6131722085..416cd8ddec3 100644 --- a/service/ecr/api_op_GetDownloadUrlForLayer.go +++ b/service/ecr/api_op_GetDownloadUrlForLayer.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) GetDownloadUrlForLayer(ctx context.Context, params *GetDownload addawsAwsjson11_serdeOpGetDownloadUrlForLayerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_GetLifecyclePolicy.go b/service/ecr/api_op_GetLifecyclePolicy.go index c6213c00568..3c8ee8d3d95 100644 --- a/service/ecr/api_op_GetLifecyclePolicy.go +++ b/service/ecr/api_op_GetLifecyclePolicy.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetLifecyclePolicy(ctx context.Context, params *GetLifecyclePol addawsAwsjson11_serdeOpGetLifecyclePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_GetLifecyclePolicyPreview.go b/service/ecr/api_op_GetLifecyclePolicyPreview.go index 1dce392b5a2..d92b0c7be62 100644 --- a/service/ecr/api_op_GetLifecyclePolicyPreview.go +++ b/service/ecr/api_op_GetLifecyclePolicyPreview.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecr/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetLifecyclePolicyPreview(ctx context.Context, params *GetLifec addawsAwsjson11_serdeOpGetLifecyclePolicyPreviewMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_GetRepositoryPolicy.go b/service/ecr/api_op_GetRepositoryPolicy.go index 98c38fb8230..db369f74b97 100644 --- a/service/ecr/api_op_GetRepositoryPolicy.go +++ b/service/ecr/api_op_GetRepositoryPolicy.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetRepositoryPolicy(ctx context.Context, params *GetRepositoryP addawsAwsjson11_serdeOpGetRepositoryPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_InitiateLayerUpload.go b/service/ecr/api_op_InitiateLayerUpload.go index 2bee6ad7484..d9c0d19c8b8 100644 --- a/service/ecr/api_op_InitiateLayerUpload.go +++ b/service/ecr/api_op_InitiateLayerUpload.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) InitiateLayerUpload(ctx context.Context, params *InitiateLayerU addawsAwsjson11_serdeOpInitiateLayerUploadMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_ListImages.go b/service/ecr/api_op_ListImages.go index 94b57815fd2..bc31fd44423 100644 --- a/service/ecr/api_op_ListImages.go +++ b/service/ecr/api_op_ListImages.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecr/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListImages(ctx context.Context, params *ListImagesInput, optFns addawsAwsjson11_serdeOpListImagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_ListTagsForResource.go b/service/ecr/api_op_ListTagsForResource.go index dd3966a86cf..badfddebc3e 100644 --- a/service/ecr/api_op_ListTagsForResource.go +++ b/service/ecr/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecr/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_PutImage.go b/service/ecr/api_op_PutImage.go index 03fedf0d178..2ae45d28c49 100644 --- a/service/ecr/api_op_PutImage.go +++ b/service/ecr/api_op_PutImage.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecr/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) PutImage(ctx context.Context, params *PutImageInput, optFns ... addawsAwsjson11_serdeOpPutImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_PutImageScanningConfiguration.go b/service/ecr/api_op_PutImageScanningConfiguration.go index 6ae8bcec743..51e0dd1dbb0 100644 --- a/service/ecr/api_op_PutImageScanningConfiguration.go +++ b/service/ecr/api_op_PutImageScanningConfiguration.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecr/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutImageScanningConfiguration(ctx context.Context, params *PutI addawsAwsjson11_serdeOpPutImageScanningConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_PutImageTagMutability.go b/service/ecr/api_op_PutImageTagMutability.go index d92a128ddab..e53997d8e91 100644 --- a/service/ecr/api_op_PutImageTagMutability.go +++ b/service/ecr/api_op_PutImageTagMutability.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecr/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) PutImageTagMutability(ctx context.Context, params *PutImageTagM addawsAwsjson11_serdeOpPutImageTagMutabilityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_PutLifecyclePolicy.go b/service/ecr/api_op_PutLifecyclePolicy.go index 135f93abc23..f1913bb0583 100644 --- a/service/ecr/api_op_PutLifecyclePolicy.go +++ b/service/ecr/api_op_PutLifecyclePolicy.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) PutLifecyclePolicy(ctx context.Context, params *PutLifecyclePol addawsAwsjson11_serdeOpPutLifecyclePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_SetRepositoryPolicy.go b/service/ecr/api_op_SetRepositoryPolicy.go index 6cffd11090f..7b138bcbc32 100644 --- a/service/ecr/api_op_SetRepositoryPolicy.go +++ b/service/ecr/api_op_SetRepositoryPolicy.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) SetRepositoryPolicy(ctx context.Context, params *SetRepositoryP addawsAwsjson11_serdeOpSetRepositoryPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_StartImageScan.go b/service/ecr/api_op_StartImageScan.go index f9af86247a4..0fc07e7afa0 100644 --- a/service/ecr/api_op_StartImageScan.go +++ b/service/ecr/api_op_StartImageScan.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecr/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) StartImageScan(ctx context.Context, params *StartImageScanInput addawsAwsjson11_serdeOpStartImageScanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_StartLifecyclePolicyPreview.go b/service/ecr/api_op_StartLifecyclePolicyPreview.go index d45145b0ed9..3d7e58f94c2 100644 --- a/service/ecr/api_op_StartLifecyclePolicyPreview.go +++ b/service/ecr/api_op_StartLifecyclePolicyPreview.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecr/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) StartLifecyclePolicyPreview(ctx context.Context, params *StartL addawsAwsjson11_serdeOpStartLifecyclePolicyPreviewMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_TagResource.go b/service/ecr/api_op_TagResource.go index bd7b185a279..e31cb8107d8 100644 --- a/service/ecr/api_op_TagResource.go +++ b/service/ecr/api_op_TagResource.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecr/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_UntagResource.go b/service/ecr/api_op_UntagResource.go index 45c172464db..aa8810ba5a0 100644 --- a/service/ecr/api_op_UntagResource.go +++ b/service/ecr/api_op_UntagResource.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/api_op_UploadLayerPart.go b/service/ecr/api_op_UploadLayerPart.go index 8a39174833f..9c5bda13bb0 100644 --- a/service/ecr/api_op_UploadLayerPart.go +++ b/service/ecr/api_op_UploadLayerPart.go @@ -5,7 +5,6 @@ package ecr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) UploadLayerPart(ctx context.Context, params *UploadLayerPartInp addawsAwsjson11_serdeOpUploadLayerPartMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecr/endpoints.go b/service/ecr/endpoints.go index 0f4aa664eff..3a02479a57b 100644 --- a/service/ecr/endpoints.go +++ b/service/ecr/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/ecs/api_client.go b/service/ecs/api_client.go index 4064a43b6fe..c44a64f1457 100644 --- a/service/ecs/api_client.go +++ b/service/ecs/api_client.go @@ -93,30 +93,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -182,6 +158,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/ecs/api_op_CreateCapacityProvider.go b/service/ecs/api_op_CreateCapacityProvider.go index 44a72cd910e..e7627b36e1d 100644 --- a/service/ecs/api_op_CreateCapacityProvider.go +++ b/service/ecs/api_op_CreateCapacityProvider.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateCapacityProvider(ctx context.Context, params *CreateCapac addawsAwsjson11_serdeOpCreateCapacityProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_CreateCluster.go b/service/ecs/api_op_CreateCluster.go index f3aebd07866..ae27aa90f2f 100644 --- a/service/ecs/api_op_CreateCluster.go +++ b/service/ecs/api_op_CreateCluster.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) CreateCluster(ctx context.Context, params *CreateClusterInput, addawsAwsjson11_serdeOpCreateClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_CreateService.go b/service/ecs/api_op_CreateService.go index 0cef768209f..c65a3df9721 100644 --- a/service/ecs/api_op_CreateService.go +++ b/service/ecs/api_op_CreateService.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -121,9 +120,9 @@ func (c *Client) CreateService(ctx context.Context, params *CreateServiceInput, addawsAwsjson11_serdeOpCreateServiceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_CreateTaskSet.go b/service/ecs/api_op_CreateTaskSet.go index dc8978274cf..c3dba58b18f 100644 --- a/service/ecs/api_op_CreateTaskSet.go +++ b/service/ecs/api_op_CreateTaskSet.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateTaskSet(ctx context.Context, params *CreateTaskSetInput, addawsAwsjson11_serdeOpCreateTaskSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_DeleteAccountSetting.go b/service/ecs/api_op_DeleteAccountSetting.go index 911f69c97f1..0e6b2816e2a 100644 --- a/service/ecs/api_op_DeleteAccountSetting.go +++ b/service/ecs/api_op_DeleteAccountSetting.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteAccountSetting(ctx context.Context, params *DeleteAccount addawsAwsjson11_serdeOpDeleteAccountSettingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_DeleteAttributes.go b/service/ecs/api_op_DeleteAttributes.go index 7267420d6e5..963e399f50a 100644 --- a/service/ecs/api_op_DeleteAttributes.go +++ b/service/ecs/api_op_DeleteAttributes.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteAttributes(ctx context.Context, params *DeleteAttributesI addawsAwsjson11_serdeOpDeleteAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_DeleteCapacityProvider.go b/service/ecs/api_op_DeleteCapacityProvider.go index e0889381b88..4c63e511176 100644 --- a/service/ecs/api_op_DeleteCapacityProvider.go +++ b/service/ecs/api_op_DeleteCapacityProvider.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) DeleteCapacityProvider(ctx context.Context, params *DeleteCapac addawsAwsjson11_serdeOpDeleteCapacityProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_DeleteCluster.go b/service/ecs/api_op_DeleteCluster.go index 928c031f66f..ea8cbb32c0a 100644 --- a/service/ecs/api_op_DeleteCluster.go +++ b/service/ecs/api_op_DeleteCluster.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DeleteCluster(ctx context.Context, params *DeleteClusterInput, addawsAwsjson11_serdeOpDeleteClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_DeleteService.go b/service/ecs/api_op_DeleteService.go index 428d3310f85..d36d7b33fb7 100644 --- a/service/ecs/api_op_DeleteService.go +++ b/service/ecs/api_op_DeleteService.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) DeleteService(ctx context.Context, params *DeleteServiceInput, addawsAwsjson11_serdeOpDeleteServiceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_DeleteTaskSet.go b/service/ecs/api_op_DeleteTaskSet.go index 61a392ec3e8..ca668b8abdc 100644 --- a/service/ecs/api_op_DeleteTaskSet.go +++ b/service/ecs/api_op_DeleteTaskSet.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeleteTaskSet(ctx context.Context, params *DeleteTaskSetInput, addawsAwsjson11_serdeOpDeleteTaskSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_DeregisterContainerInstance.go b/service/ecs/api_op_DeregisterContainerInstance.go index 37fa938a4e9..4f931ca4477 100644 --- a/service/ecs/api_op_DeregisterContainerInstance.go +++ b/service/ecs/api_op_DeregisterContainerInstance.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) DeregisterContainerInstance(ctx context.Context, params *Deregi addawsAwsjson11_serdeOpDeregisterContainerInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_DeregisterTaskDefinition.go b/service/ecs/api_op_DeregisterTaskDefinition.go index aca81a5ef93..de8c748a171 100644 --- a/service/ecs/api_op_DeregisterTaskDefinition.go +++ b/service/ecs/api_op_DeregisterTaskDefinition.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) DeregisterTaskDefinition(ctx context.Context, params *Deregiste addawsAwsjson11_serdeOpDeregisterTaskDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_DescribeCapacityProviders.go b/service/ecs/api_op_DescribeCapacityProviders.go index 631abdc54db..a786420267a 100644 --- a/service/ecs/api_op_DescribeCapacityProviders.go +++ b/service/ecs/api_op_DescribeCapacityProviders.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeCapacityProviders(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeCapacityProvidersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_DescribeClusters.go b/service/ecs/api_op_DescribeClusters.go index 74d0e6399ba..6012be2ac39 100644 --- a/service/ecs/api_op_DescribeClusters.go +++ b/service/ecs/api_op_DescribeClusters.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeClusters(ctx context.Context, params *DescribeClustersI addawsAwsjson11_serdeOpDescribeClustersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_DescribeContainerInstances.go b/service/ecs/api_op_DescribeContainerInstances.go index 8af17df20cf..24cdf862b75 100644 --- a/service/ecs/api_op_DescribeContainerInstances.go +++ b/service/ecs/api_op_DescribeContainerInstances.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeContainerInstances(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeContainerInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_DescribeServices.go b/service/ecs/api_op_DescribeServices.go index 4b8c455eac6..e913b88db74 100644 --- a/service/ecs/api_op_DescribeServices.go +++ b/service/ecs/api_op_DescribeServices.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeServices(ctx context.Context, params *DescribeServicesI addawsAwsjson11_serdeOpDescribeServicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_DescribeTaskDefinition.go b/service/ecs/api_op_DescribeTaskDefinition.go index b424cd6285c..f2a0241b700 100644 --- a/service/ecs/api_op_DescribeTaskDefinition.go +++ b/service/ecs/api_op_DescribeTaskDefinition.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeTaskDefinition(ctx context.Context, params *DescribeTas addawsAwsjson11_serdeOpDescribeTaskDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_DescribeTaskSets.go b/service/ecs/api_op_DescribeTaskSets.go index 8925a9378d6..ec557cea734 100644 --- a/service/ecs/api_op_DescribeTaskSets.go +++ b/service/ecs/api_op_DescribeTaskSets.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeTaskSets(ctx context.Context, params *DescribeTaskSetsI addawsAwsjson11_serdeOpDescribeTaskSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_DescribeTasks.go b/service/ecs/api_op_DescribeTasks.go index 2680f50a234..da9f115590a 100644 --- a/service/ecs/api_op_DescribeTasks.go +++ b/service/ecs/api_op_DescribeTasks.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeTasks(ctx context.Context, params *DescribeTasksInput, addawsAwsjson11_serdeOpDescribeTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_DiscoverPollEndpoint.go b/service/ecs/api_op_DiscoverPollEndpoint.go index e819e536188..ce6777faf83 100644 --- a/service/ecs/api_op_DiscoverPollEndpoint.go +++ b/service/ecs/api_op_DiscoverPollEndpoint.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DiscoverPollEndpoint(ctx context.Context, params *DiscoverPollE addawsAwsjson11_serdeOpDiscoverPollEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_ListAccountSettings.go b/service/ecs/api_op_ListAccountSettings.go index 99733b519c6..ad96d676ce4 100644 --- a/service/ecs/api_op_ListAccountSettings.go +++ b/service/ecs/api_op_ListAccountSettings.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListAccountSettings(ctx context.Context, params *ListAccountSet addawsAwsjson11_serdeOpListAccountSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_ListAttributes.go b/service/ecs/api_op_ListAttributes.go index 2da11c65316..508d9805834 100644 --- a/service/ecs/api_op_ListAttributes.go +++ b/service/ecs/api_op_ListAttributes.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListAttributes(ctx context.Context, params *ListAttributesInput addawsAwsjson11_serdeOpListAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_ListClusters.go b/service/ecs/api_op_ListClusters.go index 29f3840536f..b1490c3ae64 100644 --- a/service/ecs/api_op_ListClusters.go +++ b/service/ecs/api_op_ListClusters.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListClusters(ctx context.Context, params *ListClustersInput, op addawsAwsjson11_serdeOpListClustersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_ListContainerInstances.go b/service/ecs/api_op_ListContainerInstances.go index 82b8038e2ad..d2def6867e8 100644 --- a/service/ecs/api_op_ListContainerInstances.go +++ b/service/ecs/api_op_ListContainerInstances.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListContainerInstances(ctx context.Context, params *ListContain addawsAwsjson11_serdeOpListContainerInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_ListServices.go b/service/ecs/api_op_ListServices.go index c6fae67bfab..7fd7e27d30a 100644 --- a/service/ecs/api_op_ListServices.go +++ b/service/ecs/api_op_ListServices.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListServices(ctx context.Context, params *ListServicesInput, op addawsAwsjson11_serdeOpListServicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_ListTagsForResource.go b/service/ecs/api_op_ListTagsForResource.go index 11be4f3eafa..bc01b84a638 100644 --- a/service/ecs/api_op_ListTagsForResource.go +++ b/service/ecs/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_ListTaskDefinitionFamilies.go b/service/ecs/api_op_ListTaskDefinitionFamilies.go index d3a1a88b964..474dbcda6ff 100644 --- a/service/ecs/api_op_ListTaskDefinitionFamilies.go +++ b/service/ecs/api_op_ListTaskDefinitionFamilies.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListTaskDefinitionFamilies(ctx context.Context, params *ListTas addawsAwsjson11_serdeOpListTaskDefinitionFamiliesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_ListTaskDefinitions.go b/service/ecs/api_op_ListTaskDefinitions.go index f151a560cf9..08950ae4536 100644 --- a/service/ecs/api_op_ListTaskDefinitions.go +++ b/service/ecs/api_op_ListTaskDefinitions.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListTaskDefinitions(ctx context.Context, params *ListTaskDefini addawsAwsjson11_serdeOpListTaskDefinitionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_ListTasks.go b/service/ecs/api_op_ListTasks.go index acba11a9fda..33d12c483bb 100644 --- a/service/ecs/api_op_ListTasks.go +++ b/service/ecs/api_op_ListTasks.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListTasks(ctx context.Context, params *ListTasksInput, optFns . addawsAwsjson11_serdeOpListTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_PutAccountSetting.go b/service/ecs/api_op_PutAccountSetting.go index 9af318209a1..97b74ceb87f 100644 --- a/service/ecs/api_op_PutAccountSetting.go +++ b/service/ecs/api_op_PutAccountSetting.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -49,9 +48,9 @@ func (c *Client) PutAccountSetting(ctx context.Context, params *PutAccountSettin addawsAwsjson11_serdeOpPutAccountSettingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_PutAccountSettingDefault.go b/service/ecs/api_op_PutAccountSettingDefault.go index dfedb527b2e..1defed43a28 100644 --- a/service/ecs/api_op_PutAccountSettingDefault.go +++ b/service/ecs/api_op_PutAccountSettingDefault.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) PutAccountSettingDefault(ctx context.Context, params *PutAccoun addawsAwsjson11_serdeOpPutAccountSettingDefaultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_PutAttributes.go b/service/ecs/api_op_PutAttributes.go index 8dc29a34a00..1202b89f626 100644 --- a/service/ecs/api_op_PutAttributes.go +++ b/service/ecs/api_op_PutAttributes.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) PutAttributes(ctx context.Context, params *PutAttributesInput, addawsAwsjson11_serdeOpPutAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_PutClusterCapacityProviders.go b/service/ecs/api_op_PutClusterCapacityProviders.go index 9a16ac23bc2..f9a834af7ba 100644 --- a/service/ecs/api_op_PutClusterCapacityProviders.go +++ b/service/ecs/api_op_PutClusterCapacityProviders.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) PutClusterCapacityProviders(ctx context.Context, params *PutClu addawsAwsjson11_serdeOpPutClusterCapacityProvidersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_RegisterContainerInstance.go b/service/ecs/api_op_RegisterContainerInstance.go index 7dbf5f3e27d..d462f6eea12 100644 --- a/service/ecs/api_op_RegisterContainerInstance.go +++ b/service/ecs/api_op_RegisterContainerInstance.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) RegisterContainerInstance(ctx context.Context, params *Register addawsAwsjson11_serdeOpRegisterContainerInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_RegisterTaskDefinition.go b/service/ecs/api_op_RegisterTaskDefinition.go index c50f24d531a..79da0448164 100644 --- a/service/ecs/api_op_RegisterTaskDefinition.go +++ b/service/ecs/api_op_RegisterTaskDefinition.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) RegisterTaskDefinition(ctx context.Context, params *RegisterTas addawsAwsjson11_serdeOpRegisterTaskDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_RunTask.go b/service/ecs/api_op_RunTask.go index 57bde938985..f07700f262a 100644 --- a/service/ecs/api_op_RunTask.go +++ b/service/ecs/api_op_RunTask.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -48,9 +47,9 @@ func (c *Client) RunTask(ctx context.Context, params *RunTaskInput, optFns ...fu addawsAwsjson11_serdeOpRunTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_StartTask.go b/service/ecs/api_op_StartTask.go index 22a1ef7011e..b077c03be6a 100644 --- a/service/ecs/api_op_StartTask.go +++ b/service/ecs/api_op_StartTask.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) StartTask(ctx context.Context, params *StartTaskInput, optFns . addawsAwsjson11_serdeOpStartTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_StopTask.go b/service/ecs/api_op_StopTask.go index 87f66c1126d..5dd4235fa13 100644 --- a/service/ecs/api_op_StopTask.go +++ b/service/ecs/api_op_StopTask.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) StopTask(ctx context.Context, params *StopTaskInput, optFns ... addawsAwsjson11_serdeOpStopTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_SubmitAttachmentStateChanges.go b/service/ecs/api_op_SubmitAttachmentStateChanges.go index 647fa876cd0..18228b68e81 100644 --- a/service/ecs/api_op_SubmitAttachmentStateChanges.go +++ b/service/ecs/api_op_SubmitAttachmentStateChanges.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) SubmitAttachmentStateChanges(ctx context.Context, params *Submi addawsAwsjson11_serdeOpSubmitAttachmentStateChangesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_SubmitContainerStateChange.go b/service/ecs/api_op_SubmitContainerStateChange.go index f8212e41d41..1da6beabd38 100644 --- a/service/ecs/api_op_SubmitContainerStateChange.go +++ b/service/ecs/api_op_SubmitContainerStateChange.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) SubmitContainerStateChange(ctx context.Context, params *SubmitC addawsAwsjson11_serdeOpSubmitContainerStateChangeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_SubmitTaskStateChange.go b/service/ecs/api_op_SubmitTaskStateChange.go index 21c919b116b..1b35aa8d86f 100644 --- a/service/ecs/api_op_SubmitTaskStateChange.go +++ b/service/ecs/api_op_SubmitTaskStateChange.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) SubmitTaskStateChange(ctx context.Context, params *SubmitTaskSt addawsAwsjson11_serdeOpSubmitTaskStateChangeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_TagResource.go b/service/ecs/api_op_TagResource.go index d9f960fcfc6..f6e4ff68ab6 100644 --- a/service/ecs/api_op_TagResource.go +++ b/service/ecs/api_op_TagResource.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_UntagResource.go b/service/ecs/api_op_UntagResource.go index 79f374d8c7d..3a08fab5766 100644 --- a/service/ecs/api_op_UntagResource.go +++ b/service/ecs/api_op_UntagResource.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_UpdateClusterSettings.go b/service/ecs/api_op_UpdateClusterSettings.go index c8290147b73..4857c794c15 100644 --- a/service/ecs/api_op_UpdateClusterSettings.go +++ b/service/ecs/api_op_UpdateClusterSettings.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateClusterSettings(ctx context.Context, params *UpdateCluste addawsAwsjson11_serdeOpUpdateClusterSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_UpdateContainerAgent.go b/service/ecs/api_op_UpdateContainerAgent.go index 969d8236ab2..ea24d35d3b8 100644 --- a/service/ecs/api_op_UpdateContainerAgent.go +++ b/service/ecs/api_op_UpdateContainerAgent.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) UpdateContainerAgent(ctx context.Context, params *UpdateContain addawsAwsjson11_serdeOpUpdateContainerAgentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_UpdateContainerInstancesState.go b/service/ecs/api_op_UpdateContainerInstancesState.go index 6e858143bcb..9f4fb8d6b1b 100644 --- a/service/ecs/api_op_UpdateContainerInstancesState.go +++ b/service/ecs/api_op_UpdateContainerInstancesState.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -64,9 +63,9 @@ func (c *Client) UpdateContainerInstancesState(ctx context.Context, params *Upda addawsAwsjson11_serdeOpUpdateContainerInstancesStateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_UpdateService.go b/service/ecs/api_op_UpdateService.go index 38b9f9fcbe7..b923f48caa3 100644 --- a/service/ecs/api_op_UpdateService.go +++ b/service/ecs/api_op_UpdateService.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -116,9 +115,9 @@ func (c *Client) UpdateService(ctx context.Context, params *UpdateServiceInput, addawsAwsjson11_serdeOpUpdateServiceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_UpdateServicePrimaryTaskSet.go b/service/ecs/api_op_UpdateServicePrimaryTaskSet.go index 6019b2d3ea6..3e03976b64b 100644 --- a/service/ecs/api_op_UpdateServicePrimaryTaskSet.go +++ b/service/ecs/api_op_UpdateServicePrimaryTaskSet.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) UpdateServicePrimaryTaskSet(ctx context.Context, params *Update addawsAwsjson11_serdeOpUpdateServicePrimaryTaskSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/api_op_UpdateTaskSet.go b/service/ecs/api_op_UpdateTaskSet.go index 50ef5fad420..63d511e2bb2 100644 --- a/service/ecs/api_op_UpdateTaskSet.go +++ b/service/ecs/api_op_UpdateTaskSet.go @@ -5,7 +5,6 @@ package ecs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ecs/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateTaskSet(ctx context.Context, params *UpdateTaskSetInput, addawsAwsjson11_serdeOpUpdateTaskSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ecs/endpoints.go b/service/ecs/endpoints.go index d0453582f41..fa5753c921b 100644 --- a/service/ecs/endpoints.go +++ b/service/ecs/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/efs/api_client.go b/service/efs/api_client.go index 17cae22a4e4..b60f9d8b4fd 100644 --- a/service/efs/api_client.go +++ b/service/efs/api_client.go @@ -90,34 +90,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -190,6 +162,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/efs/api_op_CreateAccessPoint.go b/service/efs/api_op_CreateAccessPoint.go index 159902e8a5f..4dcf75bbd5a 100644 --- a/service/efs/api_op_CreateAccessPoint.go +++ b/service/efs/api_op_CreateAccessPoint.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/efs/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) CreateAccessPoint(ctx context.Context, params *CreateAccessPoin addawsRestjson1_serdeOpCreateAccessPointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_CreateFileSystem.go b/service/efs/api_op_CreateFileSystem.go index c5e40b45f22..822a3034f3d 100644 --- a/service/efs/api_op_CreateFileSystem.go +++ b/service/efs/api_op_CreateFileSystem.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/efs/types" smithy "github.com/awslabs/smithy-go" @@ -67,9 +66,9 @@ func (c *Client) CreateFileSystem(ctx context.Context, params *CreateFileSystemI addawsRestjson1_serdeOpCreateFileSystemMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_CreateMountTarget.go b/service/efs/api_op_CreateMountTarget.go index f7c95998d3e..30d9bf421cb 100644 --- a/service/efs/api_op_CreateMountTarget.go +++ b/service/efs/api_op_CreateMountTarget.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/efs/types" smithy "github.com/awslabs/smithy-go" @@ -100,9 +99,9 @@ func (c *Client) CreateMountTarget(ctx context.Context, params *CreateMountTarge addawsRestjson1_serdeOpCreateMountTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_CreateTags.go b/service/efs/api_op_CreateTags.go index 704b3f2a27d..bd188e0dc6e 100644 --- a/service/efs/api_op_CreateTags.go +++ b/service/efs/api_op_CreateTags.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/efs/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateTags(ctx context.Context, params *CreateTagsInput, optFns addawsRestjson1_serdeOpCreateTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_DeleteAccessPoint.go b/service/efs/api_op_DeleteAccessPoint.go index 63a0d6d6a85..9bcceffec08 100644 --- a/service/efs/api_op_DeleteAccessPoint.go +++ b/service/efs/api_op_DeleteAccessPoint.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteAccessPoint(ctx context.Context, params *DeleteAccessPoin addawsRestjson1_serdeOpDeleteAccessPointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_DeleteFileSystem.go b/service/efs/api_op_DeleteFileSystem.go index 77e4881a1e7..ca9ad879569 100644 --- a/service/efs/api_op_DeleteFileSystem.go +++ b/service/efs/api_op_DeleteFileSystem.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) DeleteFileSystem(ctx context.Context, params *DeleteFileSystemI addawsRestjson1_serdeOpDeleteFileSystemMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_DeleteFileSystemPolicy.go b/service/efs/api_op_DeleteFileSystemPolicy.go index 042881a20aa..25489130a3a 100644 --- a/service/efs/api_op_DeleteFileSystemPolicy.go +++ b/service/efs/api_op_DeleteFileSystemPolicy.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeleteFileSystemPolicy(ctx context.Context, params *DeleteFileS addawsRestjson1_serdeOpDeleteFileSystemPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_DeleteMountTarget.go b/service/efs/api_op_DeleteMountTarget.go index be5b269d568..f4938ae626a 100644 --- a/service/efs/api_op_DeleteMountTarget.go +++ b/service/efs/api_op_DeleteMountTarget.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -39,9 +38,9 @@ func (c *Client) DeleteMountTarget(ctx context.Context, params *DeleteMountTarge addawsRestjson1_serdeOpDeleteMountTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_DeleteTags.go b/service/efs/api_op_DeleteTags.go index 5b099328d9b..239495513ba 100644 --- a/service/efs/api_op_DeleteTags.go +++ b/service/efs/api_op_DeleteTags.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeleteTags(ctx context.Context, params *DeleteTagsInput, optFns addawsRestjson1_serdeOpDeleteTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_DescribeAccessPoints.go b/service/efs/api_op_DescribeAccessPoints.go index da7c1f15e4d..748cb0758b0 100644 --- a/service/efs/api_op_DescribeAccessPoints.go +++ b/service/efs/api_op_DescribeAccessPoints.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/efs/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeAccessPoints(ctx context.Context, params *DescribeAcces addawsRestjson1_serdeOpDescribeAccessPointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_DescribeBackupPolicy.go b/service/efs/api_op_DescribeBackupPolicy.go index 3cbed128eb4..bae5547b141 100644 --- a/service/efs/api_op_DescribeBackupPolicy.go +++ b/service/efs/api_op_DescribeBackupPolicy.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/efs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeBackupPolicy(ctx context.Context, params *DescribeBacku addawsRestjson1_serdeOpDescribeBackupPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_DescribeFileSystemPolicy.go b/service/efs/api_op_DescribeFileSystemPolicy.go index 9512b25046d..55eea59baea 100644 --- a/service/efs/api_op_DescribeFileSystemPolicy.go +++ b/service/efs/api_op_DescribeFileSystemPolicy.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DescribeFileSystemPolicy(ctx context.Context, params *DescribeF addawsRestjson1_serdeOpDescribeFileSystemPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_DescribeFileSystems.go b/service/efs/api_op_DescribeFileSystems.go index 328b61dfbb7..1cf77ade3fa 100644 --- a/service/efs/api_op_DescribeFileSystems.go +++ b/service/efs/api_op_DescribeFileSystems.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/efs/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) DescribeFileSystems(ctx context.Context, params *DescribeFileSy addawsRestjson1_serdeOpDescribeFileSystemsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_DescribeLifecycleConfiguration.go b/service/efs/api_op_DescribeLifecycleConfiguration.go index 8cbf0ddf650..af58aa9d57b 100644 --- a/service/efs/api_op_DescribeLifecycleConfiguration.go +++ b/service/efs/api_op_DescribeLifecycleConfiguration.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/efs/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeLifecycleConfiguration(ctx context.Context, params *Des addawsRestjson1_serdeOpDescribeLifecycleConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_DescribeMountTargetSecurityGroups.go b/service/efs/api_op_DescribeMountTargetSecurityGroups.go index 4698a01af43..ede9a519354 100644 --- a/service/efs/api_op_DescribeMountTargetSecurityGroups.go +++ b/service/efs/api_op_DescribeMountTargetSecurityGroups.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) DescribeMountTargetSecurityGroups(ctx context.Context, params * addawsRestjson1_serdeOpDescribeMountTargetSecurityGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_DescribeMountTargets.go b/service/efs/api_op_DescribeMountTargets.go index 51c39f0ef11..22990e350c8 100644 --- a/service/efs/api_op_DescribeMountTargets.go +++ b/service/efs/api_op_DescribeMountTargets.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/efs/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeMountTargets(ctx context.Context, params *DescribeMount addawsRestjson1_serdeOpDescribeMountTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_DescribeTags.go b/service/efs/api_op_DescribeTags.go index 60e14f91dcb..5078c6cd0a5 100644 --- a/service/efs/api_op_DescribeTags.go +++ b/service/efs/api_op_DescribeTags.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/efs/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeTags(ctx context.Context, params *DescribeTagsInput, op addawsRestjson1_serdeOpDescribeTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_ListTagsForResource.go b/service/efs/api_op_ListTagsForResource.go index 616f239b375..1c1427f60b3 100644 --- a/service/efs/api_op_ListTagsForResource.go +++ b/service/efs/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/efs/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_ModifyMountTargetSecurityGroups.go b/service/efs/api_op_ModifyMountTargetSecurityGroups.go index 76dd1469a30..2513a12be8f 100644 --- a/service/efs/api_op_ModifyMountTargetSecurityGroups.go +++ b/service/efs/api_op_ModifyMountTargetSecurityGroups.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -36,9 +35,9 @@ func (c *Client) ModifyMountTargetSecurityGroups(ctx context.Context, params *Mo addawsRestjson1_serdeOpModifyMountTargetSecurityGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_PutBackupPolicy.go b/service/efs/api_op_PutBackupPolicy.go index 7268a551e56..79a8b05970c 100644 --- a/service/efs/api_op_PutBackupPolicy.go +++ b/service/efs/api_op_PutBackupPolicy.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/efs/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutBackupPolicy(ctx context.Context, params *PutBackupPolicyInp addawsRestjson1_serdeOpPutBackupPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_PutFileSystemPolicy.go b/service/efs/api_op_PutFileSystemPolicy.go index 4ec98ec85c4..abd8d2b5416 100644 --- a/service/efs/api_op_PutFileSystemPolicy.go +++ b/service/efs/api_op_PutFileSystemPolicy.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) PutFileSystemPolicy(ctx context.Context, params *PutFileSystemP addawsRestjson1_serdeOpPutFileSystemPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_PutLifecycleConfiguration.go b/service/efs/api_op_PutLifecycleConfiguration.go index 05b56242de8..f7db604a0d0 100644 --- a/service/efs/api_op_PutLifecycleConfiguration.go +++ b/service/efs/api_op_PutLifecycleConfiguration.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/efs/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) PutLifecycleConfiguration(ctx context.Context, params *PutLifec addawsRestjson1_serdeOpPutLifecycleConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_TagResource.go b/service/efs/api_op_TagResource.go index ea393a51fb5..f7a9688ddb9 100644 --- a/service/efs/api_op_TagResource.go +++ b/service/efs/api_op_TagResource.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/efs/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_UntagResource.go b/service/efs/api_op_UntagResource.go index e8eedd54aae..e1aadef4ccd 100644 --- a/service/efs/api_op_UntagResource.go +++ b/service/efs/api_op_UntagResource.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/api_op_UpdateFileSystem.go b/service/efs/api_op_UpdateFileSystem.go index 7e4e5c661b5..175086b7256 100644 --- a/service/efs/api_op_UpdateFileSystem.go +++ b/service/efs/api_op_UpdateFileSystem.go @@ -5,7 +5,6 @@ package efs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/efs/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateFileSystem(ctx context.Context, params *UpdateFileSystemI addawsRestjson1_serdeOpUpdateFileSystemMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/efs/endpoints.go b/service/efs/endpoints.go index b7d9444f91c..2a39c0ea356 100644 --- a/service/efs/endpoints.go +++ b/service/efs/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/eks/api_client.go b/service/eks/api_client.go index 7dfd5400595..1afd5b404ad 100644 --- a/service/eks/api_client.go +++ b/service/eks/api_client.go @@ -95,34 +95,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -195,6 +167,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/eks/api_op_CreateCluster.go b/service/eks/api_op_CreateCluster.go index 7e1cf8fa000..f60a7f0e91b 100644 --- a/service/eks/api_op_CreateCluster.go +++ b/service/eks/api_op_CreateCluster.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eks/types" smithy "github.com/awslabs/smithy-go" @@ -57,9 +56,9 @@ func (c *Client) CreateCluster(ctx context.Context, params *CreateClusterInput, addawsRestjson1_serdeOpCreateClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_CreateFargateProfile.go b/service/eks/api_op_CreateFargateProfile.go index 2bd74498876..8dc378ef134 100644 --- a/service/eks/api_op_CreateFargateProfile.go +++ b/service/eks/api_op_CreateFargateProfile.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eks/types" smithy "github.com/awslabs/smithy-go" @@ -50,9 +49,9 @@ func (c *Client) CreateFargateProfile(ctx context.Context, params *CreateFargate addawsRestjson1_serdeOpCreateFargateProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_CreateNodegroup.go b/service/eks/api_op_CreateNodegroup.go index 224ce049e3a..2ad2fc0a911 100644 --- a/service/eks/api_op_CreateNodegroup.go +++ b/service/eks/api_op_CreateNodegroup.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eks/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) CreateNodegroup(ctx context.Context, params *CreateNodegroupInp addawsRestjson1_serdeOpCreateNodegroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_DeleteCluster.go b/service/eks/api_op_DeleteCluster.go index 55e0d0956d4..11b69912a3a 100644 --- a/service/eks/api_op_DeleteCluster.go +++ b/service/eks/api_op_DeleteCluster.go @@ -5,7 +5,6 @@ package eks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eks/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DeleteCluster(ctx context.Context, params *DeleteClusterInput, addawsRestjson1_serdeOpDeleteClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_DeleteFargateProfile.go b/service/eks/api_op_DeleteFargateProfile.go index a847087102f..3ced11bc005 100644 --- a/service/eks/api_op_DeleteFargateProfile.go +++ b/service/eks/api_op_DeleteFargateProfile.go @@ -5,7 +5,6 @@ package eks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eks/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DeleteFargateProfile(ctx context.Context, params *DeleteFargate addawsRestjson1_serdeOpDeleteFargateProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_DeleteNodegroup.go b/service/eks/api_op_DeleteNodegroup.go index dccd1b9288b..780d1cade89 100644 --- a/service/eks/api_op_DeleteNodegroup.go +++ b/service/eks/api_op_DeleteNodegroup.go @@ -5,7 +5,6 @@ package eks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eks/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteNodegroup(ctx context.Context, params *DeleteNodegroupInp addawsRestjson1_serdeOpDeleteNodegroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_DescribeCluster.go b/service/eks/api_op_DescribeCluster.go index b92b0a37dac..e27308dda35 100644 --- a/service/eks/api_op_DescribeCluster.go +++ b/service/eks/api_op_DescribeCluster.go @@ -5,7 +5,6 @@ package eks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eks/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeCluster(ctx context.Context, params *DescribeClusterInp addawsRestjson1_serdeOpDescribeClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_DescribeFargateProfile.go b/service/eks/api_op_DescribeFargateProfile.go index 54f56a63822..424292e017c 100644 --- a/service/eks/api_op_DescribeFargateProfile.go +++ b/service/eks/api_op_DescribeFargateProfile.go @@ -5,7 +5,6 @@ package eks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eks/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeFargateProfile(ctx context.Context, params *DescribeFar addawsRestjson1_serdeOpDescribeFargateProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_DescribeNodegroup.go b/service/eks/api_op_DescribeNodegroup.go index 396c9cd4b21..9d1fc8d74bf 100644 --- a/service/eks/api_op_DescribeNodegroup.go +++ b/service/eks/api_op_DescribeNodegroup.go @@ -5,7 +5,6 @@ package eks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eks/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeNodegroup(ctx context.Context, params *DescribeNodegrou addawsRestjson1_serdeOpDescribeNodegroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_DescribeUpdate.go b/service/eks/api_op_DescribeUpdate.go index b3950f6955a..7f678d23fb8 100644 --- a/service/eks/api_op_DescribeUpdate.go +++ b/service/eks/api_op_DescribeUpdate.go @@ -5,7 +5,6 @@ package eks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eks/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeUpdate(ctx context.Context, params *DescribeUpdateInput addawsRestjson1_serdeOpDescribeUpdateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_ListClusters.go b/service/eks/api_op_ListClusters.go index 293c06f8155..d4d77cd1da6 100644 --- a/service/eks/api_op_ListClusters.go +++ b/service/eks/api_op_ListClusters.go @@ -5,7 +5,6 @@ package eks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListClusters(ctx context.Context, params *ListClustersInput, op addawsRestjson1_serdeOpListClustersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_ListFargateProfiles.go b/service/eks/api_op_ListFargateProfiles.go index d8cb7bbd726..e1eab797dd9 100644 --- a/service/eks/api_op_ListFargateProfiles.go +++ b/service/eks/api_op_ListFargateProfiles.go @@ -5,7 +5,6 @@ package eks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ListFargateProfiles(ctx context.Context, params *ListFargatePro addawsRestjson1_serdeOpListFargateProfilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_ListNodegroups.go b/service/eks/api_op_ListNodegroups.go index 660bc05c877..f62f0f8d124 100644 --- a/service/eks/api_op_ListNodegroups.go +++ b/service/eks/api_op_ListNodegroups.go @@ -5,7 +5,6 @@ package eks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ListNodegroups(ctx context.Context, params *ListNodegroupsInput addawsRestjson1_serdeOpListNodegroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_ListTagsForResource.go b/service/eks/api_op_ListTagsForResource.go index e95e7f926a4..c345d032a77 100644 --- a/service/eks/api_op_ListTagsForResource.go +++ b/service/eks/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package eks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_ListUpdates.go b/service/eks/api_op_ListUpdates.go index 7dbb09d632e..f41c470064f 100644 --- a/service/eks/api_op_ListUpdates.go +++ b/service/eks/api_op_ListUpdates.go @@ -5,7 +5,6 @@ package eks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ListUpdates(ctx context.Context, params *ListUpdatesInput, optF addawsRestjson1_serdeOpListUpdatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_TagResource.go b/service/eks/api_op_TagResource.go index 10d2c1fdd7c..18535a97fc9 100644 --- a/service/eks/api_op_TagResource.go +++ b/service/eks/api_op_TagResource.go @@ -5,7 +5,6 @@ package eks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_UntagResource.go b/service/eks/api_op_UntagResource.go index 51d638c7504..0704e3aa9ec 100644 --- a/service/eks/api_op_UntagResource.go +++ b/service/eks/api_op_UntagResource.go @@ -5,7 +5,6 @@ package eks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_UpdateClusterConfig.go b/service/eks/api_op_UpdateClusterConfig.go index 22fba6d6490..6f262090e74 100644 --- a/service/eks/api_op_UpdateClusterConfig.go +++ b/service/eks/api_op_UpdateClusterConfig.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eks/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) UpdateClusterConfig(ctx context.Context, params *UpdateClusterC addawsRestjson1_serdeOpUpdateClusterConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_UpdateClusterVersion.go b/service/eks/api_op_UpdateClusterVersion.go index c1db00a243b..8422f8b7bb3 100644 --- a/service/eks/api_op_UpdateClusterVersion.go +++ b/service/eks/api_op_UpdateClusterVersion.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eks/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) UpdateClusterVersion(ctx context.Context, params *UpdateCluster addawsRestjson1_serdeOpUpdateClusterVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_UpdateNodegroupConfig.go b/service/eks/api_op_UpdateNodegroupConfig.go index 62628648722..3ba0caef4ed 100644 --- a/service/eks/api_op_UpdateNodegroupConfig.go +++ b/service/eks/api_op_UpdateNodegroupConfig.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eks/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) UpdateNodegroupConfig(ctx context.Context, params *UpdateNodegr addawsRestjson1_serdeOpUpdateNodegroupConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/api_op_UpdateNodegroupVersion.go b/service/eks/api_op_UpdateNodegroupVersion.go index 6fc498759b6..316bd97153f 100644 --- a/service/eks/api_op_UpdateNodegroupVersion.go +++ b/service/eks/api_op_UpdateNodegroupVersion.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eks/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) UpdateNodegroupVersion(ctx context.Context, params *UpdateNodeg addawsRestjson1_serdeOpUpdateNodegroupVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eks/endpoints.go b/service/eks/endpoints.go index 65595752f1a..6c72ac87be4 100644 --- a/service/eks/endpoints.go +++ b/service/eks/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/elasticache/api_client.go b/service/elasticache/api_client.go index d0ec5b1bcd0..1f67eefa13f 100644 --- a/service/elasticache/api_client.go +++ b/service/elasticache/api_client.go @@ -85,30 +85,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -174,6 +150,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/elasticache/api_op_AddTagsToResource.go b/service/elasticache/api_op_AddTagsToResource.go index 0f4cfd8b9bb..adc5a88b702 100644 --- a/service/elasticache/api_op_AddTagsToResource.go +++ b/service/elasticache/api_op_AddTagsToResource.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) AddTagsToResource(ctx context.Context, params *AddTagsToResourc addawsAwsquery_serdeOpAddTagsToResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_AuthorizeCacheSecurityGroupIngress.go b/service/elasticache/api_op_AuthorizeCacheSecurityGroupIngress.go index f33442d4707..0fb73e1f60a 100644 --- a/service/elasticache/api_op_AuthorizeCacheSecurityGroupIngress.go +++ b/service/elasticache/api_op_AuthorizeCacheSecurityGroupIngress.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) AuthorizeCacheSecurityGroupIngress(ctx context.Context, params addawsAwsquery_serdeOpAuthorizeCacheSecurityGroupIngressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_BatchApplyUpdateAction.go b/service/elasticache/api_op_BatchApplyUpdateAction.go index e56331d28be..4740d3f63e4 100644 --- a/service/elasticache/api_op_BatchApplyUpdateAction.go +++ b/service/elasticache/api_op_BatchApplyUpdateAction.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) BatchApplyUpdateAction(ctx context.Context, params *BatchApplyU addawsAwsquery_serdeOpBatchApplyUpdateActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_BatchStopUpdateAction.go b/service/elasticache/api_op_BatchStopUpdateAction.go index d801b99bf6a..9bca86dedec 100644 --- a/service/elasticache/api_op_BatchStopUpdateAction.go +++ b/service/elasticache/api_op_BatchStopUpdateAction.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) BatchStopUpdateAction(ctx context.Context, params *BatchStopUpd addawsAwsquery_serdeOpBatchStopUpdateActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_CompleteMigration.go b/service/elasticache/api_op_CompleteMigration.go index c21467ac24a..ba372c66820 100644 --- a/service/elasticache/api_op_CompleteMigration.go +++ b/service/elasticache/api_op_CompleteMigration.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CompleteMigration(ctx context.Context, params *CompleteMigratio addawsAwsquery_serdeOpCompleteMigrationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_CopySnapshot.go b/service/elasticache/api_op_CopySnapshot.go index 7ee15e4feca..8185cacc7bf 100644 --- a/service/elasticache/api_op_CopySnapshot.go +++ b/service/elasticache/api_op_CopySnapshot.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -73,9 +72,9 @@ func (c *Client) CopySnapshot(ctx context.Context, params *CopySnapshotInput, op addawsAwsquery_serdeOpCopySnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_CreateCacheCluster.go b/service/elasticache/api_op_CreateCacheCluster.go index 6cfdab5de86..052cf234cab 100644 --- a/service/elasticache/api_op_CreateCacheCluster.go +++ b/service/elasticache/api_op_CreateCacheCluster.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateCacheCluster(ctx context.Context, params *CreateCacheClus addawsAwsquery_serdeOpCreateCacheClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_CreateCacheParameterGroup.go b/service/elasticache/api_op_CreateCacheParameterGroup.go index ca4e5cffc1a..8c8000cbb3d 100644 --- a/service/elasticache/api_op_CreateCacheParameterGroup.go +++ b/service/elasticache/api_op_CreateCacheParameterGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) CreateCacheParameterGroup(ctx context.Context, params *CreateCa addawsAwsquery_serdeOpCreateCacheParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_CreateCacheSecurityGroup.go b/service/elasticache/api_op_CreateCacheSecurityGroup.go index 31e162a2f01..bd84053c73a 100644 --- a/service/elasticache/api_op_CreateCacheSecurityGroup.go +++ b/service/elasticache/api_op_CreateCacheSecurityGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateCacheSecurityGroup(ctx context.Context, params *CreateCac addawsAwsquery_serdeOpCreateCacheSecurityGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_CreateCacheSubnetGroup.go b/service/elasticache/api_op_CreateCacheSubnetGroup.go index 8ccdec3dff5..13b69433e35 100644 --- a/service/elasticache/api_op_CreateCacheSubnetGroup.go +++ b/service/elasticache/api_op_CreateCacheSubnetGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateCacheSubnetGroup(ctx context.Context, params *CreateCache addawsAwsquery_serdeOpCreateCacheSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_CreateGlobalReplicationGroup.go b/service/elasticache/api_op_CreateGlobalReplicationGroup.go index d33dbbb3e96..d02570241b3 100644 --- a/service/elasticache/api_op_CreateGlobalReplicationGroup.go +++ b/service/elasticache/api_op_CreateGlobalReplicationGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) CreateGlobalReplicationGroup(ctx context.Context, params *Creat addawsAwsquery_serdeOpCreateGlobalReplicationGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_CreateReplicationGroup.go b/service/elasticache/api_op_CreateReplicationGroup.go index a7ab3b20ee5..b6490e6ef11 100644 --- a/service/elasticache/api_op_CreateReplicationGroup.go +++ b/service/elasticache/api_op_CreateReplicationGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) CreateReplicationGroup(ctx context.Context, params *CreateRepli addawsAwsquery_serdeOpCreateReplicationGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_CreateSnapshot.go b/service/elasticache/api_op_CreateSnapshot.go index 4e6554f3dd0..865edebae8c 100644 --- a/service/elasticache/api_op_CreateSnapshot.go +++ b/service/elasticache/api_op_CreateSnapshot.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateSnapshot(ctx context.Context, params *CreateSnapshotInput addawsAwsquery_serdeOpCreateSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DecreaseNodeGroupsInGlobalReplicationGroup.go b/service/elasticache/api_op_DecreaseNodeGroupsInGlobalReplicationGroup.go index 9ac464404de..e75843a82f9 100644 --- a/service/elasticache/api_op_DecreaseNodeGroupsInGlobalReplicationGroup.go +++ b/service/elasticache/api_op_DecreaseNodeGroupsInGlobalReplicationGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DecreaseNodeGroupsInGlobalReplicationGroup(ctx context.Context, addawsAwsquery_serdeOpDecreaseNodeGroupsInGlobalReplicationGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DecreaseReplicaCount.go b/service/elasticache/api_op_DecreaseReplicaCount.go index 014b5690d1e..68d44fece36 100644 --- a/service/elasticache/api_op_DecreaseReplicaCount.go +++ b/service/elasticache/api_op_DecreaseReplicaCount.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DecreaseReplicaCount(ctx context.Context, params *DecreaseRepli addawsAwsquery_serdeOpDecreaseReplicaCountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DeleteCacheCluster.go b/service/elasticache/api_op_DeleteCacheCluster.go index 2d8114d2c20..edd215d6869 100644 --- a/service/elasticache/api_op_DeleteCacheCluster.go +++ b/service/elasticache/api_op_DeleteCacheCluster.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) DeleteCacheCluster(ctx context.Context, params *DeleteCacheClus addawsAwsquery_serdeOpDeleteCacheClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DeleteCacheParameterGroup.go b/service/elasticache/api_op_DeleteCacheParameterGroup.go index 6cb89ee4b01..4ff097189b2 100644 --- a/service/elasticache/api_op_DeleteCacheParameterGroup.go +++ b/service/elasticache/api_op_DeleteCacheParameterGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteCacheParameterGroup(ctx context.Context, params *DeleteCa addawsAwsquery_serdeOpDeleteCacheParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DeleteCacheSecurityGroup.go b/service/elasticache/api_op_DeleteCacheSecurityGroup.go index e93a095d7cc..9755efbf716 100644 --- a/service/elasticache/api_op_DeleteCacheSecurityGroup.go +++ b/service/elasticache/api_op_DeleteCacheSecurityGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteCacheSecurityGroup(ctx context.Context, params *DeleteCac addawsAwsquery_serdeOpDeleteCacheSecurityGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DeleteCacheSubnetGroup.go b/service/elasticache/api_op_DeleteCacheSubnetGroup.go index 49c1c60d741..bb27c19184d 100644 --- a/service/elasticache/api_op_DeleteCacheSubnetGroup.go +++ b/service/elasticache/api_op_DeleteCacheSubnetGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteCacheSubnetGroup(ctx context.Context, params *DeleteCache addawsAwsquery_serdeOpDeleteCacheSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DeleteGlobalReplicationGroup.go b/service/elasticache/api_op_DeleteGlobalReplicationGroup.go index 89a094e45ff..e3021785743 100644 --- a/service/elasticache/api_op_DeleteGlobalReplicationGroup.go +++ b/service/elasticache/api_op_DeleteGlobalReplicationGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) DeleteGlobalReplicationGroup(ctx context.Context, params *Delet addawsAwsquery_serdeOpDeleteGlobalReplicationGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DeleteReplicationGroup.go b/service/elasticache/api_op_DeleteReplicationGroup.go index 20b36e02125..257ba725c81 100644 --- a/service/elasticache/api_op_DeleteReplicationGroup.go +++ b/service/elasticache/api_op_DeleteReplicationGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DeleteReplicationGroup(ctx context.Context, params *DeleteRepli addawsAwsquery_serdeOpDeleteReplicationGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DeleteSnapshot.go b/service/elasticache/api_op_DeleteSnapshot.go index 75911c52067..862c68be5ea 100644 --- a/service/elasticache/api_op_DeleteSnapshot.go +++ b/service/elasticache/api_op_DeleteSnapshot.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteSnapshot(ctx context.Context, params *DeleteSnapshotInput addawsAwsquery_serdeOpDeleteSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DescribeCacheClusters.go b/service/elasticache/api_op_DescribeCacheClusters.go index bec8e761688..6f957ce48af 100644 --- a/service/elasticache/api_op_DescribeCacheClusters.go +++ b/service/elasticache/api_op_DescribeCacheClusters.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) DescribeCacheClusters(ctx context.Context, params *DescribeCach addawsAwsquery_serdeOpDescribeCacheClustersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DescribeCacheEngineVersions.go b/service/elasticache/api_op_DescribeCacheEngineVersions.go index 19b248aec80..3d11cd032cd 100644 --- a/service/elasticache/api_op_DescribeCacheEngineVersions.go +++ b/service/elasticache/api_op_DescribeCacheEngineVersions.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeCacheEngineVersions(ctx context.Context, params *Descri addawsAwsquery_serdeOpDescribeCacheEngineVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DescribeCacheParameterGroups.go b/service/elasticache/api_op_DescribeCacheParameterGroups.go index 92614a1dac6..aa0a5c90ff5 100644 --- a/service/elasticache/api_op_DescribeCacheParameterGroups.go +++ b/service/elasticache/api_op_DescribeCacheParameterGroups.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeCacheParameterGroups(ctx context.Context, params *Descr addawsAwsquery_serdeOpDescribeCacheParameterGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DescribeCacheParameters.go b/service/elasticache/api_op_DescribeCacheParameters.go index 2f1f0ab74e9..f73731e8b4b 100644 --- a/service/elasticache/api_op_DescribeCacheParameters.go +++ b/service/elasticache/api_op_DescribeCacheParameters.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeCacheParameters(ctx context.Context, params *DescribeCa addawsAwsquery_serdeOpDescribeCacheParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DescribeCacheSecurityGroups.go b/service/elasticache/api_op_DescribeCacheSecurityGroups.go index c2aa5e15e53..9be22b1ad7b 100644 --- a/service/elasticache/api_op_DescribeCacheSecurityGroups.go +++ b/service/elasticache/api_op_DescribeCacheSecurityGroups.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeCacheSecurityGroups(ctx context.Context, params *Descri addawsAwsquery_serdeOpDescribeCacheSecurityGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DescribeCacheSubnetGroups.go b/service/elasticache/api_op_DescribeCacheSubnetGroups.go index df68c015f4b..ed14d0e9143 100644 --- a/service/elasticache/api_op_DescribeCacheSubnetGroups.go +++ b/service/elasticache/api_op_DescribeCacheSubnetGroups.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeCacheSubnetGroups(ctx context.Context, params *Describe addawsAwsquery_serdeOpDescribeCacheSubnetGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DescribeEngineDefaultParameters.go b/service/elasticache/api_op_DescribeEngineDefaultParameters.go index ed2bfa4c2df..bf8480b771e 100644 --- a/service/elasticache/api_op_DescribeEngineDefaultParameters.go +++ b/service/elasticache/api_op_DescribeEngineDefaultParameters.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEngineDefaultParameters(ctx context.Context, params *De addawsAwsquery_serdeOpDescribeEngineDefaultParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DescribeEvents.go b/service/elasticache/api_op_DescribeEvents.go index a344afd3993..9e8434ea86c 100644 --- a/service/elasticache/api_op_DescribeEvents.go +++ b/service/elasticache/api_op_DescribeEvents.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeEvents(ctx context.Context, params *DescribeEventsInput addawsAwsquery_serdeOpDescribeEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DescribeGlobalReplicationGroups.go b/service/elasticache/api_op_DescribeGlobalReplicationGroups.go index 2a3fb45246b..97bedfebc4c 100644 --- a/service/elasticache/api_op_DescribeGlobalReplicationGroups.go +++ b/service/elasticache/api_op_DescribeGlobalReplicationGroups.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeGlobalReplicationGroups(ctx context.Context, params *De addawsAwsquery_serdeOpDescribeGlobalReplicationGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DescribeReplicationGroups.go b/service/elasticache/api_op_DescribeReplicationGroups.go index 76884976adb..307bc839939 100644 --- a/service/elasticache/api_op_DescribeReplicationGroups.go +++ b/service/elasticache/api_op_DescribeReplicationGroups.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeReplicationGroups(ctx context.Context, params *Describe addawsAwsquery_serdeOpDescribeReplicationGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DescribeReservedCacheNodes.go b/service/elasticache/api_op_DescribeReservedCacheNodes.go index 8b690fb4a8c..1d67e451193 100644 --- a/service/elasticache/api_op_DescribeReservedCacheNodes.go +++ b/service/elasticache/api_op_DescribeReservedCacheNodes.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeReservedCacheNodes(ctx context.Context, params *Describ addawsAwsquery_serdeOpDescribeReservedCacheNodesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DescribeReservedCacheNodesOfferings.go b/service/elasticache/api_op_DescribeReservedCacheNodesOfferings.go index 410985a27d1..796821f5a45 100644 --- a/service/elasticache/api_op_DescribeReservedCacheNodesOfferings.go +++ b/service/elasticache/api_op_DescribeReservedCacheNodesOfferings.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeReservedCacheNodesOfferings(ctx context.Context, params addawsAwsquery_serdeOpDescribeReservedCacheNodesOfferingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DescribeServiceUpdates.go b/service/elasticache/api_op_DescribeServiceUpdates.go index f0ead30c274..134cd736ac2 100644 --- a/service/elasticache/api_op_DescribeServiceUpdates.go +++ b/service/elasticache/api_op_DescribeServiceUpdates.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeServiceUpdates(ctx context.Context, params *DescribeSer addawsAwsquery_serdeOpDescribeServiceUpdatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DescribeSnapshots.go b/service/elasticache/api_op_DescribeSnapshots.go index f3a27575682..5e9ae7f15ca 100644 --- a/service/elasticache/api_op_DescribeSnapshots.go +++ b/service/elasticache/api_op_DescribeSnapshots.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeSnapshots(ctx context.Context, params *DescribeSnapshot addawsAwsquery_serdeOpDescribeSnapshotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DescribeUpdateActions.go b/service/elasticache/api_op_DescribeUpdateActions.go index 05f15818f1f..c20573dca38 100644 --- a/service/elasticache/api_op_DescribeUpdateActions.go +++ b/service/elasticache/api_op_DescribeUpdateActions.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeUpdateActions(ctx context.Context, params *DescribeUpda addawsAwsquery_serdeOpDescribeUpdateActionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_DisassociateGlobalReplicationGroup.go b/service/elasticache/api_op_DisassociateGlobalReplicationGroup.go index bb47de9640f..6dde34f81a1 100644 --- a/service/elasticache/api_op_DisassociateGlobalReplicationGroup.go +++ b/service/elasticache/api_op_DisassociateGlobalReplicationGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DisassociateGlobalReplicationGroup(ctx context.Context, params addawsAwsquery_serdeOpDisassociateGlobalReplicationGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_FailoverGlobalReplicationGroup.go b/service/elasticache/api_op_FailoverGlobalReplicationGroup.go index edf8d660c22..67b72b8f8d9 100644 --- a/service/elasticache/api_op_FailoverGlobalReplicationGroup.go +++ b/service/elasticache/api_op_FailoverGlobalReplicationGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) FailoverGlobalReplicationGroup(ctx context.Context, params *Fai addawsAwsquery_serdeOpFailoverGlobalReplicationGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_IncreaseNodeGroupsInGlobalReplicationGroup.go b/service/elasticache/api_op_IncreaseNodeGroupsInGlobalReplicationGroup.go index 1a5417a9d62..e29bdaf5701 100644 --- a/service/elasticache/api_op_IncreaseNodeGroupsInGlobalReplicationGroup.go +++ b/service/elasticache/api_op_IncreaseNodeGroupsInGlobalReplicationGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) IncreaseNodeGroupsInGlobalReplicationGroup(ctx context.Context, addawsAwsquery_serdeOpIncreaseNodeGroupsInGlobalReplicationGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_IncreaseReplicaCount.go b/service/elasticache/api_op_IncreaseReplicaCount.go index 4f6cbe58c95..22a0b8692cd 100644 --- a/service/elasticache/api_op_IncreaseReplicaCount.go +++ b/service/elasticache/api_op_IncreaseReplicaCount.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) IncreaseReplicaCount(ctx context.Context, params *IncreaseRepli addawsAwsquery_serdeOpIncreaseReplicaCountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_ListAllowedNodeTypeModifications.go b/service/elasticache/api_op_ListAllowedNodeTypeModifications.go index 7f2de205ea2..6048aa67846 100644 --- a/service/elasticache/api_op_ListAllowedNodeTypeModifications.go +++ b/service/elasticache/api_op_ListAllowedNodeTypeModifications.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) ListAllowedNodeTypeModifications(ctx context.Context, params *L addawsAwsquery_serdeOpListAllowedNodeTypeModificationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_ListTagsForResource.go b/service/elasticache/api_op_ListTagsForResource.go index 8b18064d821..2b2bc0d960a 100644 --- a/service/elasticache/api_op_ListTagsForResource.go +++ b/service/elasticache/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsquery_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_ModifyCacheCluster.go b/service/elasticache/api_op_ModifyCacheCluster.go index ee7c0da9067..7a5dfb54f58 100644 --- a/service/elasticache/api_op_ModifyCacheCluster.go +++ b/service/elasticache/api_op_ModifyCacheCluster.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ModifyCacheCluster(ctx context.Context, params *ModifyCacheClus addawsAwsquery_serdeOpModifyCacheClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_ModifyCacheParameterGroup.go b/service/elasticache/api_op_ModifyCacheParameterGroup.go index 3464244688f..a46b4f3a185 100644 --- a/service/elasticache/api_op_ModifyCacheParameterGroup.go +++ b/service/elasticache/api_op_ModifyCacheParameterGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ModifyCacheParameterGroup(ctx context.Context, params *ModifyCa addawsAwsquery_serdeOpModifyCacheParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_ModifyCacheSubnetGroup.go b/service/elasticache/api_op_ModifyCacheSubnetGroup.go index 1e95bd52013..bd31f5ea8c5 100644 --- a/service/elasticache/api_op_ModifyCacheSubnetGroup.go +++ b/service/elasticache/api_op_ModifyCacheSubnetGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifyCacheSubnetGroup(ctx context.Context, params *ModifyCache addawsAwsquery_serdeOpModifyCacheSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_ModifyGlobalReplicationGroup.go b/service/elasticache/api_op_ModifyGlobalReplicationGroup.go index 0c00a5e069a..45dc7dbe7b5 100644 --- a/service/elasticache/api_op_ModifyGlobalReplicationGroup.go +++ b/service/elasticache/api_op_ModifyGlobalReplicationGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifyGlobalReplicationGroup(ctx context.Context, params *Modif addawsAwsquery_serdeOpModifyGlobalReplicationGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_ModifyReplicationGroup.go b/service/elasticache/api_op_ModifyReplicationGroup.go index da33ab4cc2c..1e7d554e66e 100644 --- a/service/elasticache/api_op_ModifyReplicationGroup.go +++ b/service/elasticache/api_op_ModifyReplicationGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ModifyReplicationGroup(ctx context.Context, params *ModifyRepli addawsAwsquery_serdeOpModifyReplicationGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_ModifyReplicationGroupShardConfiguration.go b/service/elasticache/api_op_ModifyReplicationGroupShardConfiguration.go index b914c4c164d..c0790cd042b 100644 --- a/service/elasticache/api_op_ModifyReplicationGroupShardConfiguration.go +++ b/service/elasticache/api_op_ModifyReplicationGroupShardConfiguration.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ModifyReplicationGroupShardConfiguration(ctx context.Context, p addawsAwsquery_serdeOpModifyReplicationGroupShardConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_PurchaseReservedCacheNodesOffering.go b/service/elasticache/api_op_PurchaseReservedCacheNodesOffering.go index 8f17d8536d9..ecfabd8eba5 100644 --- a/service/elasticache/api_op_PurchaseReservedCacheNodesOffering.go +++ b/service/elasticache/api_op_PurchaseReservedCacheNodesOffering.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PurchaseReservedCacheNodesOffering(ctx context.Context, params addawsAwsquery_serdeOpPurchaseReservedCacheNodesOfferingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_RebalanceSlotsInGlobalReplicationGroup.go b/service/elasticache/api_op_RebalanceSlotsInGlobalReplicationGroup.go index 93b6801401c..d9cc16ac51c 100644 --- a/service/elasticache/api_op_RebalanceSlotsInGlobalReplicationGroup.go +++ b/service/elasticache/api_op_RebalanceSlotsInGlobalReplicationGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) RebalanceSlotsInGlobalReplicationGroup(ctx context.Context, par addawsAwsquery_serdeOpRebalanceSlotsInGlobalReplicationGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_RebootCacheCluster.go b/service/elasticache/api_op_RebootCacheCluster.go index 3e5a6446cae..2248dc42186 100644 --- a/service/elasticache/api_op_RebootCacheCluster.go +++ b/service/elasticache/api_op_RebootCacheCluster.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) RebootCacheCluster(ctx context.Context, params *RebootCacheClus addawsAwsquery_serdeOpRebootCacheClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_RemoveTagsFromResource.go b/service/elasticache/api_op_RemoveTagsFromResource.go index 88ec424f4c5..ba76f9f55f0 100644 --- a/service/elasticache/api_op_RemoveTagsFromResource.go +++ b/service/elasticache/api_op_RemoveTagsFromResource.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RemoveTagsFromResource(ctx context.Context, params *RemoveTagsF addawsAwsquery_serdeOpRemoveTagsFromResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_ResetCacheParameterGroup.go b/service/elasticache/api_op_ResetCacheParameterGroup.go index c1476c17268..44f97c54563 100644 --- a/service/elasticache/api_op_ResetCacheParameterGroup.go +++ b/service/elasticache/api_op_ResetCacheParameterGroup.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ResetCacheParameterGroup(ctx context.Context, params *ResetCach addawsAwsquery_serdeOpResetCacheParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_RevokeCacheSecurityGroupIngress.go b/service/elasticache/api_op_RevokeCacheSecurityGroupIngress.go index 7aa65f61b18..e664bd804ed 100644 --- a/service/elasticache/api_op_RevokeCacheSecurityGroupIngress.go +++ b/service/elasticache/api_op_RevokeCacheSecurityGroupIngress.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) RevokeCacheSecurityGroupIngress(ctx context.Context, params *Re addawsAwsquery_serdeOpRevokeCacheSecurityGroupIngressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_StartMigration.go b/service/elasticache/api_op_StartMigration.go index 236dc0a63a8..978fdcaac1a 100644 --- a/service/elasticache/api_op_StartMigration.go +++ b/service/elasticache/api_op_StartMigration.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StartMigration(ctx context.Context, params *StartMigrationInput addawsAwsquery_serdeOpStartMigrationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/api_op_TestFailover.go b/service/elasticache/api_op_TestFailover.go index 7f115949ad7..84c30a167fd 100644 --- a/service/elasticache/api_op_TestFailover.go +++ b/service/elasticache/api_op_TestFailover.go @@ -5,7 +5,6 @@ package elasticache import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticache/types" smithy "github.com/awslabs/smithy-go" @@ -51,9 +50,9 @@ func (c *Client) TestFailover(ctx context.Context, params *TestFailoverInput, op addawsAwsquery_serdeOpTestFailoverMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticache/endpoints.go b/service/elasticache/endpoints.go index 4211a36d558..df629b6c6ec 100644 --- a/service/elasticache/endpoints.go +++ b/service/elasticache/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/elasticbeanstalk/api_client.go b/service/elasticbeanstalk/api_client.go index a373483e4a4..4190b2f7878 100644 --- a/service/elasticbeanstalk/api_client.go +++ b/service/elasticbeanstalk/api_client.go @@ -89,30 +89,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -178,6 +154,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/elasticbeanstalk/api_op_AbortEnvironmentUpdate.go b/service/elasticbeanstalk/api_op_AbortEnvironmentUpdate.go index 86f8fd68677..eb91bc682e0 100644 --- a/service/elasticbeanstalk/api_op_AbortEnvironmentUpdate.go +++ b/service/elasticbeanstalk/api_op_AbortEnvironmentUpdate.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AbortEnvironmentUpdate(ctx context.Context, params *AbortEnviro addawsAwsquery_serdeOpAbortEnvironmentUpdateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_ApplyEnvironmentManagedAction.go b/service/elasticbeanstalk/api_op_ApplyEnvironmentManagedAction.go index 88cad5f72d8..578c6bde2b0 100644 --- a/service/elasticbeanstalk/api_op_ApplyEnvironmentManagedAction.go +++ b/service/elasticbeanstalk/api_op_ApplyEnvironmentManagedAction.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ApplyEnvironmentManagedAction(ctx context.Context, params *Appl addawsAwsquery_serdeOpApplyEnvironmentManagedActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_AssociateEnvironmentOperationsRole.go b/service/elasticbeanstalk/api_op_AssociateEnvironmentOperationsRole.go index 530a9134d88..87f868ff47a 100644 --- a/service/elasticbeanstalk/api_op_AssociateEnvironmentOperationsRole.go +++ b/service/elasticbeanstalk/api_op_AssociateEnvironmentOperationsRole.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) AssociateEnvironmentOperationsRole(ctx context.Context, params addawsAwsquery_serdeOpAssociateEnvironmentOperationsRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_CheckDNSAvailability.go b/service/elasticbeanstalk/api_op_CheckDNSAvailability.go index f90903e6956..6cd709adc34 100644 --- a/service/elasticbeanstalk/api_op_CheckDNSAvailability.go +++ b/service/elasticbeanstalk/api_op_CheckDNSAvailability.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CheckDNSAvailability(ctx context.Context, params *CheckDNSAvail addawsAwsquery_serdeOpCheckDNSAvailabilityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_ComposeEnvironments.go b/service/elasticbeanstalk/api_op_ComposeEnvironments.go index ee2c4d20dc0..e8047c8b3e7 100644 --- a/service/elasticbeanstalk/api_op_ComposeEnvironments.go +++ b/service/elasticbeanstalk/api_op_ComposeEnvironments.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ComposeEnvironments(ctx context.Context, params *ComposeEnviron addawsAwsquery_serdeOpComposeEnvironmentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_CreateApplication.go b/service/elasticbeanstalk/api_op_CreateApplication.go index 593088395c6..bf5d79820a4 100644 --- a/service/elasticbeanstalk/api_op_CreateApplication.go +++ b/service/elasticbeanstalk/api_op_CreateApplication.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateApplication(ctx context.Context, params *CreateApplicatio addawsAwsquery_serdeOpCreateApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_CreateApplicationVersion.go b/service/elasticbeanstalk/api_op_CreateApplicationVersion.go index 69840affc55..c93f1b5b0b6 100644 --- a/service/elasticbeanstalk/api_op_CreateApplicationVersion.go +++ b/service/elasticbeanstalk/api_op_CreateApplicationVersion.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) CreateApplicationVersion(ctx context.Context, params *CreateApp addawsAwsquery_serdeOpCreateApplicationVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_CreateConfigurationTemplate.go b/service/elasticbeanstalk/api_op_CreateConfigurationTemplate.go index 98de5f14a65..2f924caab02 100644 --- a/service/elasticbeanstalk/api_op_CreateConfigurationTemplate.go +++ b/service/elasticbeanstalk/api_op_CreateConfigurationTemplate.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) CreateConfigurationTemplate(ctx context.Context, params *Create addawsAwsquery_serdeOpCreateConfigurationTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_CreateEnvironment.go b/service/elasticbeanstalk/api_op_CreateEnvironment.go index 749c3320c52..b4cc14a47e9 100644 --- a/service/elasticbeanstalk/api_op_CreateEnvironment.go +++ b/service/elasticbeanstalk/api_op_CreateEnvironment.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateEnvironment(ctx context.Context, params *CreateEnvironmen addawsAwsquery_serdeOpCreateEnvironmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_CreatePlatformVersion.go b/service/elasticbeanstalk/api_op_CreatePlatformVersion.go index 3dcc4f64eb3..9a0ebe4d550 100644 --- a/service/elasticbeanstalk/api_op_CreatePlatformVersion.go +++ b/service/elasticbeanstalk/api_op_CreatePlatformVersion.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreatePlatformVersion(ctx context.Context, params *CreatePlatfo addawsAwsquery_serdeOpCreatePlatformVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_CreateStorageLocation.go b/service/elasticbeanstalk/api_op_CreateStorageLocation.go index d2d6fb9045a..8c25801d3fd 100644 --- a/service/elasticbeanstalk/api_op_CreateStorageLocation.go +++ b/service/elasticbeanstalk/api_op_CreateStorageLocation.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) CreateStorageLocation(ctx context.Context, params *CreateStorag addawsAwsquery_serdeOpCreateStorageLocationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DeleteApplication.go b/service/elasticbeanstalk/api_op_DeleteApplication.go index d2c4da6bcaf..ff77a5e30c7 100644 --- a/service/elasticbeanstalk/api_op_DeleteApplication.go +++ b/service/elasticbeanstalk/api_op_DeleteApplication.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteApplication(ctx context.Context, params *DeleteApplicatio addawsAwsquery_serdeOpDeleteApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DeleteApplicationVersion.go b/service/elasticbeanstalk/api_op_DeleteApplicationVersion.go index 34fc07d0c56..93bc6b59123 100644 --- a/service/elasticbeanstalk/api_op_DeleteApplicationVersion.go +++ b/service/elasticbeanstalk/api_op_DeleteApplicationVersion.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteApplicationVersion(ctx context.Context, params *DeleteApp addawsAwsquery_serdeOpDeleteApplicationVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DeleteConfigurationTemplate.go b/service/elasticbeanstalk/api_op_DeleteConfigurationTemplate.go index 87252928a87..d85a737c1de 100644 --- a/service/elasticbeanstalk/api_op_DeleteConfigurationTemplate.go +++ b/service/elasticbeanstalk/api_op_DeleteConfigurationTemplate.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteConfigurationTemplate(ctx context.Context, params *Delete addawsAwsquery_serdeOpDeleteConfigurationTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DeleteEnvironmentConfiguration.go b/service/elasticbeanstalk/api_op_DeleteEnvironmentConfiguration.go index e45d1d091af..c6af8e220fa 100644 --- a/service/elasticbeanstalk/api_op_DeleteEnvironmentConfiguration.go +++ b/service/elasticbeanstalk/api_op_DeleteEnvironmentConfiguration.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeleteEnvironmentConfiguration(ctx context.Context, params *Del addawsAwsquery_serdeOpDeleteEnvironmentConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DeletePlatformVersion.go b/service/elasticbeanstalk/api_op_DeletePlatformVersion.go index 1e7412ac25c..1d58a19310c 100644 --- a/service/elasticbeanstalk/api_op_DeletePlatformVersion.go +++ b/service/elasticbeanstalk/api_op_DeletePlatformVersion.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeletePlatformVersion(ctx context.Context, params *DeletePlatfo addawsAwsquery_serdeOpDeletePlatformVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DescribeAccountAttributes.go b/service/elasticbeanstalk/api_op_DescribeAccountAttributes.go index ae1cb327a7b..4f9c8c8f28b 100644 --- a/service/elasticbeanstalk/api_op_DescribeAccountAttributes.go +++ b/service/elasticbeanstalk/api_op_DescribeAccountAttributes.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeAccountAttributes(ctx context.Context, params *Describe addawsAwsquery_serdeOpDescribeAccountAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DescribeApplicationVersions.go b/service/elasticbeanstalk/api_op_DescribeApplicationVersions.go index 98a969448f1..f5699cd669b 100644 --- a/service/elasticbeanstalk/api_op_DescribeApplicationVersions.go +++ b/service/elasticbeanstalk/api_op_DescribeApplicationVersions.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeApplicationVersions(ctx context.Context, params *Descri addawsAwsquery_serdeOpDescribeApplicationVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DescribeApplications.go b/service/elasticbeanstalk/api_op_DescribeApplications.go index 55e165c35f1..b9e5cdcad0a 100644 --- a/service/elasticbeanstalk/api_op_DescribeApplications.go +++ b/service/elasticbeanstalk/api_op_DescribeApplications.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeApplications(ctx context.Context, params *DescribeAppli addawsAwsquery_serdeOpDescribeApplicationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DescribeConfigurationOptions.go b/service/elasticbeanstalk/api_op_DescribeConfigurationOptions.go index 1a0b3bb7709..4efc8003823 100644 --- a/service/elasticbeanstalk/api_op_DescribeConfigurationOptions.go +++ b/service/elasticbeanstalk/api_op_DescribeConfigurationOptions.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeConfigurationOptions(ctx context.Context, params *Descr addawsAwsquery_serdeOpDescribeConfigurationOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DescribeConfigurationSettings.go b/service/elasticbeanstalk/api_op_DescribeConfigurationSettings.go index 5b3de0d90b0..631e538f135 100644 --- a/service/elasticbeanstalk/api_op_DescribeConfigurationSettings.go +++ b/service/elasticbeanstalk/api_op_DescribeConfigurationSettings.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) DescribeConfigurationSettings(ctx context.Context, params *Desc addawsAwsquery_serdeOpDescribeConfigurationSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DescribeEnvironmentHealth.go b/service/elasticbeanstalk/api_op_DescribeEnvironmentHealth.go index 3966edfd3b4..8f97ed79828 100644 --- a/service/elasticbeanstalk/api_op_DescribeEnvironmentHealth.go +++ b/service/elasticbeanstalk/api_op_DescribeEnvironmentHealth.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeEnvironmentHealth(ctx context.Context, params *Describe addawsAwsquery_serdeOpDescribeEnvironmentHealthMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DescribeEnvironmentManagedActionHistory.go b/service/elasticbeanstalk/api_op_DescribeEnvironmentManagedActionHistory.go index 420d535883d..5d71b3c4055 100644 --- a/service/elasticbeanstalk/api_op_DescribeEnvironmentManagedActionHistory.go +++ b/service/elasticbeanstalk/api_op_DescribeEnvironmentManagedActionHistory.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeEnvironmentManagedActionHistory(ctx context.Context, pa addawsAwsquery_serdeOpDescribeEnvironmentManagedActionHistoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DescribeEnvironmentManagedActions.go b/service/elasticbeanstalk/api_op_DescribeEnvironmentManagedActions.go index b475caa7780..d86b62c29e3 100644 --- a/service/elasticbeanstalk/api_op_DescribeEnvironmentManagedActions.go +++ b/service/elasticbeanstalk/api_op_DescribeEnvironmentManagedActions.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeEnvironmentManagedActions(ctx context.Context, params * addawsAwsquery_serdeOpDescribeEnvironmentManagedActionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DescribeEnvironmentResources.go b/service/elasticbeanstalk/api_op_DescribeEnvironmentResources.go index 89376a0a007..bd31c05f6f8 100644 --- a/service/elasticbeanstalk/api_op_DescribeEnvironmentResources.go +++ b/service/elasticbeanstalk/api_op_DescribeEnvironmentResources.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeEnvironmentResources(ctx context.Context, params *Descr addawsAwsquery_serdeOpDescribeEnvironmentResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DescribeEnvironments.go b/service/elasticbeanstalk/api_op_DescribeEnvironments.go index f5646835344..88e5c8d7ab4 100644 --- a/service/elasticbeanstalk/api_op_DescribeEnvironments.go +++ b/service/elasticbeanstalk/api_op_DescribeEnvironments.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEnvironments(ctx context.Context, params *DescribeEnvir addawsAwsquery_serdeOpDescribeEnvironmentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DescribeEvents.go b/service/elasticbeanstalk/api_op_DescribeEvents.go index 18c9c448a2b..770c016c153 100644 --- a/service/elasticbeanstalk/api_op_DescribeEvents.go +++ b/service/elasticbeanstalk/api_op_DescribeEvents.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeEvents(ctx context.Context, params *DescribeEventsInput addawsAwsquery_serdeOpDescribeEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DescribeInstancesHealth.go b/service/elasticbeanstalk/api_op_DescribeInstancesHealth.go index d1c5a07f8fe..2579f3669db 100644 --- a/service/elasticbeanstalk/api_op_DescribeInstancesHealth.go +++ b/service/elasticbeanstalk/api_op_DescribeInstancesHealth.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeInstancesHealth(ctx context.Context, params *DescribeIn addawsAwsquery_serdeOpDescribeInstancesHealthMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DescribePlatformVersion.go b/service/elasticbeanstalk/api_op_DescribePlatformVersion.go index 1e91affcb4b..1598e8756ed 100644 --- a/service/elasticbeanstalk/api_op_DescribePlatformVersion.go +++ b/service/elasticbeanstalk/api_op_DescribePlatformVersion.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribePlatformVersion(ctx context.Context, params *DescribePl addawsAwsquery_serdeOpDescribePlatformVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_DisassociateEnvironmentOperationsRole.go b/service/elasticbeanstalk/api_op_DisassociateEnvironmentOperationsRole.go index dc553907f9a..ad2d5ecfe7c 100644 --- a/service/elasticbeanstalk/api_op_DisassociateEnvironmentOperationsRole.go +++ b/service/elasticbeanstalk/api_op_DisassociateEnvironmentOperationsRole.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DisassociateEnvironmentOperationsRole(ctx context.Context, para addawsAwsquery_serdeOpDisassociateEnvironmentOperationsRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_ListAvailableSolutionStacks.go b/service/elasticbeanstalk/api_op_ListAvailableSolutionStacks.go index fe19b6bdee4..4752a58f0a8 100644 --- a/service/elasticbeanstalk/api_op_ListAvailableSolutionStacks.go +++ b/service/elasticbeanstalk/api_op_ListAvailableSolutionStacks.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListAvailableSolutionStacks(ctx context.Context, params *ListAv addawsAwsquery_serdeOpListAvailableSolutionStacksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_ListPlatformBranches.go b/service/elasticbeanstalk/api_op_ListPlatformBranches.go index eb92f897fe8..62855b54097 100644 --- a/service/elasticbeanstalk/api_op_ListPlatformBranches.go +++ b/service/elasticbeanstalk/api_op_ListPlatformBranches.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListPlatformBranches(ctx context.Context, params *ListPlatformB addawsAwsquery_serdeOpListPlatformBranchesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_ListPlatformVersions.go b/service/elasticbeanstalk/api_op_ListPlatformVersions.go index ef4794fdd9e..36dff3426a6 100644 --- a/service/elasticbeanstalk/api_op_ListPlatformVersions.go +++ b/service/elasticbeanstalk/api_op_ListPlatformVersions.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListPlatformVersions(ctx context.Context, params *ListPlatformV addawsAwsquery_serdeOpListPlatformVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_ListTagsForResource.go b/service/elasticbeanstalk/api_op_ListTagsForResource.go index 4cfc7ab689c..5f6f904b6f0 100644 --- a/service/elasticbeanstalk/api_op_ListTagsForResource.go +++ b/service/elasticbeanstalk/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsquery_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_RebuildEnvironment.go b/service/elasticbeanstalk/api_op_RebuildEnvironment.go index 00a2bb6ca4c..f87f7f7c949 100644 --- a/service/elasticbeanstalk/api_op_RebuildEnvironment.go +++ b/service/elasticbeanstalk/api_op_RebuildEnvironment.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) RebuildEnvironment(ctx context.Context, params *RebuildEnvironm addawsAwsquery_serdeOpRebuildEnvironmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_RequestEnvironmentInfo.go b/service/elasticbeanstalk/api_op_RequestEnvironmentInfo.go index efa2dff3c6e..8f07c049d5a 100644 --- a/service/elasticbeanstalk/api_op_RequestEnvironmentInfo.go +++ b/service/elasticbeanstalk/api_op_RequestEnvironmentInfo.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) RequestEnvironmentInfo(ctx context.Context, params *RequestEnvi addawsAwsquery_serdeOpRequestEnvironmentInfoMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_RestartAppServer.go b/service/elasticbeanstalk/api_op_RestartAppServer.go index f2206ab4399..270fd7a159f 100644 --- a/service/elasticbeanstalk/api_op_RestartAppServer.go +++ b/service/elasticbeanstalk/api_op_RestartAppServer.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) RestartAppServer(ctx context.Context, params *RestartAppServerI addawsAwsquery_serdeOpRestartAppServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_RetrieveEnvironmentInfo.go b/service/elasticbeanstalk/api_op_RetrieveEnvironmentInfo.go index bf03de2b771..0773d14a930 100644 --- a/service/elasticbeanstalk/api_op_RetrieveEnvironmentInfo.go +++ b/service/elasticbeanstalk/api_op_RetrieveEnvironmentInfo.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) RetrieveEnvironmentInfo(ctx context.Context, params *RetrieveEn addawsAwsquery_serdeOpRetrieveEnvironmentInfoMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_SwapEnvironmentCNAMEs.go b/service/elasticbeanstalk/api_op_SwapEnvironmentCNAMEs.go index 10e73b1195b..8568f674877 100644 --- a/service/elasticbeanstalk/api_op_SwapEnvironmentCNAMEs.go +++ b/service/elasticbeanstalk/api_op_SwapEnvironmentCNAMEs.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) SwapEnvironmentCNAMEs(ctx context.Context, params *SwapEnvironm addawsAwsquery_serdeOpSwapEnvironmentCNAMEsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_TerminateEnvironment.go b/service/elasticbeanstalk/api_op_TerminateEnvironment.go index 6904a4528b7..ffa5f4fb848 100644 --- a/service/elasticbeanstalk/api_op_TerminateEnvironment.go +++ b/service/elasticbeanstalk/api_op_TerminateEnvironment.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) TerminateEnvironment(ctx context.Context, params *TerminateEnvi addawsAwsquery_serdeOpTerminateEnvironmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_UpdateApplication.go b/service/elasticbeanstalk/api_op_UpdateApplication.go index 4fcc71a2bb1..df6ca254881 100644 --- a/service/elasticbeanstalk/api_op_UpdateApplication.go +++ b/service/elasticbeanstalk/api_op_UpdateApplication.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateApplication(ctx context.Context, params *UpdateApplicatio addawsAwsquery_serdeOpUpdateApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_UpdateApplicationResourceLifecycle.go b/service/elasticbeanstalk/api_op_UpdateApplicationResourceLifecycle.go index 4d2cccbd3be..a96cacf5b12 100644 --- a/service/elasticbeanstalk/api_op_UpdateApplicationResourceLifecycle.go +++ b/service/elasticbeanstalk/api_op_UpdateApplicationResourceLifecycle.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateApplicationResourceLifecycle(ctx context.Context, params addawsAwsquery_serdeOpUpdateApplicationResourceLifecycleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_UpdateApplicationVersion.go b/service/elasticbeanstalk/api_op_UpdateApplicationVersion.go index 4c1b56a7e39..10605222f01 100644 --- a/service/elasticbeanstalk/api_op_UpdateApplicationVersion.go +++ b/service/elasticbeanstalk/api_op_UpdateApplicationVersion.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateApplicationVersion(ctx context.Context, params *UpdateApp addawsAwsquery_serdeOpUpdateApplicationVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_UpdateConfigurationTemplate.go b/service/elasticbeanstalk/api_op_UpdateConfigurationTemplate.go index 18e9d0aa872..9565ec505a0 100644 --- a/service/elasticbeanstalk/api_op_UpdateConfigurationTemplate.go +++ b/service/elasticbeanstalk/api_op_UpdateConfigurationTemplate.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) UpdateConfigurationTemplate(ctx context.Context, params *Update addawsAwsquery_serdeOpUpdateConfigurationTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_UpdateEnvironment.go b/service/elasticbeanstalk/api_op_UpdateEnvironment.go index 80418b48a81..8243b072ae0 100644 --- a/service/elasticbeanstalk/api_op_UpdateEnvironment.go +++ b/service/elasticbeanstalk/api_op_UpdateEnvironment.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) UpdateEnvironment(ctx context.Context, params *UpdateEnvironmen addawsAwsquery_serdeOpUpdateEnvironmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_UpdateTagsForResource.go b/service/elasticbeanstalk/api_op_UpdateTagsForResource.go index b2397c0dd5a..a7a39f27997 100644 --- a/service/elasticbeanstalk/api_op_UpdateTagsForResource.go +++ b/service/elasticbeanstalk/api_op_UpdateTagsForResource.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) UpdateTagsForResource(ctx context.Context, params *UpdateTagsFo addawsAwsquery_serdeOpUpdateTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/api_op_ValidateConfigurationSettings.go b/service/elasticbeanstalk/api_op_ValidateConfigurationSettings.go index 5e8abdec5ad..b71d6639cf0 100644 --- a/service/elasticbeanstalk/api_op_ValidateConfigurationSettings.go +++ b/service/elasticbeanstalk/api_op_ValidateConfigurationSettings.go @@ -5,7 +5,6 @@ package elasticbeanstalk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ValidateConfigurationSettings(ctx context.Context, params *Vali addawsAwsquery_serdeOpValidateConfigurationSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticbeanstalk/endpoints.go b/service/elasticbeanstalk/endpoints.go index 72f0c43606a..fd7ca11df87 100644 --- a/service/elasticbeanstalk/endpoints.go +++ b/service/elasticbeanstalk/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/elasticinference/api_client.go b/service/elasticinference/api_client.go index 5f980f12297..b5333cca88b 100644 --- a/service/elasticinference/api_client.go +++ b/service/elasticinference/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/elasticinference/api_op_DescribeAcceleratorOfferings.go b/service/elasticinference/api_op_DescribeAcceleratorOfferings.go index ae1cae02363..8acda619cd8 100644 --- a/service/elasticinference/api_op_DescribeAcceleratorOfferings.go +++ b/service/elasticinference/api_op_DescribeAcceleratorOfferings.go @@ -5,7 +5,6 @@ package elasticinference import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticinference/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAcceleratorOfferings(ctx context.Context, params *Descr addawsRestjson1_serdeOpDescribeAcceleratorOfferingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticinference/api_op_DescribeAcceleratorTypes.go b/service/elasticinference/api_op_DescribeAcceleratorTypes.go index e327b070293..e8bdaa5a26a 100644 --- a/service/elasticinference/api_op_DescribeAcceleratorTypes.go +++ b/service/elasticinference/api_op_DescribeAcceleratorTypes.go @@ -5,7 +5,6 @@ package elasticinference import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticinference/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAcceleratorTypes(ctx context.Context, params *DescribeA addawsRestjson1_serdeOpDescribeAcceleratorTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticinference/api_op_DescribeAccelerators.go b/service/elasticinference/api_op_DescribeAccelerators.go index 2936b0d9854..42b9f1b3463 100644 --- a/service/elasticinference/api_op_DescribeAccelerators.go +++ b/service/elasticinference/api_op_DescribeAccelerators.go @@ -5,7 +5,6 @@ package elasticinference import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticinference/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAccelerators(ctx context.Context, params *DescribeAccel addawsRestjson1_serdeOpDescribeAcceleratorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticinference/api_op_ListTagsForResource.go b/service/elasticinference/api_op_ListTagsForResource.go index 0fe6d438e62..38562fc5c0f 100644 --- a/service/elasticinference/api_op_ListTagsForResource.go +++ b/service/elasticinference/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package elasticinference import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticinference/api_op_TagResource.go b/service/elasticinference/api_op_TagResource.go index 8e735fd40fa..7d3d893984f 100644 --- a/service/elasticinference/api_op_TagResource.go +++ b/service/elasticinference/api_op_TagResource.go @@ -5,7 +5,6 @@ package elasticinference import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticinference/api_op_UntagResource.go b/service/elasticinference/api_op_UntagResource.go index 04fad5e6040..8d93c617cb3 100644 --- a/service/elasticinference/api_op_UntagResource.go +++ b/service/elasticinference/api_op_UntagResource.go @@ -5,7 +5,6 @@ package elasticinference import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticinference/endpoints.go b/service/elasticinference/endpoints.go index 38ac6f26005..6c4ece960c6 100644 --- a/service/elasticinference/endpoints.go +++ b/service/elasticinference/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/elasticloadbalancing/api_client.go b/service/elasticloadbalancing/api_client.go index 5826ab284ef..f7e55a84f71 100644 --- a/service/elasticloadbalancing/api_client.go +++ b/service/elasticloadbalancing/api_client.go @@ -96,30 +96,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -185,6 +161,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/elasticloadbalancing/api_op_AddTags.go b/service/elasticloadbalancing/api_op_AddTags.go index 49e552e34df..7df070819bd 100644 --- a/service/elasticloadbalancing/api_op_AddTags.go +++ b/service/elasticloadbalancing/api_op_AddTags.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) AddTags(ctx context.Context, params *AddTagsInput, optFns ...fu addawsAwsquery_serdeOpAddTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_ApplySecurityGroupsToLoadBalancer.go b/service/elasticloadbalancing/api_op_ApplySecurityGroupsToLoadBalancer.go index d3372ec0e90..cd97690d98d 100644 --- a/service/elasticloadbalancing/api_op_ApplySecurityGroupsToLoadBalancer.go +++ b/service/elasticloadbalancing/api_op_ApplySecurityGroupsToLoadBalancer.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) ApplySecurityGroupsToLoadBalancer(ctx context.Context, params * addawsAwsquery_serdeOpApplySecurityGroupsToLoadBalancerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_AttachLoadBalancerToSubnets.go b/service/elasticloadbalancing/api_op_AttachLoadBalancerToSubnets.go index 4358d515054..1df0b4effeb 100644 --- a/service/elasticloadbalancing/api_op_AttachLoadBalancerToSubnets.go +++ b/service/elasticloadbalancing/api_op_AttachLoadBalancerToSubnets.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) AttachLoadBalancerToSubnets(ctx context.Context, params *Attach addawsAwsquery_serdeOpAttachLoadBalancerToSubnetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_ConfigureHealthCheck.go b/service/elasticloadbalancing/api_op_ConfigureHealthCheck.go index 91d7c5df98e..d5b73693a86 100644 --- a/service/elasticloadbalancing/api_op_ConfigureHealthCheck.go +++ b/service/elasticloadbalancing/api_op_ConfigureHealthCheck.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ConfigureHealthCheck(ctx context.Context, params *ConfigureHeal addawsAwsquery_serdeOpConfigureHealthCheckMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_CreateAppCookieStickinessPolicy.go b/service/elasticloadbalancing/api_op_CreateAppCookieStickinessPolicy.go index 19917c30784..f709eb44171 100644 --- a/service/elasticloadbalancing/api_op_CreateAppCookieStickinessPolicy.go +++ b/service/elasticloadbalancing/api_op_CreateAppCookieStickinessPolicy.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -34,9 +33,9 @@ func (c *Client) CreateAppCookieStickinessPolicy(ctx context.Context, params *Cr addawsAwsquery_serdeOpCreateAppCookieStickinessPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_CreateLBCookieStickinessPolicy.go b/service/elasticloadbalancing/api_op_CreateLBCookieStickinessPolicy.go index d2050dfaa79..a615e8a707e 100644 --- a/service/elasticloadbalancing/api_op_CreateLBCookieStickinessPolicy.go +++ b/service/elasticloadbalancing/api_op_CreateLBCookieStickinessPolicy.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) CreateLBCookieStickinessPolicy(ctx context.Context, params *Cre addawsAwsquery_serdeOpCreateLBCookieStickinessPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_CreateLoadBalancer.go b/service/elasticloadbalancing/api_op_CreateLoadBalancer.go index 1fa4fa760b5..02d4882b8c0 100644 --- a/service/elasticloadbalancing/api_op_CreateLoadBalancer.go +++ b/service/elasticloadbalancing/api_op_CreateLoadBalancer.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) CreateLoadBalancer(ctx context.Context, params *CreateLoadBalan addawsAwsquery_serdeOpCreateLoadBalancerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_CreateLoadBalancerListeners.go b/service/elasticloadbalancing/api_op_CreateLoadBalancerListeners.go index 1b2afa4b832..b1536f1bcf7 100644 --- a/service/elasticloadbalancing/api_op_CreateLoadBalancerListeners.go +++ b/service/elasticloadbalancing/api_op_CreateLoadBalancerListeners.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateLoadBalancerListeners(ctx context.Context, params *Create addawsAwsquery_serdeOpCreateLoadBalancerListenersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_CreateLoadBalancerPolicy.go b/service/elasticloadbalancing/api_op_CreateLoadBalancerPolicy.go index 3d96356b0b8..7d92d5123f7 100644 --- a/service/elasticloadbalancing/api_op_CreateLoadBalancerPolicy.go +++ b/service/elasticloadbalancing/api_op_CreateLoadBalancerPolicy.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateLoadBalancerPolicy(ctx context.Context, params *CreateLoa addawsAwsquery_serdeOpCreateLoadBalancerPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_DeleteLoadBalancer.go b/service/elasticloadbalancing/api_op_DeleteLoadBalancer.go index d94ada7a629..0aed6449b44 100644 --- a/service/elasticloadbalancing/api_op_DeleteLoadBalancer.go +++ b/service/elasticloadbalancing/api_op_DeleteLoadBalancer.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeleteLoadBalancer(ctx context.Context, params *DeleteLoadBalan addawsAwsquery_serdeOpDeleteLoadBalancerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_DeleteLoadBalancerListeners.go b/service/elasticloadbalancing/api_op_DeleteLoadBalancerListeners.go index 98ef385269a..1bc75fb15d1 100644 --- a/service/elasticloadbalancing/api_op_DeleteLoadBalancerListeners.go +++ b/service/elasticloadbalancing/api_op_DeleteLoadBalancerListeners.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteLoadBalancerListeners(ctx context.Context, params *Delete addawsAwsquery_serdeOpDeleteLoadBalancerListenersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_DeleteLoadBalancerPolicy.go b/service/elasticloadbalancing/api_op_DeleteLoadBalancerPolicy.go index 096cea66528..7113044656d 100644 --- a/service/elasticloadbalancing/api_op_DeleteLoadBalancerPolicy.go +++ b/service/elasticloadbalancing/api_op_DeleteLoadBalancerPolicy.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteLoadBalancerPolicy(ctx context.Context, params *DeleteLoa addawsAwsquery_serdeOpDeleteLoadBalancerPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_DeregisterInstancesFromLoadBalancer.go b/service/elasticloadbalancing/api_op_DeregisterInstancesFromLoadBalancer.go index dd38e944812..777c05496f4 100644 --- a/service/elasticloadbalancing/api_op_DeregisterInstancesFromLoadBalancer.go +++ b/service/elasticloadbalancing/api_op_DeregisterInstancesFromLoadBalancer.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DeregisterInstancesFromLoadBalancer(ctx context.Context, params addawsAwsquery_serdeOpDeregisterInstancesFromLoadBalancerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_DescribeAccountLimits.go b/service/elasticloadbalancing/api_op_DescribeAccountLimits.go index 1e7144abb73..5be6553d4f1 100644 --- a/service/elasticloadbalancing/api_op_DescribeAccountLimits.go +++ b/service/elasticloadbalancing/api_op_DescribeAccountLimits.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeAccountLimits(ctx context.Context, params *DescribeAcco addawsAwsquery_serdeOpDescribeAccountLimitsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_DescribeInstanceHealth.go b/service/elasticloadbalancing/api_op_DescribeInstanceHealth.go index a659a9969e6..48845b069c3 100644 --- a/service/elasticloadbalancing/api_op_DescribeInstanceHealth.go +++ b/service/elasticloadbalancing/api_op_DescribeInstanceHealth.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeInstanceHealth(ctx context.Context, params *DescribeIns addawsAwsquery_serdeOpDescribeInstanceHealthMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_DescribeLoadBalancerAttributes.go b/service/elasticloadbalancing/api_op_DescribeLoadBalancerAttributes.go index ba0febd98e5..515e9801806 100644 --- a/service/elasticloadbalancing/api_op_DescribeLoadBalancerAttributes.go +++ b/service/elasticloadbalancing/api_op_DescribeLoadBalancerAttributes.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeLoadBalancerAttributes(ctx context.Context, params *Des addawsAwsquery_serdeOpDescribeLoadBalancerAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_DescribeLoadBalancerPolicies.go b/service/elasticloadbalancing/api_op_DescribeLoadBalancerPolicies.go index cc5ff8dc913..32d44f69f0c 100644 --- a/service/elasticloadbalancing/api_op_DescribeLoadBalancerPolicies.go +++ b/service/elasticloadbalancing/api_op_DescribeLoadBalancerPolicies.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeLoadBalancerPolicies(ctx context.Context, params *Descr addawsAwsquery_serdeOpDescribeLoadBalancerPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_DescribeLoadBalancerPolicyTypes.go b/service/elasticloadbalancing/api_op_DescribeLoadBalancerPolicyTypes.go index c026263b129..5faabe0e147 100644 --- a/service/elasticloadbalancing/api_op_DescribeLoadBalancerPolicyTypes.go +++ b/service/elasticloadbalancing/api_op_DescribeLoadBalancerPolicyTypes.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DescribeLoadBalancerPolicyTypes(ctx context.Context, params *De addawsAwsquery_serdeOpDescribeLoadBalancerPolicyTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_DescribeLoadBalancers.go b/service/elasticloadbalancing/api_op_DescribeLoadBalancers.go index 451186f0cb6..7ca1ffe48ea 100644 --- a/service/elasticloadbalancing/api_op_DescribeLoadBalancers.go +++ b/service/elasticloadbalancing/api_op_DescribeLoadBalancers.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeLoadBalancers(ctx context.Context, params *DescribeLoad addawsAwsquery_serdeOpDescribeLoadBalancersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_DescribeTags.go b/service/elasticloadbalancing/api_op_DescribeTags.go index 1c2864b960c..c5b568b170c 100644 --- a/service/elasticloadbalancing/api_op_DescribeTags.go +++ b/service/elasticloadbalancing/api_op_DescribeTags.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeTags(ctx context.Context, params *DescribeTagsInput, op addawsAwsquery_serdeOpDescribeTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_DetachLoadBalancerFromSubnets.go b/service/elasticloadbalancing/api_op_DetachLoadBalancerFromSubnets.go index 2e89a89f72e..73450e64f76 100644 --- a/service/elasticloadbalancing/api_op_DetachLoadBalancerFromSubnets.go +++ b/service/elasticloadbalancing/api_op_DetachLoadBalancerFromSubnets.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DetachLoadBalancerFromSubnets(ctx context.Context, params *Deta addawsAwsquery_serdeOpDetachLoadBalancerFromSubnetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_DisableAvailabilityZonesForLoadBalancer.go b/service/elasticloadbalancing/api_op_DisableAvailabilityZonesForLoadBalancer.go index 25d1bf198eb..92d1115d46e 100644 --- a/service/elasticloadbalancing/api_op_DisableAvailabilityZonesForLoadBalancer.go +++ b/service/elasticloadbalancing/api_op_DisableAvailabilityZonesForLoadBalancer.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) DisableAvailabilityZonesForLoadBalancer(ctx context.Context, pa addawsAwsquery_serdeOpDisableAvailabilityZonesForLoadBalancerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_EnableAvailabilityZonesForLoadBalancer.go b/service/elasticloadbalancing/api_op_EnableAvailabilityZonesForLoadBalancer.go index 90bd68c264d..cca2af9f841 100644 --- a/service/elasticloadbalancing/api_op_EnableAvailabilityZonesForLoadBalancer.go +++ b/service/elasticloadbalancing/api_op_EnableAvailabilityZonesForLoadBalancer.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) EnableAvailabilityZonesForLoadBalancer(ctx context.Context, par addawsAwsquery_serdeOpEnableAvailabilityZonesForLoadBalancerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_ModifyLoadBalancerAttributes.go b/service/elasticloadbalancing/api_op_ModifyLoadBalancerAttributes.go index 7a734e52c6d..0f72c801599 100644 --- a/service/elasticloadbalancing/api_op_ModifyLoadBalancerAttributes.go +++ b/service/elasticloadbalancing/api_op_ModifyLoadBalancerAttributes.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) ModifyLoadBalancerAttributes(ctx context.Context, params *Modif addawsAwsquery_serdeOpModifyLoadBalancerAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_RegisterInstancesWithLoadBalancer.go b/service/elasticloadbalancing/api_op_RegisterInstancesWithLoadBalancer.go index b927c607ba0..61991e45445 100644 --- a/service/elasticloadbalancing/api_op_RegisterInstancesWithLoadBalancer.go +++ b/service/elasticloadbalancing/api_op_RegisterInstancesWithLoadBalancer.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) RegisterInstancesWithLoadBalancer(ctx context.Context, params * addawsAwsquery_serdeOpRegisterInstancesWithLoadBalancerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_RemoveTags.go b/service/elasticloadbalancing/api_op_RemoveTags.go index 358ff85f594..e4dd2d65d7a 100644 --- a/service/elasticloadbalancing/api_op_RemoveTags.go +++ b/service/elasticloadbalancing/api_op_RemoveTags.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RemoveTags(ctx context.Context, params *RemoveTagsInput, optFns addawsAwsquery_serdeOpRemoveTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_SetLoadBalancerListenerSSLCertificate.go b/service/elasticloadbalancing/api_op_SetLoadBalancerListenerSSLCertificate.go index c237cccb034..37bbb8c120f 100644 --- a/service/elasticloadbalancing/api_op_SetLoadBalancerListenerSSLCertificate.go +++ b/service/elasticloadbalancing/api_op_SetLoadBalancerListenerSSLCertificate.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) SetLoadBalancerListenerSSLCertificate(ctx context.Context, para addawsAwsquery_serdeOpSetLoadBalancerListenerSSLCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_SetLoadBalancerPoliciesForBackendServer.go b/service/elasticloadbalancing/api_op_SetLoadBalancerPoliciesForBackendServer.go index f9f3c7410c4..69eeb976ce7 100644 --- a/service/elasticloadbalancing/api_op_SetLoadBalancerPoliciesForBackendServer.go +++ b/service/elasticloadbalancing/api_op_SetLoadBalancerPoliciesForBackendServer.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) SetLoadBalancerPoliciesForBackendServer(ctx context.Context, pa addawsAwsquery_serdeOpSetLoadBalancerPoliciesForBackendServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/api_op_SetLoadBalancerPoliciesOfListener.go b/service/elasticloadbalancing/api_op_SetLoadBalancerPoliciesOfListener.go index e39d51e41cf..1932b50dd56 100644 --- a/service/elasticloadbalancing/api_op_SetLoadBalancerPoliciesOfListener.go +++ b/service/elasticloadbalancing/api_op_SetLoadBalancerPoliciesOfListener.go @@ -5,7 +5,6 @@ package elasticloadbalancing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) SetLoadBalancerPoliciesOfListener(ctx context.Context, params * addawsAwsquery_serdeOpSetLoadBalancerPoliciesOfListenerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancing/endpoints.go b/service/elasticloadbalancing/endpoints.go index 479c2fc37b7..f28c44eabac 100644 --- a/service/elasticloadbalancing/endpoints.go +++ b/service/elasticloadbalancing/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/elasticloadbalancingv2/api_client.go b/service/elasticloadbalancingv2/api_client.go index 53333765e24..4b99e7aa163 100644 --- a/service/elasticloadbalancingv2/api_client.go +++ b/service/elasticloadbalancingv2/api_client.go @@ -98,30 +98,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -187,6 +163,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/elasticloadbalancingv2/api_op_AddListenerCertificates.go b/service/elasticloadbalancingv2/api_op_AddListenerCertificates.go index ef571233e80..ead35dd417e 100644 --- a/service/elasticloadbalancingv2/api_op_AddListenerCertificates.go +++ b/service/elasticloadbalancingv2/api_op_AddListenerCertificates.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) AddListenerCertificates(ctx context.Context, params *AddListene addawsAwsquery_serdeOpAddListenerCertificatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_AddTags.go b/service/elasticloadbalancingv2/api_op_AddTags.go index c5234f476f1..f28818941c8 100644 --- a/service/elasticloadbalancingv2/api_op_AddTags.go +++ b/service/elasticloadbalancingv2/api_op_AddTags.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) AddTags(ctx context.Context, params *AddTagsInput, optFns ...fu addawsAwsquery_serdeOpAddTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_CreateListener.go b/service/elasticloadbalancingv2/api_op_CreateListener.go index ffb2f03aef5..be02b8ccff7 100644 --- a/service/elasticloadbalancingv2/api_op_CreateListener.go +++ b/service/elasticloadbalancingv2/api_op_CreateListener.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) CreateListener(ctx context.Context, params *CreateListenerInput addawsAwsquery_serdeOpCreateListenerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_CreateLoadBalancer.go b/service/elasticloadbalancingv2/api_op_CreateLoadBalancer.go index 23138ab5a9b..aefc90a03ba 100644 --- a/service/elasticloadbalancingv2/api_op_CreateLoadBalancer.go +++ b/service/elasticloadbalancingv2/api_op_CreateLoadBalancer.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) CreateLoadBalancer(ctx context.Context, params *CreateLoadBalan addawsAwsquery_serdeOpCreateLoadBalancerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_CreateRule.go b/service/elasticloadbalancingv2/api_op_CreateRule.go index 4c1babd314b..f4c36476982 100644 --- a/service/elasticloadbalancingv2/api_op_CreateRule.go +++ b/service/elasticloadbalancingv2/api_op_CreateRule.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateRule(ctx context.Context, params *CreateRuleInput, optFns addawsAwsquery_serdeOpCreateRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_CreateTargetGroup.go b/service/elasticloadbalancingv2/api_op_CreateTargetGroup.go index b1b6a11ad64..52d164dcaff 100644 --- a/service/elasticloadbalancingv2/api_op_CreateTargetGroup.go +++ b/service/elasticloadbalancingv2/api_op_CreateTargetGroup.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) CreateTargetGroup(ctx context.Context, params *CreateTargetGrou addawsAwsquery_serdeOpCreateTargetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_DeleteListener.go b/service/elasticloadbalancingv2/api_op_DeleteListener.go index b6dff2f0a49..85a77695d4e 100644 --- a/service/elasticloadbalancingv2/api_op_DeleteListener.go +++ b/service/elasticloadbalancingv2/api_op_DeleteListener.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteListener(ctx context.Context, params *DeleteListenerInput addawsAwsquery_serdeOpDeleteListenerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_DeleteLoadBalancer.go b/service/elasticloadbalancingv2/api_op_DeleteLoadBalancer.go index bcd8fc705cc..7e7058689c8 100644 --- a/service/elasticloadbalancingv2/api_op_DeleteLoadBalancer.go +++ b/service/elasticloadbalancingv2/api_op_DeleteLoadBalancer.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeleteLoadBalancer(ctx context.Context, params *DeleteLoadBalan addawsAwsquery_serdeOpDeleteLoadBalancerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_DeleteRule.go b/service/elasticloadbalancingv2/api_op_DeleteRule.go index 7823d5a12aa..1ece2915806 100644 --- a/service/elasticloadbalancingv2/api_op_DeleteRule.go +++ b/service/elasticloadbalancingv2/api_op_DeleteRule.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRule(ctx context.Context, params *DeleteRuleInput, optFns addawsAwsquery_serdeOpDeleteRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_DeleteTargetGroup.go b/service/elasticloadbalancingv2/api_op_DeleteTargetGroup.go index 10a585b7b27..08632f46ef2 100644 --- a/service/elasticloadbalancingv2/api_op_DeleteTargetGroup.go +++ b/service/elasticloadbalancingv2/api_op_DeleteTargetGroup.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteTargetGroup(ctx context.Context, params *DeleteTargetGrou addawsAwsquery_serdeOpDeleteTargetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_DeregisterTargets.go b/service/elasticloadbalancingv2/api_op_DeregisterTargets.go index ba2d3737b22..864dab0c175 100644 --- a/service/elasticloadbalancingv2/api_op_DeregisterTargets.go +++ b/service/elasticloadbalancingv2/api_op_DeregisterTargets.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeregisterTargets(ctx context.Context, params *DeregisterTarget addawsAwsquery_serdeOpDeregisterTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_DescribeAccountLimits.go b/service/elasticloadbalancingv2/api_op_DescribeAccountLimits.go index 1cac3517abf..1ca1cad0524 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeAccountLimits.go +++ b/service/elasticloadbalancingv2/api_op_DescribeAccountLimits.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeAccountLimits(ctx context.Context, params *DescribeAcco addawsAwsquery_serdeOpDescribeAccountLimitsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_DescribeListenerCertificates.go b/service/elasticloadbalancingv2/api_op_DescribeListenerCertificates.go index 0896e251df6..567e6ebdb28 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeListenerCertificates.go +++ b/service/elasticloadbalancingv2/api_op_DescribeListenerCertificates.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeListenerCertificates(ctx context.Context, params *Descr addawsAwsquery_serdeOpDescribeListenerCertificatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_DescribeListeners.go b/service/elasticloadbalancingv2/api_op_DescribeListeners.go index 51ea2ef9799..82b38e3fccb 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeListeners.go +++ b/service/elasticloadbalancingv2/api_op_DescribeListeners.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeListeners(ctx context.Context, params *DescribeListener addawsAwsquery_serdeOpDescribeListenersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_DescribeLoadBalancerAttributes.go b/service/elasticloadbalancingv2/api_op_DescribeLoadBalancerAttributes.go index 902bb2b0bc0..0be1d732af9 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeLoadBalancerAttributes.go +++ b/service/elasticloadbalancingv2/api_op_DescribeLoadBalancerAttributes.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeLoadBalancerAttributes(ctx context.Context, params *Des addawsAwsquery_serdeOpDescribeLoadBalancerAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_DescribeLoadBalancers.go b/service/elasticloadbalancingv2/api_op_DescribeLoadBalancers.go index ee6f71e9fd3..3c98967beae 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeLoadBalancers.go +++ b/service/elasticloadbalancingv2/api_op_DescribeLoadBalancers.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeLoadBalancers(ctx context.Context, params *DescribeLoad addawsAwsquery_serdeOpDescribeLoadBalancersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_DescribeRules.go b/service/elasticloadbalancingv2/api_op_DescribeRules.go index 8d1675df12d..f87c8a44f2a 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeRules.go +++ b/service/elasticloadbalancingv2/api_op_DescribeRules.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeRules(ctx context.Context, params *DescribeRulesInput, addawsAwsquery_serdeOpDescribeRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_DescribeSSLPolicies.go b/service/elasticloadbalancingv2/api_op_DescribeSSLPolicies.go index 9c5a05b4f00..49713442fe4 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeSSLPolicies.go +++ b/service/elasticloadbalancingv2/api_op_DescribeSSLPolicies.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeSSLPolicies(ctx context.Context, params *DescribeSSLPol addawsAwsquery_serdeOpDescribeSSLPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_DescribeTags.go b/service/elasticloadbalancingv2/api_op_DescribeTags.go index 4119773f3c1..f4b77692bc7 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeTags.go +++ b/service/elasticloadbalancingv2/api_op_DescribeTags.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeTags(ctx context.Context, params *DescribeTagsInput, op addawsAwsquery_serdeOpDescribeTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_DescribeTargetGroupAttributes.go b/service/elasticloadbalancingv2/api_op_DescribeTargetGroupAttributes.go index edd8982b1b4..57d3a72c880 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeTargetGroupAttributes.go +++ b/service/elasticloadbalancingv2/api_op_DescribeTargetGroupAttributes.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeTargetGroupAttributes(ctx context.Context, params *Desc addawsAwsquery_serdeOpDescribeTargetGroupAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_DescribeTargetGroups.go b/service/elasticloadbalancingv2/api_op_DescribeTargetGroups.go index 3e3dcaf0d44..7dd9f71113b 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeTargetGroups.go +++ b/service/elasticloadbalancingv2/api_op_DescribeTargetGroups.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeTargetGroups(ctx context.Context, params *DescribeTarge addawsAwsquery_serdeOpDescribeTargetGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_DescribeTargetHealth.go b/service/elasticloadbalancingv2/api_op_DescribeTargetHealth.go index c6dd7f39699..402321902e1 100644 --- a/service/elasticloadbalancingv2/api_op_DescribeTargetHealth.go +++ b/service/elasticloadbalancingv2/api_op_DescribeTargetHealth.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeTargetHealth(ctx context.Context, params *DescribeTarge addawsAwsquery_serdeOpDescribeTargetHealthMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_ModifyListener.go b/service/elasticloadbalancingv2/api_op_ModifyListener.go index 388fbe1ac7d..16323adccd6 100644 --- a/service/elasticloadbalancingv2/api_op_ModifyListener.go +++ b/service/elasticloadbalancingv2/api_op_ModifyListener.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ModifyListener(ctx context.Context, params *ModifyListenerInput addawsAwsquery_serdeOpModifyListenerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_ModifyLoadBalancerAttributes.go b/service/elasticloadbalancingv2/api_op_ModifyLoadBalancerAttributes.go index e29927d793c..12cad30a0d0 100644 --- a/service/elasticloadbalancingv2/api_op_ModifyLoadBalancerAttributes.go +++ b/service/elasticloadbalancingv2/api_op_ModifyLoadBalancerAttributes.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ModifyLoadBalancerAttributes(ctx context.Context, params *Modif addawsAwsquery_serdeOpModifyLoadBalancerAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_ModifyRule.go b/service/elasticloadbalancingv2/api_op_ModifyRule.go index 7d132b3e015..f30a0ab4815 100644 --- a/service/elasticloadbalancingv2/api_op_ModifyRule.go +++ b/service/elasticloadbalancingv2/api_op_ModifyRule.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ModifyRule(ctx context.Context, params *ModifyRuleInput, optFns addawsAwsquery_serdeOpModifyRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_ModifyTargetGroup.go b/service/elasticloadbalancingv2/api_op_ModifyTargetGroup.go index f67a1f4c039..2a34b489c0a 100644 --- a/service/elasticloadbalancingv2/api_op_ModifyTargetGroup.go +++ b/service/elasticloadbalancingv2/api_op_ModifyTargetGroup.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ModifyTargetGroup(ctx context.Context, params *ModifyTargetGrou addawsAwsquery_serdeOpModifyTargetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_ModifyTargetGroupAttributes.go b/service/elasticloadbalancingv2/api_op_ModifyTargetGroupAttributes.go index 8ec805eb84b..6913b603e65 100644 --- a/service/elasticloadbalancingv2/api_op_ModifyTargetGroupAttributes.go +++ b/service/elasticloadbalancingv2/api_op_ModifyTargetGroupAttributes.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifyTargetGroupAttributes(ctx context.Context, params *Modify addawsAwsquery_serdeOpModifyTargetGroupAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_RegisterTargets.go b/service/elasticloadbalancingv2/api_op_RegisterTargets.go index e8355ecce54..f37c8058cdb 100644 --- a/service/elasticloadbalancingv2/api_op_RegisterTargets.go +++ b/service/elasticloadbalancingv2/api_op_RegisterTargets.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) RegisterTargets(ctx context.Context, params *RegisterTargetsInp addawsAwsquery_serdeOpRegisterTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_RemoveListenerCertificates.go b/service/elasticloadbalancingv2/api_op_RemoveListenerCertificates.go index cfcba5dc660..1c7474924a0 100644 --- a/service/elasticloadbalancingv2/api_op_RemoveListenerCertificates.go +++ b/service/elasticloadbalancingv2/api_op_RemoveListenerCertificates.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) RemoveListenerCertificates(ctx context.Context, params *RemoveL addawsAwsquery_serdeOpRemoveListenerCertificatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_RemoveTags.go b/service/elasticloadbalancingv2/api_op_RemoveTags.go index 92b230601d7..ab7fe8d55bf 100644 --- a/service/elasticloadbalancingv2/api_op_RemoveTags.go +++ b/service/elasticloadbalancingv2/api_op_RemoveTags.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) RemoveTags(ctx context.Context, params *RemoveTagsInput, optFns addawsAwsquery_serdeOpRemoveTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_SetIpAddressType.go b/service/elasticloadbalancingv2/api_op_SetIpAddressType.go index 59b70f63d70..478e5b376ca 100644 --- a/service/elasticloadbalancingv2/api_op_SetIpAddressType.go +++ b/service/elasticloadbalancingv2/api_op_SetIpAddressType.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) SetIpAddressType(ctx context.Context, params *SetIpAddressTypeI addawsAwsquery_serdeOpSetIpAddressTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_SetRulePriorities.go b/service/elasticloadbalancingv2/api_op_SetRulePriorities.go index 2b3443aefdf..d92d909cdfb 100644 --- a/service/elasticloadbalancingv2/api_op_SetRulePriorities.go +++ b/service/elasticloadbalancingv2/api_op_SetRulePriorities.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) SetRulePriorities(ctx context.Context, params *SetRulePrioritie addawsAwsquery_serdeOpSetRulePrioritiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_SetSecurityGroups.go b/service/elasticloadbalancingv2/api_op_SetSecurityGroups.go index 3e73de85bf9..d8a2b9228c2 100644 --- a/service/elasticloadbalancingv2/api_op_SetSecurityGroups.go +++ b/service/elasticloadbalancingv2/api_op_SetSecurityGroups.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) SetSecurityGroups(ctx context.Context, params *SetSecurityGroup addawsAwsquery_serdeOpSetSecurityGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/api_op_SetSubnets.go b/service/elasticloadbalancingv2/api_op_SetSubnets.go index b7b4da82f9c..b1f277de0be 100644 --- a/service/elasticloadbalancingv2/api_op_SetSubnets.go +++ b/service/elasticloadbalancingv2/api_op_SetSubnets.go @@ -5,7 +5,6 @@ package elasticloadbalancingv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) SetSubnets(ctx context.Context, params *SetSubnetsInput, optFns addawsAwsquery_serdeOpSetSubnetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticloadbalancingv2/endpoints.go b/service/elasticloadbalancingv2/endpoints.go index e6e88a6b333..bfbf8a3af01 100644 --- a/service/elasticloadbalancingv2/endpoints.go +++ b/service/elasticloadbalancingv2/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/elasticsearchservice/api_client.go b/service/elasticsearchservice/api_client.go index 0fd99019a94..28a267dffff 100644 --- a/service/elasticsearchservice/api_client.go +++ b/service/elasticsearchservice/api_client.go @@ -88,30 +88,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -177,6 +153,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/elasticsearchservice/api_op_AcceptInboundCrossClusterSearchConnection.go b/service/elasticsearchservice/api_op_AcceptInboundCrossClusterSearchConnection.go index ff14a78820e..46a8b8e2983 100644 --- a/service/elasticsearchservice/api_op_AcceptInboundCrossClusterSearchConnection.go +++ b/service/elasticsearchservice/api_op_AcceptInboundCrossClusterSearchConnection.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AcceptInboundCrossClusterSearchConnection(ctx context.Context, addawsRestjson1_serdeOpAcceptInboundCrossClusterSearchConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_AddTags.go b/service/elasticsearchservice/api_op_AddTags.go index e0b6a594193..fc10b5648fb 100644 --- a/service/elasticsearchservice/api_op_AddTags.go +++ b/service/elasticsearchservice/api_op_AddTags.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) AddTags(ctx context.Context, params *AddTagsInput, optFns ...fu addawsRestjson1_serdeOpAddTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_AssociatePackage.go b/service/elasticsearchservice/api_op_AssociatePackage.go index 5e4ff5520c8..26a031e701e 100644 --- a/service/elasticsearchservice/api_op_AssociatePackage.go +++ b/service/elasticsearchservice/api_op_AssociatePackage.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) AssociatePackage(ctx context.Context, params *AssociatePackageI addawsRestjson1_serdeOpAssociatePackageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_CancelElasticsearchServiceSoftwareUpdate.go b/service/elasticsearchservice/api_op_CancelElasticsearchServiceSoftwareUpdate.go index b73f2be97ae..58564761437 100644 --- a/service/elasticsearchservice/api_op_CancelElasticsearchServiceSoftwareUpdate.go +++ b/service/elasticsearchservice/api_op_CancelElasticsearchServiceSoftwareUpdate.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CancelElasticsearchServiceSoftwareUpdate(ctx context.Context, p addawsRestjson1_serdeOpCancelElasticsearchServiceSoftwareUpdateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_CreateElasticsearchDomain.go b/service/elasticsearchservice/api_op_CreateElasticsearchDomain.go index eb4b52ca031..21f46782850 100644 --- a/service/elasticsearchservice/api_op_CreateElasticsearchDomain.go +++ b/service/elasticsearchservice/api_op_CreateElasticsearchDomain.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateElasticsearchDomain(ctx context.Context, params *CreateEl addawsRestjson1_serdeOpCreateElasticsearchDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_CreateOutboundCrossClusterSearchConnection.go b/service/elasticsearchservice/api_op_CreateOutboundCrossClusterSearchConnection.go index 8691b3fba7e..5640057ec90 100644 --- a/service/elasticsearchservice/api_op_CreateOutboundCrossClusterSearchConnection.go +++ b/service/elasticsearchservice/api_op_CreateOutboundCrossClusterSearchConnection.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateOutboundCrossClusterSearchConnection(ctx context.Context, addawsRestjson1_serdeOpCreateOutboundCrossClusterSearchConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_CreatePackage.go b/service/elasticsearchservice/api_op_CreatePackage.go index 07a58420446..304ce4216ab 100644 --- a/service/elasticsearchservice/api_op_CreatePackage.go +++ b/service/elasticsearchservice/api_op_CreatePackage.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreatePackage(ctx context.Context, params *CreatePackageInput, addawsRestjson1_serdeOpCreatePackageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_DeleteElasticsearchDomain.go b/service/elasticsearchservice/api_op_DeleteElasticsearchDomain.go index ae72b9bc547..8900530f764 100644 --- a/service/elasticsearchservice/api_op_DeleteElasticsearchDomain.go +++ b/service/elasticsearchservice/api_op_DeleteElasticsearchDomain.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteElasticsearchDomain(ctx context.Context, params *DeleteEl addawsRestjson1_serdeOpDeleteElasticsearchDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_DeleteElasticsearchServiceRole.go b/service/elasticsearchservice/api_op_DeleteElasticsearchServiceRole.go index 93a609619e4..065a67ad76d 100644 --- a/service/elasticsearchservice/api_op_DeleteElasticsearchServiceRole.go +++ b/service/elasticsearchservice/api_op_DeleteElasticsearchServiceRole.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteElasticsearchServiceRole(ctx context.Context, params *Del addawsRestjson1_serdeOpDeleteElasticsearchServiceRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_DeleteInboundCrossClusterSearchConnection.go b/service/elasticsearchservice/api_op_DeleteInboundCrossClusterSearchConnection.go index 7a67a7172ea..da12440d64f 100644 --- a/service/elasticsearchservice/api_op_DeleteInboundCrossClusterSearchConnection.go +++ b/service/elasticsearchservice/api_op_DeleteInboundCrossClusterSearchConnection.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteInboundCrossClusterSearchConnection(ctx context.Context, addawsRestjson1_serdeOpDeleteInboundCrossClusterSearchConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_DeleteOutboundCrossClusterSearchConnection.go b/service/elasticsearchservice/api_op_DeleteOutboundCrossClusterSearchConnection.go index 345c4b8399a..56dc0491255 100644 --- a/service/elasticsearchservice/api_op_DeleteOutboundCrossClusterSearchConnection.go +++ b/service/elasticsearchservice/api_op_DeleteOutboundCrossClusterSearchConnection.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteOutboundCrossClusterSearchConnection(ctx context.Context, addawsRestjson1_serdeOpDeleteOutboundCrossClusterSearchConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_DeletePackage.go b/service/elasticsearchservice/api_op_DeletePackage.go index 35d5111ad4e..d4345ff9d18 100644 --- a/service/elasticsearchservice/api_op_DeletePackage.go +++ b/service/elasticsearchservice/api_op_DeletePackage.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeletePackage(ctx context.Context, params *DeletePackageInput, addawsRestjson1_serdeOpDeletePackageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_DescribeElasticsearchDomain.go b/service/elasticsearchservice/api_op_DescribeElasticsearchDomain.go index 0862ea4cedb..bcfdce6d05d 100644 --- a/service/elasticsearchservice/api_op_DescribeElasticsearchDomain.go +++ b/service/elasticsearchservice/api_op_DescribeElasticsearchDomain.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeElasticsearchDomain(ctx context.Context, params *Descri addawsRestjson1_serdeOpDescribeElasticsearchDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_DescribeElasticsearchDomainConfig.go b/service/elasticsearchservice/api_op_DescribeElasticsearchDomainConfig.go index 8b46d9be9f2..b7f6b5c61de 100644 --- a/service/elasticsearchservice/api_op_DescribeElasticsearchDomainConfig.go +++ b/service/elasticsearchservice/api_op_DescribeElasticsearchDomainConfig.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeElasticsearchDomainConfig(ctx context.Context, params * addawsRestjson1_serdeOpDescribeElasticsearchDomainConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_DescribeElasticsearchDomains.go b/service/elasticsearchservice/api_op_DescribeElasticsearchDomains.go index 97b2035e65f..1da70895a33 100644 --- a/service/elasticsearchservice/api_op_DescribeElasticsearchDomains.go +++ b/service/elasticsearchservice/api_op_DescribeElasticsearchDomains.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeElasticsearchDomains(ctx context.Context, params *Descr addawsRestjson1_serdeOpDescribeElasticsearchDomainsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_DescribeElasticsearchInstanceTypeLimits.go b/service/elasticsearchservice/api_op_DescribeElasticsearchInstanceTypeLimits.go index 4f2c4638519..50fd9402bec 100644 --- a/service/elasticsearchservice/api_op_DescribeElasticsearchInstanceTypeLimits.go +++ b/service/elasticsearchservice/api_op_DescribeElasticsearchInstanceTypeLimits.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeElasticsearchInstanceTypeLimits(ctx context.Context, pa addawsRestjson1_serdeOpDescribeElasticsearchInstanceTypeLimitsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_DescribeInboundCrossClusterSearchConnections.go b/service/elasticsearchservice/api_op_DescribeInboundCrossClusterSearchConnections.go index 501a64202f6..f9f535877d7 100644 --- a/service/elasticsearchservice/api_op_DescribeInboundCrossClusterSearchConnections.go +++ b/service/elasticsearchservice/api_op_DescribeInboundCrossClusterSearchConnections.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeInboundCrossClusterSearchConnections(ctx context.Contex addawsRestjson1_serdeOpDescribeInboundCrossClusterSearchConnectionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_DescribeOutboundCrossClusterSearchConnections.go b/service/elasticsearchservice/api_op_DescribeOutboundCrossClusterSearchConnections.go index 374c2e569de..2becbddf651 100644 --- a/service/elasticsearchservice/api_op_DescribeOutboundCrossClusterSearchConnections.go +++ b/service/elasticsearchservice/api_op_DescribeOutboundCrossClusterSearchConnections.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeOutboundCrossClusterSearchConnections(ctx context.Conte addawsRestjson1_serdeOpDescribeOutboundCrossClusterSearchConnectionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_DescribePackages.go b/service/elasticsearchservice/api_op_DescribePackages.go index 2e796ec002b..00744e108dc 100644 --- a/service/elasticsearchservice/api_op_DescribePackages.go +++ b/service/elasticsearchservice/api_op_DescribePackages.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribePackages(ctx context.Context, params *DescribePackagesI addawsRestjson1_serdeOpDescribePackagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_DescribeReservedElasticsearchInstanceOfferings.go b/service/elasticsearchservice/api_op_DescribeReservedElasticsearchInstanceOfferings.go index f7c16f6240f..527883a94e0 100644 --- a/service/elasticsearchservice/api_op_DescribeReservedElasticsearchInstanceOfferings.go +++ b/service/elasticsearchservice/api_op_DescribeReservedElasticsearchInstanceOfferings.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeReservedElasticsearchInstanceOfferings(ctx context.Cont addawsRestjson1_serdeOpDescribeReservedElasticsearchInstanceOfferingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_DescribeReservedElasticsearchInstances.go b/service/elasticsearchservice/api_op_DescribeReservedElasticsearchInstances.go index 878efbfbe8d..f2cca8a9424 100644 --- a/service/elasticsearchservice/api_op_DescribeReservedElasticsearchInstances.go +++ b/service/elasticsearchservice/api_op_DescribeReservedElasticsearchInstances.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeReservedElasticsearchInstances(ctx context.Context, par addawsRestjson1_serdeOpDescribeReservedElasticsearchInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_DissociatePackage.go b/service/elasticsearchservice/api_op_DissociatePackage.go index 0c945adfd24..2568ab40b0b 100644 --- a/service/elasticsearchservice/api_op_DissociatePackage.go +++ b/service/elasticsearchservice/api_op_DissociatePackage.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DissociatePackage(ctx context.Context, params *DissociatePackag addawsRestjson1_serdeOpDissociatePackageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_GetCompatibleElasticsearchVersions.go b/service/elasticsearchservice/api_op_GetCompatibleElasticsearchVersions.go index cb24b02e064..af0551fbcbe 100644 --- a/service/elasticsearchservice/api_op_GetCompatibleElasticsearchVersions.go +++ b/service/elasticsearchservice/api_op_GetCompatibleElasticsearchVersions.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetCompatibleElasticsearchVersions(ctx context.Context, params addawsRestjson1_serdeOpGetCompatibleElasticsearchVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_GetUpgradeHistory.go b/service/elasticsearchservice/api_op_GetUpgradeHistory.go index 4f5bfd47df3..1c37a8b8ed4 100644 --- a/service/elasticsearchservice/api_op_GetUpgradeHistory.go +++ b/service/elasticsearchservice/api_op_GetUpgradeHistory.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetUpgradeHistory(ctx context.Context, params *GetUpgradeHistor addawsRestjson1_serdeOpGetUpgradeHistoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_GetUpgradeStatus.go b/service/elasticsearchservice/api_op_GetUpgradeStatus.go index 6d68a3eccb8..5b6ff74b098 100644 --- a/service/elasticsearchservice/api_op_GetUpgradeStatus.go +++ b/service/elasticsearchservice/api_op_GetUpgradeStatus.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetUpgradeStatus(ctx context.Context, params *GetUpgradeStatusI addawsRestjson1_serdeOpGetUpgradeStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_ListDomainNames.go b/service/elasticsearchservice/api_op_ListDomainNames.go index 037a224f0dd..71c72f5d167 100644 --- a/service/elasticsearchservice/api_op_ListDomainNames.go +++ b/service/elasticsearchservice/api_op_ListDomainNames.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListDomainNames(ctx context.Context, params *ListDomainNamesInp addawsRestjson1_serdeOpListDomainNamesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_ListDomainsForPackage.go b/service/elasticsearchservice/api_op_ListDomainsForPackage.go index 0499c569ef3..2f229c9cf02 100644 --- a/service/elasticsearchservice/api_op_ListDomainsForPackage.go +++ b/service/elasticsearchservice/api_op_ListDomainsForPackage.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDomainsForPackage(ctx context.Context, params *ListDomainsF addawsRestjson1_serdeOpListDomainsForPackageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_ListElasticsearchInstanceTypes.go b/service/elasticsearchservice/api_op_ListElasticsearchInstanceTypes.go index 99fedc17b49..77adb1780aa 100644 --- a/service/elasticsearchservice/api_op_ListElasticsearchInstanceTypes.go +++ b/service/elasticsearchservice/api_op_ListElasticsearchInstanceTypes.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListElasticsearchInstanceTypes(ctx context.Context, params *Lis addawsRestjson1_serdeOpListElasticsearchInstanceTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_ListElasticsearchVersions.go b/service/elasticsearchservice/api_op_ListElasticsearchVersions.go index b2de4875594..144cb8228c3 100644 --- a/service/elasticsearchservice/api_op_ListElasticsearchVersions.go +++ b/service/elasticsearchservice/api_op_ListElasticsearchVersions.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListElasticsearchVersions(ctx context.Context, params *ListElas addawsRestjson1_serdeOpListElasticsearchVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_ListPackagesForDomain.go b/service/elasticsearchservice/api_op_ListPackagesForDomain.go index 82f702db1fd..1e787aa53c1 100644 --- a/service/elasticsearchservice/api_op_ListPackagesForDomain.go +++ b/service/elasticsearchservice/api_op_ListPackagesForDomain.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListPackagesForDomain(ctx context.Context, params *ListPackages addawsRestjson1_serdeOpListPackagesForDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_ListTags.go b/service/elasticsearchservice/api_op_ListTags.go index 9d6e178f397..429c6d88f8f 100644 --- a/service/elasticsearchservice/api_op_ListTags.go +++ b/service/elasticsearchservice/api_op_ListTags.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTags(ctx context.Context, params *ListTagsInput, optFns ... addawsRestjson1_serdeOpListTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_PurchaseReservedElasticsearchInstanceOffering.go b/service/elasticsearchservice/api_op_PurchaseReservedElasticsearchInstanceOffering.go index 1ab6f292360..73891f0f88b 100644 --- a/service/elasticsearchservice/api_op_PurchaseReservedElasticsearchInstanceOffering.go +++ b/service/elasticsearchservice/api_op_PurchaseReservedElasticsearchInstanceOffering.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) PurchaseReservedElasticsearchInstanceOffering(ctx context.Conte addawsRestjson1_serdeOpPurchaseReservedElasticsearchInstanceOfferingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_RejectInboundCrossClusterSearchConnection.go b/service/elasticsearchservice/api_op_RejectInboundCrossClusterSearchConnection.go index bd1f25fab86..c9cbaff0d18 100644 --- a/service/elasticsearchservice/api_op_RejectInboundCrossClusterSearchConnection.go +++ b/service/elasticsearchservice/api_op_RejectInboundCrossClusterSearchConnection.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) RejectInboundCrossClusterSearchConnection(ctx context.Context, addawsRestjson1_serdeOpRejectInboundCrossClusterSearchConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_RemoveTags.go b/service/elasticsearchservice/api_op_RemoveTags.go index ba02036015a..8f4a356f02d 100644 --- a/service/elasticsearchservice/api_op_RemoveTags.go +++ b/service/elasticsearchservice/api_op_RemoveTags.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RemoveTags(ctx context.Context, params *RemoveTagsInput, optFns addawsRestjson1_serdeOpRemoveTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_StartElasticsearchServiceSoftwareUpdate.go b/service/elasticsearchservice/api_op_StartElasticsearchServiceSoftwareUpdate.go index c9eb0efee21..85be287a876 100644 --- a/service/elasticsearchservice/api_op_StartElasticsearchServiceSoftwareUpdate.go +++ b/service/elasticsearchservice/api_op_StartElasticsearchServiceSoftwareUpdate.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StartElasticsearchServiceSoftwareUpdate(ctx context.Context, pa addawsRestjson1_serdeOpStartElasticsearchServiceSoftwareUpdateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_UpdateElasticsearchDomainConfig.go b/service/elasticsearchservice/api_op_UpdateElasticsearchDomainConfig.go index 6797cb507a9..f58b96f65e3 100644 --- a/service/elasticsearchservice/api_op_UpdateElasticsearchDomainConfig.go +++ b/service/elasticsearchservice/api_op_UpdateElasticsearchDomainConfig.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateElasticsearchDomainConfig(ctx context.Context, params *Up addawsRestjson1_serdeOpUpdateElasticsearchDomainConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/api_op_UpgradeElasticsearchDomain.go b/service/elasticsearchservice/api_op_UpgradeElasticsearchDomain.go index d508be65993..ed1f053faaa 100644 --- a/service/elasticsearchservice/api_op_UpgradeElasticsearchDomain.go +++ b/service/elasticsearchservice/api_op_UpgradeElasticsearchDomain.go @@ -5,7 +5,6 @@ package elasticsearchservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpgradeElasticsearchDomain(ctx context.Context, params *Upgrade addawsRestjson1_serdeOpUpgradeElasticsearchDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elasticsearchservice/endpoints.go b/service/elasticsearchservice/endpoints.go index 51affa12e14..87894121e65 100644 --- a/service/elasticsearchservice/endpoints.go +++ b/service/elasticsearchservice/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/elastictranscoder/api_client.go b/service/elastictranscoder/api_client.go index dbee8e6b7cc..b90e280dec0 100644 --- a/service/elastictranscoder/api_client.go +++ b/service/elastictranscoder/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/elastictranscoder/api_op_CancelJob.go b/service/elastictranscoder/api_op_CancelJob.go index 5e112935866..3f4f5f87ae0 100644 --- a/service/elastictranscoder/api_op_CancelJob.go +++ b/service/elastictranscoder/api_op_CancelJob.go @@ -5,7 +5,6 @@ package elastictranscoder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) CancelJob(ctx context.Context, params *CancelJobInput, optFns . addawsRestjson1_serdeOpCancelJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elastictranscoder/api_op_CreateJob.go b/service/elastictranscoder/api_op_CreateJob.go index 98bf2087b8b..b62f61d4170 100644 --- a/service/elastictranscoder/api_op_CreateJob.go +++ b/service/elastictranscoder/api_op_CreateJob.go @@ -5,7 +5,6 @@ package elastictranscoder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elastictranscoder/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateJob(ctx context.Context, params *CreateJobInput, optFns . addawsRestjson1_serdeOpCreateJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elastictranscoder/api_op_CreatePipeline.go b/service/elastictranscoder/api_op_CreatePipeline.go index 320fef0c106..7a9df7e2901 100644 --- a/service/elastictranscoder/api_op_CreatePipeline.go +++ b/service/elastictranscoder/api_op_CreatePipeline.go @@ -5,7 +5,6 @@ package elastictranscoder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elastictranscoder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreatePipeline(ctx context.Context, params *CreatePipelineInput addawsRestjson1_serdeOpCreatePipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elastictranscoder/api_op_CreatePreset.go b/service/elastictranscoder/api_op_CreatePreset.go index a143d8142d5..ff7f4935150 100644 --- a/service/elastictranscoder/api_op_CreatePreset.go +++ b/service/elastictranscoder/api_op_CreatePreset.go @@ -5,7 +5,6 @@ package elastictranscoder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elastictranscoder/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) CreatePreset(ctx context.Context, params *CreatePresetInput, op addawsRestjson1_serdeOpCreatePresetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elastictranscoder/api_op_DeletePipeline.go b/service/elastictranscoder/api_op_DeletePipeline.go index 79001b1ada8..f00ec8ff8d5 100644 --- a/service/elastictranscoder/api_op_DeletePipeline.go +++ b/service/elastictranscoder/api_op_DeletePipeline.go @@ -5,7 +5,6 @@ package elastictranscoder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeletePipeline(ctx context.Context, params *DeletePipelineInput addawsRestjson1_serdeOpDeletePipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elastictranscoder/api_op_DeletePreset.go b/service/elastictranscoder/api_op_DeletePreset.go index 697ed8e3608..0e3fb4e9724 100644 --- a/service/elastictranscoder/api_op_DeletePreset.go +++ b/service/elastictranscoder/api_op_DeletePreset.go @@ -5,7 +5,6 @@ package elastictranscoder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeletePreset(ctx context.Context, params *DeletePresetInput, op addawsRestjson1_serdeOpDeletePresetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elastictranscoder/api_op_ListJobsByPipeline.go b/service/elastictranscoder/api_op_ListJobsByPipeline.go index 4edee7b954e..1d00f180b20 100644 --- a/service/elastictranscoder/api_op_ListJobsByPipeline.go +++ b/service/elastictranscoder/api_op_ListJobsByPipeline.go @@ -5,7 +5,6 @@ package elastictranscoder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elastictranscoder/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListJobsByPipeline(ctx context.Context, params *ListJobsByPipel addawsRestjson1_serdeOpListJobsByPipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elastictranscoder/api_op_ListJobsByStatus.go b/service/elastictranscoder/api_op_ListJobsByStatus.go index e7f9cb5b0ec..5e33e1e0479 100644 --- a/service/elastictranscoder/api_op_ListJobsByStatus.go +++ b/service/elastictranscoder/api_op_ListJobsByStatus.go @@ -5,7 +5,6 @@ package elastictranscoder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elastictranscoder/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListJobsByStatus(ctx context.Context, params *ListJobsByStatusI addawsRestjson1_serdeOpListJobsByStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elastictranscoder/api_op_ListPipelines.go b/service/elastictranscoder/api_op_ListPipelines.go index 1888fd3190f..13672976a93 100644 --- a/service/elastictranscoder/api_op_ListPipelines.go +++ b/service/elastictranscoder/api_op_ListPipelines.go @@ -5,7 +5,6 @@ package elastictranscoder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elastictranscoder/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListPipelines(ctx context.Context, params *ListPipelinesInput, addawsRestjson1_serdeOpListPipelinesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elastictranscoder/api_op_ListPresets.go b/service/elastictranscoder/api_op_ListPresets.go index f36b9c47dcb..2602429b2e8 100644 --- a/service/elastictranscoder/api_op_ListPresets.go +++ b/service/elastictranscoder/api_op_ListPresets.go @@ -5,7 +5,6 @@ package elastictranscoder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elastictranscoder/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListPresets(ctx context.Context, params *ListPresetsInput, optF addawsRestjson1_serdeOpListPresetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elastictranscoder/api_op_ReadJob.go b/service/elastictranscoder/api_op_ReadJob.go index 93e517864b1..0559c39bbed 100644 --- a/service/elastictranscoder/api_op_ReadJob.go +++ b/service/elastictranscoder/api_op_ReadJob.go @@ -5,7 +5,6 @@ package elastictranscoder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elastictranscoder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ReadJob(ctx context.Context, params *ReadJobInput, optFns ...fu addawsRestjson1_serdeOpReadJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elastictranscoder/api_op_ReadPipeline.go b/service/elastictranscoder/api_op_ReadPipeline.go index 8e627b28fe9..7f929cf7572 100644 --- a/service/elastictranscoder/api_op_ReadPipeline.go +++ b/service/elastictranscoder/api_op_ReadPipeline.go @@ -5,7 +5,6 @@ package elastictranscoder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elastictranscoder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ReadPipeline(ctx context.Context, params *ReadPipelineInput, op addawsRestjson1_serdeOpReadPipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elastictranscoder/api_op_ReadPreset.go b/service/elastictranscoder/api_op_ReadPreset.go index b371f21b4c0..d395ce18793 100644 --- a/service/elastictranscoder/api_op_ReadPreset.go +++ b/service/elastictranscoder/api_op_ReadPreset.go @@ -5,7 +5,6 @@ package elastictranscoder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elastictranscoder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ReadPreset(ctx context.Context, params *ReadPresetInput, optFns addawsRestjson1_serdeOpReadPresetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elastictranscoder/api_op_TestRole.go b/service/elastictranscoder/api_op_TestRole.go index 1c8d7ac8c2c..58e9d47b2a4 100644 --- a/service/elastictranscoder/api_op_TestRole.go +++ b/service/elastictranscoder/api_op_TestRole.go @@ -5,7 +5,6 @@ package elastictranscoder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) TestRole(ctx context.Context, params *TestRoleInput, optFns ... addawsRestjson1_serdeOpTestRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elastictranscoder/api_op_UpdatePipeline.go b/service/elastictranscoder/api_op_UpdatePipeline.go index 7ce9744cc83..1f97e5fca4d 100644 --- a/service/elastictranscoder/api_op_UpdatePipeline.go +++ b/service/elastictranscoder/api_op_UpdatePipeline.go @@ -5,7 +5,6 @@ package elastictranscoder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elastictranscoder/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdatePipeline(ctx context.Context, params *UpdatePipelineInput addawsRestjson1_serdeOpUpdatePipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elastictranscoder/api_op_UpdatePipelineNotifications.go b/service/elastictranscoder/api_op_UpdatePipelineNotifications.go index 5f5f25e916a..b06ca681d70 100644 --- a/service/elastictranscoder/api_op_UpdatePipelineNotifications.go +++ b/service/elastictranscoder/api_op_UpdatePipelineNotifications.go @@ -5,7 +5,6 @@ package elastictranscoder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elastictranscoder/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdatePipelineNotifications(ctx context.Context, params *Update addawsRestjson1_serdeOpUpdatePipelineNotificationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elastictranscoder/api_op_UpdatePipelineStatus.go b/service/elastictranscoder/api_op_UpdatePipelineStatus.go index c6718178b65..fe87ea4c249 100644 --- a/service/elastictranscoder/api_op_UpdatePipelineStatus.go +++ b/service/elastictranscoder/api_op_UpdatePipelineStatus.go @@ -5,7 +5,6 @@ package elastictranscoder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/elastictranscoder/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) UpdatePipelineStatus(ctx context.Context, params *UpdatePipelin addawsRestjson1_serdeOpUpdatePipelineStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/elastictranscoder/endpoints.go b/service/elastictranscoder/endpoints.go index f5cc621a991..9f2d624b440 100644 --- a/service/elastictranscoder/endpoints.go +++ b/service/elastictranscoder/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/emr/api_client.go b/service/emr/api_client.go index e7e8dd9e0bc..8e24facdaef 100644 --- a/service/emr/api_client.go +++ b/service/emr/api_client.go @@ -80,30 +80,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -169,6 +145,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/emr/api_op_AddInstanceFleet.go b/service/emr/api_op_AddInstanceFleet.go index 69bfb524040..f8ef974065d 100644 --- a/service/emr/api_op_AddInstanceFleet.go +++ b/service/emr/api_op_AddInstanceFleet.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AddInstanceFleet(ctx context.Context, params *AddInstanceFleetI addawsAwsjson11_serdeOpAddInstanceFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_AddInstanceGroups.go b/service/emr/api_op_AddInstanceGroups.go index 66b8a354519..7cf3aca0edf 100644 --- a/service/emr/api_op_AddInstanceGroups.go +++ b/service/emr/api_op_AddInstanceGroups.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) AddInstanceGroups(ctx context.Context, params *AddInstanceGroup addawsAwsjson11_serdeOpAddInstanceGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_AddJobFlowSteps.go b/service/emr/api_op_AddJobFlowSteps.go index b385ada56d4..4f47278b1f2 100644 --- a/service/emr/api_op_AddJobFlowSteps.go +++ b/service/emr/api_op_AddJobFlowSteps.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) AddJobFlowSteps(ctx context.Context, params *AddJobFlowStepsInp addawsAwsjson11_serdeOpAddJobFlowStepsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_AddTags.go b/service/emr/api_op_AddTags.go index a4885459def..ac94ac39e13 100644 --- a/service/emr/api_op_AddTags.go +++ b/service/emr/api_op_AddTags.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) AddTags(ctx context.Context, params *AddTagsInput, optFns ...fu addawsAwsjson11_serdeOpAddTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_CancelSteps.go b/service/emr/api_op_CancelSteps.go index 14e3d3e5264..ea9c6bbdb7a 100644 --- a/service/emr/api_op_CancelSteps.go +++ b/service/emr/api_op_CancelSteps.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CancelSteps(ctx context.Context, params *CancelStepsInput, optF addawsAwsjson11_serdeOpCancelStepsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_CreateSecurityConfiguration.go b/service/emr/api_op_CreateSecurityConfiguration.go index 0e32b8fcf7a..801d75c7491 100644 --- a/service/emr/api_op_CreateSecurityConfiguration.go +++ b/service/emr/api_op_CreateSecurityConfiguration.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CreateSecurityConfiguration(ctx context.Context, params *Create addawsAwsjson11_serdeOpCreateSecurityConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_DeleteSecurityConfiguration.go b/service/emr/api_op_DeleteSecurityConfiguration.go index c73667c5629..3a29943a7d7 100644 --- a/service/emr/api_op_DeleteSecurityConfiguration.go +++ b/service/emr/api_op_DeleteSecurityConfiguration.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSecurityConfiguration(ctx context.Context, params *Delete addawsAwsjson11_serdeOpDeleteSecurityConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_DescribeCluster.go b/service/emr/api_op_DescribeCluster.go index 8a0077d076f..ba180510aee 100644 --- a/service/emr/api_op_DescribeCluster.go +++ b/service/emr/api_op_DescribeCluster.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeCluster(ctx context.Context, params *DescribeClusterInp addawsAwsjson11_serdeOpDescribeClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_DescribeJobFlows.go b/service/emr/api_op_DescribeJobFlows.go index 914f548d912..df7f805fa76 100644 --- a/service/emr/api_op_DescribeJobFlows.go +++ b/service/emr/api_op_DescribeJobFlows.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) DescribeJobFlows(ctx context.Context, params *DescribeJobFlowsI addawsAwsjson11_serdeOpDescribeJobFlowsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_DescribeSecurityConfiguration.go b/service/emr/api_op_DescribeSecurityConfiguration.go index efbd70afd2c..0d0bb764c1e 100644 --- a/service/emr/api_op_DescribeSecurityConfiguration.go +++ b/service/emr/api_op_DescribeSecurityConfiguration.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DescribeSecurityConfiguration(ctx context.Context, params *Desc addawsAwsjson11_serdeOpDescribeSecurityConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_DescribeStep.go b/service/emr/api_op_DescribeStep.go index 2620431e384..2db10195720 100644 --- a/service/emr/api_op_DescribeStep.go +++ b/service/emr/api_op_DescribeStep.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeStep(ctx context.Context, params *DescribeStepInput, op addawsAwsjson11_serdeOpDescribeStepMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_GetBlockPublicAccessConfiguration.go b/service/emr/api_op_GetBlockPublicAccessConfiguration.go index 67200e0ed6d..a498e458ea8 100644 --- a/service/emr/api_op_GetBlockPublicAccessConfiguration.go +++ b/service/emr/api_op_GetBlockPublicAccessConfiguration.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetBlockPublicAccessConfiguration(ctx context.Context, params * addawsAwsjson11_serdeOpGetBlockPublicAccessConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_GetManagedScalingPolicy.go b/service/emr/api_op_GetManagedScalingPolicy.go index d5f891fcf19..330945cfa1c 100644 --- a/service/emr/api_op_GetManagedScalingPolicy.go +++ b/service/emr/api_op_GetManagedScalingPolicy.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetManagedScalingPolicy(ctx context.Context, params *GetManaged addawsAwsjson11_serdeOpGetManagedScalingPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_ListBootstrapActions.go b/service/emr/api_op_ListBootstrapActions.go index aab0bbd96ca..8f87161afec 100644 --- a/service/emr/api_op_ListBootstrapActions.go +++ b/service/emr/api_op_ListBootstrapActions.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListBootstrapActions(ctx context.Context, params *ListBootstrap addawsAwsjson11_serdeOpListBootstrapActionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_ListClusters.go b/service/emr/api_op_ListClusters.go index d0316f2f81d..d695c68af75 100644 --- a/service/emr/api_op_ListClusters.go +++ b/service/emr/api_op_ListClusters.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListClusters(ctx context.Context, params *ListClustersInput, op addawsAwsjson11_serdeOpListClustersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_ListInstanceFleets.go b/service/emr/api_op_ListInstanceFleets.go index d7fb9b2a655..87d99e3c214 100644 --- a/service/emr/api_op_ListInstanceFleets.go +++ b/service/emr/api_op_ListInstanceFleets.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListInstanceFleets(ctx context.Context, params *ListInstanceFle addawsAwsjson11_serdeOpListInstanceFleetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_ListInstanceGroups.go b/service/emr/api_op_ListInstanceGroups.go index ea32c7a2e5f..ebc8fdb1354 100644 --- a/service/emr/api_op_ListInstanceGroups.go +++ b/service/emr/api_op_ListInstanceGroups.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListInstanceGroups(ctx context.Context, params *ListInstanceGro addawsAwsjson11_serdeOpListInstanceGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_ListInstances.go b/service/emr/api_op_ListInstances.go index 0d7cb8e8b8e..7e62b7de1ff 100644 --- a/service/emr/api_op_ListInstances.go +++ b/service/emr/api_op_ListInstances.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListInstances(ctx context.Context, params *ListInstancesInput, addawsAwsjson11_serdeOpListInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_ListSecurityConfigurations.go b/service/emr/api_op_ListSecurityConfigurations.go index 15367300076..3abb812a192 100644 --- a/service/emr/api_op_ListSecurityConfigurations.go +++ b/service/emr/api_op_ListSecurityConfigurations.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListSecurityConfigurations(ctx context.Context, params *ListSec addawsAwsjson11_serdeOpListSecurityConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_ListSteps.go b/service/emr/api_op_ListSteps.go index 19a612fb09c..2338671c049 100644 --- a/service/emr/api_op_ListSteps.go +++ b/service/emr/api_op_ListSteps.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListSteps(ctx context.Context, params *ListStepsInput, optFns . addawsAwsjson11_serdeOpListStepsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_ModifyCluster.go b/service/emr/api_op_ModifyCluster.go index 17a44fd742f..b913391eeee 100644 --- a/service/emr/api_op_ModifyCluster.go +++ b/service/emr/api_op_ModifyCluster.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ModifyCluster(ctx context.Context, params *ModifyClusterInput, addawsAwsjson11_serdeOpModifyClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_ModifyInstanceFleet.go b/service/emr/api_op_ModifyInstanceFleet.go index 3003fa8fa3f..4e5b60d5e7f 100644 --- a/service/emr/api_op_ModifyInstanceFleet.go +++ b/service/emr/api_op_ModifyInstanceFleet.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ModifyInstanceFleet(ctx context.Context, params *ModifyInstance addawsAwsjson11_serdeOpModifyInstanceFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_ModifyInstanceGroups.go b/service/emr/api_op_ModifyInstanceGroups.go index bd19d7d66b6..a7c3dc2e4c1 100644 --- a/service/emr/api_op_ModifyInstanceGroups.go +++ b/service/emr/api_op_ModifyInstanceGroups.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ModifyInstanceGroups(ctx context.Context, params *ModifyInstanc addawsAwsjson11_serdeOpModifyInstanceGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_PutAutoScalingPolicy.go b/service/emr/api_op_PutAutoScalingPolicy.go index 1e689a82a86..0c59082840c 100644 --- a/service/emr/api_op_PutAutoScalingPolicy.go +++ b/service/emr/api_op_PutAutoScalingPolicy.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) PutAutoScalingPolicy(ctx context.Context, params *PutAutoScalin addawsAwsjson11_serdeOpPutAutoScalingPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_PutBlockPublicAccessConfiguration.go b/service/emr/api_op_PutBlockPublicAccessConfiguration.go index 1fb93af3230..1581a767f64 100644 --- a/service/emr/api_op_PutBlockPublicAccessConfiguration.go +++ b/service/emr/api_op_PutBlockPublicAccessConfiguration.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) PutBlockPublicAccessConfiguration(ctx context.Context, params * addawsAwsjson11_serdeOpPutBlockPublicAccessConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_PutManagedScalingPolicy.go b/service/emr/api_op_PutManagedScalingPolicy.go index 576b641241f..ed971b4d940 100644 --- a/service/emr/api_op_PutManagedScalingPolicy.go +++ b/service/emr/api_op_PutManagedScalingPolicy.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) PutManagedScalingPolicy(ctx context.Context, params *PutManaged addawsAwsjson11_serdeOpPutManagedScalingPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_RemoveAutoScalingPolicy.go b/service/emr/api_op_RemoveAutoScalingPolicy.go index e5930b918a7..ae43f692872 100644 --- a/service/emr/api_op_RemoveAutoScalingPolicy.go +++ b/service/emr/api_op_RemoveAutoScalingPolicy.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) RemoveAutoScalingPolicy(ctx context.Context, params *RemoveAuto addawsAwsjson11_serdeOpRemoveAutoScalingPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_RemoveManagedScalingPolicy.go b/service/emr/api_op_RemoveManagedScalingPolicy.go index f45275d2c9e..7c3950d83a2 100644 --- a/service/emr/api_op_RemoveManagedScalingPolicy.go +++ b/service/emr/api_op_RemoveManagedScalingPolicy.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RemoveManagedScalingPolicy(ctx context.Context, params *RemoveM addawsAwsjson11_serdeOpRemoveManagedScalingPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_RemoveTags.go b/service/emr/api_op_RemoveTags.go index 8446db792ea..750e8372499 100644 --- a/service/emr/api_op_RemoveTags.go +++ b/service/emr/api_op_RemoveTags.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) RemoveTags(ctx context.Context, params *RemoveTagsInput, optFns addawsAwsjson11_serdeOpRemoveTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_RunJobFlow.go b/service/emr/api_op_RunJobFlow.go index 5cbebb69822..d2dbef7a016 100644 --- a/service/emr/api_op_RunJobFlow.go +++ b/service/emr/api_op_RunJobFlow.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/emr/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) RunJobFlow(ctx context.Context, params *RunJobFlowInput, optFns addawsAwsjson11_serdeOpRunJobFlowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_SetTerminationProtection.go b/service/emr/api_op_SetTerminationProtection.go index 094df7458bc..8d537aa1cca 100644 --- a/service/emr/api_op_SetTerminationProtection.go +++ b/service/emr/api_op_SetTerminationProtection.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -36,9 +35,9 @@ func (c *Client) SetTerminationProtection(ctx context.Context, params *SetTermin addawsAwsjson11_serdeOpSetTerminationProtectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_SetVisibleToAllUsers.go b/service/emr/api_op_SetVisibleToAllUsers.go index 76060a2a866..016f8aff254 100644 --- a/service/emr/api_op_SetVisibleToAllUsers.go +++ b/service/emr/api_op_SetVisibleToAllUsers.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) SetVisibleToAllUsers(ctx context.Context, params *SetVisibleToA addawsAwsjson11_serdeOpSetVisibleToAllUsersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/api_op_TerminateJobFlows.go b/service/emr/api_op_TerminateJobFlows.go index 8dbefde653f..e76744c49ce 100644 --- a/service/emr/api_op_TerminateJobFlows.go +++ b/service/emr/api_op_TerminateJobFlows.go @@ -5,7 +5,6 @@ package emr import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) TerminateJobFlows(ctx context.Context, params *TerminateJobFlow addawsAwsjson11_serdeOpTerminateJobFlowsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/emr/endpoints.go b/service/emr/endpoints.go index 8b06a2517d8..5daff167a1a 100644 --- a/service/emr/endpoints.go +++ b/service/emr/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/eventbridge/api_client.go b/service/eventbridge/api_client.go index e5353054cf4..b8c5ecb7e01 100644 --- a/service/eventbridge/api_client.go +++ b/service/eventbridge/api_client.go @@ -97,30 +97,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -186,6 +162,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/eventbridge/api_op_ActivateEventSource.go b/service/eventbridge/api_op_ActivateEventSource.go index 7c5f3ffedf2..730d06b4f77 100644 --- a/service/eventbridge/api_op_ActivateEventSource.go +++ b/service/eventbridge/api_op_ActivateEventSource.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ActivateEventSource(ctx context.Context, params *ActivateEventS addawsAwsjson11_serdeOpActivateEventSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_CreateEventBus.go b/service/eventbridge/api_op_CreateEventBus.go index c180dbc3d1f..b819f27d475 100644 --- a/service/eventbridge/api_op_CreateEventBus.go +++ b/service/eventbridge/api_op_CreateEventBus.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateEventBus(ctx context.Context, params *CreateEventBusInput addawsAwsjson11_serdeOpCreateEventBusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_CreatePartnerEventSource.go b/service/eventbridge/api_op_CreatePartnerEventSource.go index fd383cdd312..3d28ca5282b 100644 --- a/service/eventbridge/api_op_CreatePartnerEventSource.go +++ b/service/eventbridge/api_op_CreatePartnerEventSource.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -37,9 +36,9 @@ func (c *Client) CreatePartnerEventSource(ctx context.Context, params *CreatePar addawsAwsjson11_serdeOpCreatePartnerEventSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_DeactivateEventSource.go b/service/eventbridge/api_op_DeactivateEventSource.go index 730a232bb88..fef75503f66 100644 --- a/service/eventbridge/api_op_DeactivateEventSource.go +++ b/service/eventbridge/api_op_DeactivateEventSource.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeactivateEventSource(ctx context.Context, params *DeactivateEv addawsAwsjson11_serdeOpDeactivateEventSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_DeleteEventBus.go b/service/eventbridge/api_op_DeleteEventBus.go index e6e561ee9b0..858efa683cb 100644 --- a/service/eventbridge/api_op_DeleteEventBus.go +++ b/service/eventbridge/api_op_DeleteEventBus.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteEventBus(ctx context.Context, params *DeleteEventBusInput addawsAwsjson11_serdeOpDeleteEventBusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_DeletePartnerEventSource.go b/service/eventbridge/api_op_DeletePartnerEventSource.go index 5ce5699556e..bce024981b8 100644 --- a/service/eventbridge/api_op_DeletePartnerEventSource.go +++ b/service/eventbridge/api_op_DeletePartnerEventSource.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeletePartnerEventSource(ctx context.Context, params *DeletePar addawsAwsjson11_serdeOpDeletePartnerEventSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_DeleteRule.go b/service/eventbridge/api_op_DeleteRule.go index 36f0db6a22d..df1685309a6 100644 --- a/service/eventbridge/api_op_DeleteRule.go +++ b/service/eventbridge/api_op_DeleteRule.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DeleteRule(ctx context.Context, params *DeleteRuleInput, optFns addawsAwsjson11_serdeOpDeleteRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_DescribeEventBus.go b/service/eventbridge/api_op_DescribeEventBus.go index e6ad3097303..c92a586c93f 100644 --- a/service/eventbridge/api_op_DescribeEventBus.go +++ b/service/eventbridge/api_op_DescribeEventBus.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DescribeEventBus(ctx context.Context, params *DescribeEventBusI addawsAwsjson11_serdeOpDescribeEventBusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_DescribeEventSource.go b/service/eventbridge/api_op_DescribeEventSource.go index b8f2e4b3f10..78a7ba17c7c 100644 --- a/service/eventbridge/api_op_DescribeEventSource.go +++ b/service/eventbridge/api_op_DescribeEventSource.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeEventSource(ctx context.Context, params *DescribeEventS addawsAwsjson11_serdeOpDescribeEventSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_DescribePartnerEventSource.go b/service/eventbridge/api_op_DescribePartnerEventSource.go index 2785bf18c06..b4439c54817 100644 --- a/service/eventbridge/api_op_DescribePartnerEventSource.go +++ b/service/eventbridge/api_op_DescribePartnerEventSource.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DescribePartnerEventSource(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribePartnerEventSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_DescribeRule.go b/service/eventbridge/api_op_DescribeRule.go index cb292c52e1c..1d0de521bb6 100644 --- a/service/eventbridge/api_op_DescribeRule.go +++ b/service/eventbridge/api_op_DescribeRule.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeRule(ctx context.Context, params *DescribeRuleInput, op addawsAwsjson11_serdeOpDescribeRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_DisableRule.go b/service/eventbridge/api_op_DisableRule.go index 054df47ada6..6654a06c447 100644 --- a/service/eventbridge/api_op_DisableRule.go +++ b/service/eventbridge/api_op_DisableRule.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DisableRule(ctx context.Context, params *DisableRuleInput, optF addawsAwsjson11_serdeOpDisableRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_EnableRule.go b/service/eventbridge/api_op_EnableRule.go index 3fb18024749..9597f72f94e 100644 --- a/service/eventbridge/api_op_EnableRule.go +++ b/service/eventbridge/api_op_EnableRule.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) EnableRule(ctx context.Context, params *EnableRuleInput, optFns addawsAwsjson11_serdeOpEnableRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_ListEventBuses.go b/service/eventbridge/api_op_ListEventBuses.go index 905e7c7c437..7ac1995ba97 100644 --- a/service/eventbridge/api_op_ListEventBuses.go +++ b/service/eventbridge/api_op_ListEventBuses.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListEventBuses(ctx context.Context, params *ListEventBusesInput addawsAwsjson11_serdeOpListEventBusesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_ListEventSources.go b/service/eventbridge/api_op_ListEventSources.go index a8ce5936ffc..74cae25ae0a 100644 --- a/service/eventbridge/api_op_ListEventSources.go +++ b/service/eventbridge/api_op_ListEventSources.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListEventSources(ctx context.Context, params *ListEventSourcesI addawsAwsjson11_serdeOpListEventSourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_ListPartnerEventSourceAccounts.go b/service/eventbridge/api_op_ListPartnerEventSourceAccounts.go index 68075d2b3d3..85e23df724f 100644 --- a/service/eventbridge/api_op_ListPartnerEventSourceAccounts.go +++ b/service/eventbridge/api_op_ListPartnerEventSourceAccounts.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListPartnerEventSourceAccounts(ctx context.Context, params *Lis addawsAwsjson11_serdeOpListPartnerEventSourceAccountsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_ListPartnerEventSources.go b/service/eventbridge/api_op_ListPartnerEventSources.go index c8a8281aaf6..a2a22eba973 100644 --- a/service/eventbridge/api_op_ListPartnerEventSources.go +++ b/service/eventbridge/api_op_ListPartnerEventSources.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListPartnerEventSources(ctx context.Context, params *ListPartne addawsAwsjson11_serdeOpListPartnerEventSourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_ListRuleNamesByTarget.go b/service/eventbridge/api_op_ListRuleNamesByTarget.go index 52479e94b9d..1b0f7629c67 100644 --- a/service/eventbridge/api_op_ListRuleNamesByTarget.go +++ b/service/eventbridge/api_op_ListRuleNamesByTarget.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ListRuleNamesByTarget(ctx context.Context, params *ListRuleName addawsAwsjson11_serdeOpListRuleNamesByTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_ListRules.go b/service/eventbridge/api_op_ListRules.go index 69ee8c510df..c336c58a530 100644 --- a/service/eventbridge/api_op_ListRules.go +++ b/service/eventbridge/api_op_ListRules.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListRules(ctx context.Context, params *ListRulesInput, optFns . addawsAwsjson11_serdeOpListRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_ListTagsForResource.go b/service/eventbridge/api_op_ListTagsForResource.go index 61987725d49..694eb9aa1ff 100644 --- a/service/eventbridge/api_op_ListTagsForResource.go +++ b/service/eventbridge/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_ListTargetsByRule.go b/service/eventbridge/api_op_ListTargetsByRule.go index 21a3510a543..56ff1f4f524 100644 --- a/service/eventbridge/api_op_ListTargetsByRule.go +++ b/service/eventbridge/api_op_ListTargetsByRule.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTargetsByRule(ctx context.Context, params *ListTargetsByRul addawsAwsjson11_serdeOpListTargetsByRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_PutEvents.go b/service/eventbridge/api_op_PutEvents.go index 9ec4fc8c41d..4c22d7bc720 100644 --- a/service/eventbridge/api_op_PutEvents.go +++ b/service/eventbridge/api_op_PutEvents.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutEvents(ctx context.Context, params *PutEventsInput, optFns . addawsAwsjson11_serdeOpPutEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_PutPartnerEvents.go b/service/eventbridge/api_op_PutPartnerEvents.go index 02922af3cf3..d56861f8105 100644 --- a/service/eventbridge/api_op_PutPartnerEvents.go +++ b/service/eventbridge/api_op_PutPartnerEvents.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutPartnerEvents(ctx context.Context, params *PutPartnerEventsI addawsAwsjson11_serdeOpPutPartnerEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_PutPermission.go b/service/eventbridge/api_op_PutPermission.go index a9921837f39..75fad5dc836 100644 --- a/service/eventbridge/api_op_PutPermission.go +++ b/service/eventbridge/api_op_PutPermission.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) PutPermission(ctx context.Context, params *PutPermissionInput, addawsAwsjson11_serdeOpPutPermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_PutRule.go b/service/eventbridge/api_op_PutRule.go index de92f5b0220..7350968dd17 100644 --- a/service/eventbridge/api_op_PutRule.go +++ b/service/eventbridge/api_op_PutRule.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" smithy "github.com/awslabs/smithy-go" @@ -65,9 +64,9 @@ func (c *Client) PutRule(ctx context.Context, params *PutRuleInput, optFns ...fu addawsAwsjson11_serdeOpPutRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_PutTargets.go b/service/eventbridge/api_op_PutTargets.go index 0fae8639aee..d2ad4ad85fd 100644 --- a/service/eventbridge/api_op_PutTargets.go +++ b/service/eventbridge/api_op_PutTargets.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" smithy "github.com/awslabs/smithy-go" @@ -94,9 +93,9 @@ func (c *Client) PutTargets(ctx context.Context, params *PutTargetsInput, optFns addawsAwsjson11_serdeOpPutTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_RemovePermission.go b/service/eventbridge/api_op_RemovePermission.go index e1177cb578e..569f2e14738 100644 --- a/service/eventbridge/api_op_RemovePermission.go +++ b/service/eventbridge/api_op_RemovePermission.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) RemovePermission(ctx context.Context, params *RemovePermissionI addawsAwsjson11_serdeOpRemovePermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_RemoveTargets.go b/service/eventbridge/api_op_RemoveTargets.go index a0a455a62d1..b0d5df163c0 100644 --- a/service/eventbridge/api_op_RemoveTargets.go +++ b/service/eventbridge/api_op_RemoveTargets.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) RemoveTargets(ctx context.Context, params *RemoveTargetsInput, addawsAwsjson11_serdeOpRemoveTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_TagResource.go b/service/eventbridge/api_op_TagResource.go index 4be0fe1fd01..19a05d9717f 100644 --- a/service/eventbridge/api_op_TagResource.go +++ b/service/eventbridge/api_op_TagResource.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_TestEventPattern.go b/service/eventbridge/api_op_TestEventPattern.go index 2f202399e8c..6fd3eeda4c2 100644 --- a/service/eventbridge/api_op_TestEventPattern.go +++ b/service/eventbridge/api_op_TestEventPattern.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) TestEventPattern(ctx context.Context, params *TestEventPatternI addawsAwsjson11_serdeOpTestEventPatternMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/api_op_UntagResource.go b/service/eventbridge/api_op_UntagResource.go index 153c6360e33..8c275247d2f 100644 --- a/service/eventbridge/api_op_UntagResource.go +++ b/service/eventbridge/api_op_UntagResource.go @@ -5,7 +5,6 @@ package eventbridge import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/eventbridge/endpoints.go b/service/eventbridge/endpoints.go index 8c9ff892e22..f1a6020239e 100644 --- a/service/eventbridge/endpoints.go +++ b/service/eventbridge/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/firehose/api_client.go b/service/firehose/api_client.go index b4a5b6af4a3..41839856ade 100644 --- a/service/firehose/api_client.go +++ b/service/firehose/api_client.go @@ -80,30 +80,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -169,6 +145,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/firehose/api_op_CreateDeliveryStream.go b/service/firehose/api_op_CreateDeliveryStream.go index 77be9961573..15e5b42c3f9 100644 --- a/service/firehose/api_op_CreateDeliveryStream.go +++ b/service/firehose/api_op_CreateDeliveryStream.go @@ -5,7 +5,6 @@ package firehose import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/firehose/types" smithy "github.com/awslabs/smithy-go" @@ -83,9 +82,9 @@ func (c *Client) CreateDeliveryStream(ctx context.Context, params *CreateDeliver addawsAwsjson11_serdeOpCreateDeliveryStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/firehose/api_op_DeleteDeliveryStream.go b/service/firehose/api_op_DeleteDeliveryStream.go index 981fa7d92a8..25ac3a52ac2 100644 --- a/service/firehose/api_op_DeleteDeliveryStream.go +++ b/service/firehose/api_op_DeleteDeliveryStream.go @@ -5,7 +5,6 @@ package firehose import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) DeleteDeliveryStream(ctx context.Context, params *DeleteDeliver addawsAwsjson11_serdeOpDeleteDeliveryStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/firehose/api_op_DescribeDeliveryStream.go b/service/firehose/api_op_DescribeDeliveryStream.go index de5c30ffc0a..4fa280ee850 100644 --- a/service/firehose/api_op_DescribeDeliveryStream.go +++ b/service/firehose/api_op_DescribeDeliveryStream.go @@ -5,7 +5,6 @@ package firehose import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/firehose/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DescribeDeliveryStream(ctx context.Context, params *DescribeDel addawsAwsjson11_serdeOpDescribeDeliveryStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/firehose/api_op_ListDeliveryStreams.go b/service/firehose/api_op_ListDeliveryStreams.go index f3b2c3be998..694a0f8dea3 100644 --- a/service/firehose/api_op_ListDeliveryStreams.go +++ b/service/firehose/api_op_ListDeliveryStreams.go @@ -5,7 +5,6 @@ package firehose import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/firehose/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListDeliveryStreams(ctx context.Context, params *ListDeliverySt addawsAwsjson11_serdeOpListDeliveryStreamsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/firehose/api_op_ListTagsForDeliveryStream.go b/service/firehose/api_op_ListTagsForDeliveryStream.go index c38d9ce008c..42976e5ae3c 100644 --- a/service/firehose/api_op_ListTagsForDeliveryStream.go +++ b/service/firehose/api_op_ListTagsForDeliveryStream.go @@ -5,7 +5,6 @@ package firehose import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/firehose/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTagsForDeliveryStream(ctx context.Context, params *ListTags addawsAwsjson11_serdeOpListTagsForDeliveryStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/firehose/api_op_PutRecord.go b/service/firehose/api_op_PutRecord.go index 792b6c4b447..ed65e3068d3 100644 --- a/service/firehose/api_op_PutRecord.go +++ b/service/firehose/api_op_PutRecord.go @@ -5,7 +5,6 @@ package firehose import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/firehose/types" smithy "github.com/awslabs/smithy-go" @@ -51,9 +50,9 @@ func (c *Client) PutRecord(ctx context.Context, params *PutRecordInput, optFns . addawsAwsjson11_serdeOpPutRecordMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/firehose/api_op_PutRecordBatch.go b/service/firehose/api_op_PutRecordBatch.go index 6075d30f059..97455106e9d 100644 --- a/service/firehose/api_op_PutRecordBatch.go +++ b/service/firehose/api_op_PutRecordBatch.go @@ -5,7 +5,6 @@ package firehose import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/firehose/types" smithy "github.com/awslabs/smithy-go" @@ -69,9 +68,9 @@ func (c *Client) PutRecordBatch(ctx context.Context, params *PutRecordBatchInput addawsAwsjson11_serdeOpPutRecordBatchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/firehose/api_op_StartDeliveryStreamEncryption.go b/service/firehose/api_op_StartDeliveryStreamEncryption.go index 1cf4ab7b3e6..f330262769e 100644 --- a/service/firehose/api_op_StartDeliveryStreamEncryption.go +++ b/service/firehose/api_op_StartDeliveryStreamEncryption.go @@ -5,7 +5,6 @@ package firehose import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/firehose/types" smithy "github.com/awslabs/smithy-go" @@ -55,9 +54,9 @@ func (c *Client) StartDeliveryStreamEncryption(ctx context.Context, params *Star addawsAwsjson11_serdeOpStartDeliveryStreamEncryptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/firehose/api_op_StopDeliveryStreamEncryption.go b/service/firehose/api_op_StopDeliveryStreamEncryption.go index 365fb882a9f..0cfada43ece 100644 --- a/service/firehose/api_op_StopDeliveryStreamEncryption.go +++ b/service/firehose/api_op_StopDeliveryStreamEncryption.go @@ -5,7 +5,6 @@ package firehose import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -39,9 +38,9 @@ func (c *Client) StopDeliveryStreamEncryption(ctx context.Context, params *StopD addawsAwsjson11_serdeOpStopDeliveryStreamEncryptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/firehose/api_op_TagDeliveryStream.go b/service/firehose/api_op_TagDeliveryStream.go index 0267f6879de..42ab5eb5c9d 100644 --- a/service/firehose/api_op_TagDeliveryStream.go +++ b/service/firehose/api_op_TagDeliveryStream.go @@ -5,7 +5,6 @@ package firehose import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/firehose/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) TagDeliveryStream(ctx context.Context, params *TagDeliveryStrea addawsAwsjson11_serdeOpTagDeliveryStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/firehose/api_op_UntagDeliveryStream.go b/service/firehose/api_op_UntagDeliveryStream.go index 34ab4425ab0..9a1374d74f2 100644 --- a/service/firehose/api_op_UntagDeliveryStream.go +++ b/service/firehose/api_op_UntagDeliveryStream.go @@ -5,7 +5,6 @@ package firehose import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) UntagDeliveryStream(ctx context.Context, params *UntagDeliveryS addawsAwsjson11_serdeOpUntagDeliveryStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/firehose/api_op_UpdateDestination.go b/service/firehose/api_op_UpdateDestination.go index 5653155be4e..1cf134179d9 100644 --- a/service/firehose/api_op_UpdateDestination.go +++ b/service/firehose/api_op_UpdateDestination.go @@ -5,7 +5,6 @@ package firehose import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/firehose/types" smithy "github.com/awslabs/smithy-go" @@ -48,9 +47,9 @@ func (c *Client) UpdateDestination(ctx context.Context, params *UpdateDestinatio addawsAwsjson11_serdeOpUpdateDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/firehose/endpoints.go b/service/firehose/endpoints.go index e52ef95d373..a0ea20d339f 100644 --- a/service/firehose/endpoints.go +++ b/service/firehose/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/fms/api_client.go b/service/fms/api_client.go index a8032294837..2fe03c8d06d 100644 --- a/service/fms/api_client.go +++ b/service/fms/api_client.go @@ -81,30 +81,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -170,6 +146,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/fms/api_op_AssociateAdminAccount.go b/service/fms/api_op_AssociateAdminAccount.go index abbfce5f8de..eba81722d2f 100644 --- a/service/fms/api_op_AssociateAdminAccount.go +++ b/service/fms/api_op_AssociateAdminAccount.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) AssociateAdminAccount(ctx context.Context, params *AssociateAdm addawsAwsjson11_serdeOpAssociateAdminAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_DeleteAppsList.go b/service/fms/api_op_DeleteAppsList.go index 7cdc2b6c4cf..d780f79df05 100644 --- a/service/fms/api_op_DeleteAppsList.go +++ b/service/fms/api_op_DeleteAppsList.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteAppsList(ctx context.Context, params *DeleteAppsListInput addawsAwsjson11_serdeOpDeleteAppsListMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_DeleteNotificationChannel.go b/service/fms/api_op_DeleteNotificationChannel.go index 94b8cc9f31f..60fc89d9f08 100644 --- a/service/fms/api_op_DeleteNotificationChannel.go +++ b/service/fms/api_op_DeleteNotificationChannel.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteNotificationChannel(ctx context.Context, params *DeleteNo addawsAwsjson11_serdeOpDeleteNotificationChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_DeletePolicy.go b/service/fms/api_op_DeletePolicy.go index 1f9c52facf1..62ec1c1aca7 100644 --- a/service/fms/api_op_DeletePolicy.go +++ b/service/fms/api_op_DeletePolicy.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeletePolicy(ctx context.Context, params *DeletePolicyInput, op addawsAwsjson11_serdeOpDeletePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_DeleteProtocolsList.go b/service/fms/api_op_DeleteProtocolsList.go index e82d313d24f..a7083c6187d 100644 --- a/service/fms/api_op_DeleteProtocolsList.go +++ b/service/fms/api_op_DeleteProtocolsList.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteProtocolsList(ctx context.Context, params *DeleteProtocol addawsAwsjson11_serdeOpDeleteProtocolsListMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_DisassociateAdminAccount.go b/service/fms/api_op_DisassociateAdminAccount.go index 28a8d8b0c4b..e4c2618630a 100644 --- a/service/fms/api_op_DisassociateAdminAccount.go +++ b/service/fms/api_op_DisassociateAdminAccount.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DisassociateAdminAccount(ctx context.Context, params *Disassoci addawsAwsjson11_serdeOpDisassociateAdminAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_GetAdminAccount.go b/service/fms/api_op_GetAdminAccount.go index 875a0b39ea4..b28032da0f2 100644 --- a/service/fms/api_op_GetAdminAccount.go +++ b/service/fms/api_op_GetAdminAccount.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fms/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetAdminAccount(ctx context.Context, params *GetAdminAccountInp addawsAwsjson11_serdeOpGetAdminAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_GetAppsList.go b/service/fms/api_op_GetAppsList.go index 8bd05aba5aa..756318520b6 100644 --- a/service/fms/api_op_GetAppsList.go +++ b/service/fms/api_op_GetAppsList.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetAppsList(ctx context.Context, params *GetAppsListInput, optF addawsAwsjson11_serdeOpGetAppsListMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_GetComplianceDetail.go b/service/fms/api_op_GetComplianceDetail.go index a1a132bc1e8..2ecaa1f1491 100644 --- a/service/fms/api_op_GetComplianceDetail.go +++ b/service/fms/api_op_GetComplianceDetail.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fms/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetComplianceDetail(ctx context.Context, params *GetComplianceD addawsAwsjson11_serdeOpGetComplianceDetailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_GetNotificationChannel.go b/service/fms/api_op_GetNotificationChannel.go index 3f54a1a9390..6220a74b4a1 100644 --- a/service/fms/api_op_GetNotificationChannel.go +++ b/service/fms/api_op_GetNotificationChannel.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetNotificationChannel(ctx context.Context, params *GetNotifica addawsAwsjson11_serdeOpGetNotificationChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_GetPolicy.go b/service/fms/api_op_GetPolicy.go index 13eda010322..d17e8a0d611 100644 --- a/service/fms/api_op_GetPolicy.go +++ b/service/fms/api_op_GetPolicy.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetPolicy(ctx context.Context, params *GetPolicyInput, optFns . addawsAwsjson11_serdeOpGetPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_GetProtectionStatus.go b/service/fms/api_op_GetProtectionStatus.go index 9ec0cc66a23..87257bb9d99 100644 --- a/service/fms/api_op_GetProtectionStatus.go +++ b/service/fms/api_op_GetProtectionStatus.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fms/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetProtectionStatus(ctx context.Context, params *GetProtectionS addawsAwsjson11_serdeOpGetProtectionStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_GetProtocolsList.go b/service/fms/api_op_GetProtocolsList.go index 689c21c4644..7b590833e9e 100644 --- a/service/fms/api_op_GetProtocolsList.go +++ b/service/fms/api_op_GetProtocolsList.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetProtocolsList(ctx context.Context, params *GetProtocolsListI addawsAwsjson11_serdeOpGetProtocolsListMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_GetViolationDetails.go b/service/fms/api_op_GetViolationDetails.go index 326be77ecab..10092acd2c4 100644 --- a/service/fms/api_op_GetViolationDetails.go +++ b/service/fms/api_op_GetViolationDetails.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fms/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetViolationDetails(ctx context.Context, params *GetViolationDe addawsAwsjson11_serdeOpGetViolationDetailsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_ListAppsLists.go b/service/fms/api_op_ListAppsLists.go index 38deb383514..52fc207593c 100644 --- a/service/fms/api_op_ListAppsLists.go +++ b/service/fms/api_op_ListAppsLists.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListAppsLists(ctx context.Context, params *ListAppsListsInput, addawsAwsjson11_serdeOpListAppsListsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_ListComplianceStatus.go b/service/fms/api_op_ListComplianceStatus.go index a8abb18877e..72a61afec7b 100644 --- a/service/fms/api_op_ListComplianceStatus.go +++ b/service/fms/api_op_ListComplianceStatus.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fms/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListComplianceStatus(ctx context.Context, params *ListComplianc addawsAwsjson11_serdeOpListComplianceStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_ListMemberAccounts.go b/service/fms/api_op_ListMemberAccounts.go index ccce9bfb36e..4e01de86af6 100644 --- a/service/fms/api_op_ListMemberAccounts.go +++ b/service/fms/api_op_ListMemberAccounts.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ListMemberAccounts(ctx context.Context, params *ListMemberAccou addawsAwsjson11_serdeOpListMemberAccountsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_ListPolicies.go b/service/fms/api_op_ListPolicies.go index e50a8f5aed1..a003902f5f5 100644 --- a/service/fms/api_op_ListPolicies.go +++ b/service/fms/api_op_ListPolicies.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListPolicies(ctx context.Context, params *ListPoliciesInput, op addawsAwsjson11_serdeOpListPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_ListProtocolsLists.go b/service/fms/api_op_ListProtocolsLists.go index 0d3dbf4e6cd..6446c200c6e 100644 --- a/service/fms/api_op_ListProtocolsLists.go +++ b/service/fms/api_op_ListProtocolsLists.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListProtocolsLists(ctx context.Context, params *ListProtocolsLi addawsAwsjson11_serdeOpListProtocolsListsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_ListTagsForResource.go b/service/fms/api_op_ListTagsForResource.go index 6cf8b3882c0..531f319695a 100644 --- a/service/fms/api_op_ListTagsForResource.go +++ b/service/fms/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_PutAppsList.go b/service/fms/api_op_PutAppsList.go index 2779a425c27..68d7464a202 100644 --- a/service/fms/api_op_PutAppsList.go +++ b/service/fms/api_op_PutAppsList.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutAppsList(ctx context.Context, params *PutAppsListInput, optF addawsAwsjson11_serdeOpPutAppsListMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_PutNotificationChannel.go b/service/fms/api_op_PutNotificationChannel.go index 249d8a0408a..82f50e7aab3 100644 --- a/service/fms/api_op_PutNotificationChannel.go +++ b/service/fms/api_op_PutNotificationChannel.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) PutNotificationChannel(ctx context.Context, params *PutNotifica addawsAwsjson11_serdeOpPutNotificationChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_PutPolicy.go b/service/fms/api_op_PutPolicy.go index afd22bf7d9c..053602fc4fa 100644 --- a/service/fms/api_op_PutPolicy.go +++ b/service/fms/api_op_PutPolicy.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fms/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) PutPolicy(ctx context.Context, params *PutPolicyInput, optFns . addawsAwsjson11_serdeOpPutPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_PutProtocolsList.go b/service/fms/api_op_PutProtocolsList.go index 2c3aed7b6fc..6ab242eba9d 100644 --- a/service/fms/api_op_PutProtocolsList.go +++ b/service/fms/api_op_PutProtocolsList.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutProtocolsList(ctx context.Context, params *PutProtocolsListI addawsAwsjson11_serdeOpPutProtocolsListMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_TagResource.go b/service/fms/api_op_TagResource.go index 7fd47f04385..768f6df7326 100644 --- a/service/fms/api_op_TagResource.go +++ b/service/fms/api_op_TagResource.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/api_op_UntagResource.go b/service/fms/api_op_UntagResource.go index 8c47ef3cf0b..c6a2c4910ca 100644 --- a/service/fms/api_op_UntagResource.go +++ b/service/fms/api_op_UntagResource.go @@ -5,7 +5,6 @@ package fms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fms/endpoints.go b/service/fms/endpoints.go index 2d0d885549e..7cdae25af13 100644 --- a/service/fms/endpoints.go +++ b/service/fms/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/forecast/api_client.go b/service/forecast/api_client.go index a558503d892..97b4a1eec74 100644 --- a/service/forecast/api_client.go +++ b/service/forecast/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/forecast/api_op_CreateDataset.go b/service/forecast/api_op_CreateDataset.go index 4d1c8f00dbd..08eb8c96585 100644 --- a/service/forecast/api_op_CreateDataset.go +++ b/service/forecast/api_op_CreateDataset.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) CreateDataset(ctx context.Context, params *CreateDatasetInput, addawsAwsjson11_serdeOpCreateDatasetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_CreateDatasetGroup.go b/service/forecast/api_op_CreateDatasetGroup.go index 1d948aa6a3b..b63b8739950 100644 --- a/service/forecast/api_op_CreateDatasetGroup.go +++ b/service/forecast/api_op_CreateDatasetGroup.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateDatasetGroup(ctx context.Context, params *CreateDatasetGr addawsAwsjson11_serdeOpCreateDatasetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_CreateDatasetImportJob.go b/service/forecast/api_op_CreateDatasetImportJob.go index f466f8c1329..f092b18444b 100644 --- a/service/forecast/api_op_CreateDatasetImportJob.go +++ b/service/forecast/api_op_CreateDatasetImportJob.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) CreateDatasetImportJob(ctx context.Context, params *CreateDatas addawsAwsjson11_serdeOpCreateDatasetImportJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_CreateForecast.go b/service/forecast/api_op_CreateForecast.go index 949629e9f38..64c6c79f617 100644 --- a/service/forecast/api_op_CreateForecast.go +++ b/service/forecast/api_op_CreateForecast.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) CreateForecast(ctx context.Context, params *CreateForecastInput addawsAwsjson11_serdeOpCreateForecastMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_CreateForecastExportJob.go b/service/forecast/api_op_CreateForecastExportJob.go index a06da461313..be273027b44 100644 --- a/service/forecast/api_op_CreateForecastExportJob.go +++ b/service/forecast/api_op_CreateForecastExportJob.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) CreateForecastExportJob(ctx context.Context, params *CreateFore addawsAwsjson11_serdeOpCreateForecastExportJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_CreatePredictor.go b/service/forecast/api_op_CreatePredictor.go index 5b6eca3dcd7..bbc219c8374 100644 --- a/service/forecast/api_op_CreatePredictor.go +++ b/service/forecast/api_op_CreatePredictor.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -59,9 +58,9 @@ func (c *Client) CreatePredictor(ctx context.Context, params *CreatePredictorInp addawsAwsjson11_serdeOpCreatePredictorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_DeleteDataset.go b/service/forecast/api_op_DeleteDataset.go index d13a50d9c3f..f359928bafe 100644 --- a/service/forecast/api_op_DeleteDataset.go +++ b/service/forecast/api_op_DeleteDataset.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteDataset(ctx context.Context, params *DeleteDatasetInput, addawsAwsjson11_serdeOpDeleteDatasetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_DeleteDatasetGroup.go b/service/forecast/api_op_DeleteDatasetGroup.go index 1a81c557760..571ff128684 100644 --- a/service/forecast/api_op_DeleteDatasetGroup.go +++ b/service/forecast/api_op_DeleteDatasetGroup.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteDatasetGroup(ctx context.Context, params *DeleteDatasetGr addawsAwsjson11_serdeOpDeleteDatasetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_DeleteDatasetImportJob.go b/service/forecast/api_op_DeleteDatasetImportJob.go index c0f36bee66e..9449f814066 100644 --- a/service/forecast/api_op_DeleteDatasetImportJob.go +++ b/service/forecast/api_op_DeleteDatasetImportJob.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteDatasetImportJob(ctx context.Context, params *DeleteDatas addawsAwsjson11_serdeOpDeleteDatasetImportJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_DeleteForecast.go b/service/forecast/api_op_DeleteForecast.go index 58064660229..441d690667f 100644 --- a/service/forecast/api_op_DeleteForecast.go +++ b/service/forecast/api_op_DeleteForecast.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteForecast(ctx context.Context, params *DeleteForecastInput addawsAwsjson11_serdeOpDeleteForecastMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_DeleteForecastExportJob.go b/service/forecast/api_op_DeleteForecastExportJob.go index d88d6a38745..2e386e193ba 100644 --- a/service/forecast/api_op_DeleteForecastExportJob.go +++ b/service/forecast/api_op_DeleteForecastExportJob.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteForecastExportJob(ctx context.Context, params *DeleteFore addawsAwsjson11_serdeOpDeleteForecastExportJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_DeletePredictor.go b/service/forecast/api_op_DeletePredictor.go index a8fc806da26..bf3c78cc615 100644 --- a/service/forecast/api_op_DeletePredictor.go +++ b/service/forecast/api_op_DeletePredictor.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeletePredictor(ctx context.Context, params *DeletePredictorInp addawsAwsjson11_serdeOpDeletePredictorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_DescribeDataset.go b/service/forecast/api_op_DescribeDataset.go index 15740a29869..1846735df53 100644 --- a/service/forecast/api_op_DescribeDataset.go +++ b/service/forecast/api_op_DescribeDataset.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) DescribeDataset(ctx context.Context, params *DescribeDatasetInp addawsAwsjson11_serdeOpDescribeDatasetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_DescribeDatasetGroup.go b/service/forecast/api_op_DescribeDatasetGroup.go index d14d5fef4fd..0d21d8a55b5 100644 --- a/service/forecast/api_op_DescribeDatasetGroup.go +++ b/service/forecast/api_op_DescribeDatasetGroup.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) DescribeDatasetGroup(ctx context.Context, params *DescribeDatas addawsAwsjson11_serdeOpDescribeDatasetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_DescribeDatasetImportJob.go b/service/forecast/api_op_DescribeDatasetImportJob.go index 5f9d5278c3a..bc412b343f0 100644 --- a/service/forecast/api_op_DescribeDatasetImportJob.go +++ b/service/forecast/api_op_DescribeDatasetImportJob.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) DescribeDatasetImportJob(ctx context.Context, params *DescribeD addawsAwsjson11_serdeOpDescribeDatasetImportJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_DescribeForecast.go b/service/forecast/api_op_DescribeForecast.go index 1fe6bfe8b52..8a6f038ef2c 100644 --- a/service/forecast/api_op_DescribeForecast.go +++ b/service/forecast/api_op_DescribeForecast.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -37,9 +36,9 @@ func (c *Client) DescribeForecast(ctx context.Context, params *DescribeForecastI addawsAwsjson11_serdeOpDescribeForecastMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_DescribeForecastExportJob.go b/service/forecast/api_op_DescribeForecastExportJob.go index 8d7410e011a..60af4c47fa9 100644 --- a/service/forecast/api_op_DescribeForecastExportJob.go +++ b/service/forecast/api_op_DescribeForecastExportJob.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) DescribeForecastExportJob(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeForecastExportJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_DescribePredictor.go b/service/forecast/api_op_DescribePredictor.go index fe006ad04e4..e39babd102d 100644 --- a/service/forecast/api_op_DescribePredictor.go +++ b/service/forecast/api_op_DescribePredictor.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) DescribePredictor(ctx context.Context, params *DescribePredicto addawsAwsjson11_serdeOpDescribePredictorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_GetAccuracyMetrics.go b/service/forecast/api_op_GetAccuracyMetrics.go index 287ea949929..43634abd816 100644 --- a/service/forecast/api_op_GetAccuracyMetrics.go +++ b/service/forecast/api_op_GetAccuracyMetrics.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) GetAccuracyMetrics(ctx context.Context, params *GetAccuracyMetr addawsAwsjson11_serdeOpGetAccuracyMetricsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_ListDatasetGroups.go b/service/forecast/api_op_ListDatasetGroups.go index 4b35ab00796..a7948cfde61 100644 --- a/service/forecast/api_op_ListDatasetGroups.go +++ b/service/forecast/api_op_ListDatasetGroups.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListDatasetGroups(ctx context.Context, params *ListDatasetGroup addawsAwsjson11_serdeOpListDatasetGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_ListDatasetImportJobs.go b/service/forecast/api_op_ListDatasetImportJobs.go index 144ed4f7067..a5ecc672953 100644 --- a/service/forecast/api_op_ListDatasetImportJobs.go +++ b/service/forecast/api_op_ListDatasetImportJobs.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListDatasetImportJobs(ctx context.Context, params *ListDatasetI addawsAwsjson11_serdeOpListDatasetImportJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_ListDatasets.go b/service/forecast/api_op_ListDatasets.go index d12d4eeef62..b98ec66ff51 100644 --- a/service/forecast/api_op_ListDatasets.go +++ b/service/forecast/api_op_ListDatasets.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListDatasets(ctx context.Context, params *ListDatasetsInput, op addawsAwsjson11_serdeOpListDatasetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_ListForecastExportJobs.go b/service/forecast/api_op_ListForecastExportJobs.go index 0a43e7c1891..b8a21ef7824 100644 --- a/service/forecast/api_op_ListForecastExportJobs.go +++ b/service/forecast/api_op_ListForecastExportJobs.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListForecastExportJobs(ctx context.Context, params *ListForecas addawsAwsjson11_serdeOpListForecastExportJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_ListForecasts.go b/service/forecast/api_op_ListForecasts.go index f0fecc707e7..53e37529a8f 100644 --- a/service/forecast/api_op_ListForecasts.go +++ b/service/forecast/api_op_ListForecasts.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListForecasts(ctx context.Context, params *ListForecastsInput, addawsAwsjson11_serdeOpListForecastsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_ListPredictors.go b/service/forecast/api_op_ListPredictors.go index 81b4bf5ba99..2c639fa385f 100644 --- a/service/forecast/api_op_ListPredictors.go +++ b/service/forecast/api_op_ListPredictors.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListPredictors(ctx context.Context, params *ListPredictorsInput addawsAwsjson11_serdeOpListPredictorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_ListTagsForResource.go b/service/forecast/api_op_ListTagsForResource.go index a3eab9e2480..d9cc3cff609 100644 --- a/service/forecast/api_op_ListTagsForResource.go +++ b/service/forecast/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_TagResource.go b/service/forecast/api_op_TagResource.go index 7d7f0811439..399231d81df 100644 --- a/service/forecast/api_op_TagResource.go +++ b/service/forecast/api_op_TagResource.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecast/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_UntagResource.go b/service/forecast/api_op_UntagResource.go index c25e106c7ea..b04133c281e 100644 --- a/service/forecast/api_op_UntagResource.go +++ b/service/forecast/api_op_UntagResource.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/api_op_UpdateDatasetGroup.go b/service/forecast/api_op_UpdateDatasetGroup.go index 8703d549c43..ec5e2d8ef35 100644 --- a/service/forecast/api_op_UpdateDatasetGroup.go +++ b/service/forecast/api_op_UpdateDatasetGroup.go @@ -5,7 +5,6 @@ package forecast import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) UpdateDatasetGroup(ctx context.Context, params *UpdateDatasetGr addawsAwsjson11_serdeOpUpdateDatasetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecast/endpoints.go b/service/forecast/endpoints.go index 51828c10633..ea4632b9b14 100644 --- a/service/forecast/endpoints.go +++ b/service/forecast/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/forecastquery/api_client.go b/service/forecastquery/api_client.go index e361c8b71d8..adbd4c96cd7 100644 --- a/service/forecastquery/api_client.go +++ b/service/forecastquery/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/forecastquery/api_op_QueryForecast.go b/service/forecastquery/api_op_QueryForecast.go index fe1c05c2d48..60f692d1d15 100644 --- a/service/forecastquery/api_op_QueryForecast.go +++ b/service/forecastquery/api_op_QueryForecast.go @@ -5,7 +5,6 @@ package forecastquery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/forecastquery/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) QueryForecast(ctx context.Context, params *QueryForecastInput, addawsAwsjson11_serdeOpQueryForecastMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/forecastquery/endpoints.go b/service/forecastquery/endpoints.go index e92331f74a0..8ad696aabf1 100644 --- a/service/forecastquery/endpoints.go +++ b/service/forecastquery/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/frauddetector/api_client.go b/service/frauddetector/api_client.go index 2d0605ca386..32af26b616f 100644 --- a/service/frauddetector/api_client.go +++ b/service/frauddetector/api_client.go @@ -81,30 +81,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -170,6 +146,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/frauddetector/api_op_BatchCreateVariable.go b/service/frauddetector/api_op_BatchCreateVariable.go index 473aeffe6a7..625748198a9 100644 --- a/service/frauddetector/api_op_BatchCreateVariable.go +++ b/service/frauddetector/api_op_BatchCreateVariable.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchCreateVariable(ctx context.Context, params *BatchCreateVar addawsAwsjson11_serdeOpBatchCreateVariableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_BatchGetVariable.go b/service/frauddetector/api_op_BatchGetVariable.go index da00e9e7875..ab353c1baca 100644 --- a/service/frauddetector/api_op_BatchGetVariable.go +++ b/service/frauddetector/api_op_BatchGetVariable.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchGetVariable(ctx context.Context, params *BatchGetVariableI addawsAwsjson11_serdeOpBatchGetVariableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_CreateDetectorVersion.go b/service/frauddetector/api_op_CreateDetectorVersion.go index b163f534fd1..885699b8c12 100644 --- a/service/frauddetector/api_op_CreateDetectorVersion.go +++ b/service/frauddetector/api_op_CreateDetectorVersion.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDetectorVersion(ctx context.Context, params *CreateDetect addawsAwsjson11_serdeOpCreateDetectorVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_CreateModel.go b/service/frauddetector/api_op_CreateModel.go index e94562fffd4..bd82ef180a7 100644 --- a/service/frauddetector/api_op_CreateModel.go +++ b/service/frauddetector/api_op_CreateModel.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateModel(ctx context.Context, params *CreateModelInput, optF addawsAwsjson11_serdeOpCreateModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_CreateModelVersion.go b/service/frauddetector/api_op_CreateModelVersion.go index c3acc9f922b..a15c40f8504 100644 --- a/service/frauddetector/api_op_CreateModelVersion.go +++ b/service/frauddetector/api_op_CreateModelVersion.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateModelVersion(ctx context.Context, params *CreateModelVers addawsAwsjson11_serdeOpCreateModelVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_CreateRule.go b/service/frauddetector/api_op_CreateRule.go index 2b8cd208620..90405c2c772 100644 --- a/service/frauddetector/api_op_CreateRule.go +++ b/service/frauddetector/api_op_CreateRule.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateRule(ctx context.Context, params *CreateRuleInput, optFns addawsAwsjson11_serdeOpCreateRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_CreateVariable.go b/service/frauddetector/api_op_CreateVariable.go index 895244461c3..8f513c55e82 100644 --- a/service/frauddetector/api_op_CreateVariable.go +++ b/service/frauddetector/api_op_CreateVariable.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateVariable(ctx context.Context, params *CreateVariableInput addawsAwsjson11_serdeOpCreateVariableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_DeleteDetector.go b/service/frauddetector/api_op_DeleteDetector.go index 3f1857396dc..0ca741ae1c1 100644 --- a/service/frauddetector/api_op_DeleteDetector.go +++ b/service/frauddetector/api_op_DeleteDetector.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDetector(ctx context.Context, params *DeleteDetectorInput addawsAwsjson11_serdeOpDeleteDetectorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_DeleteDetectorVersion.go b/service/frauddetector/api_op_DeleteDetectorVersion.go index 3eaaa384695..6fcc77e74ee 100644 --- a/service/frauddetector/api_op_DeleteDetectorVersion.go +++ b/service/frauddetector/api_op_DeleteDetectorVersion.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDetectorVersion(ctx context.Context, params *DeleteDetect addawsAwsjson11_serdeOpDeleteDetectorVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_DeleteEvent.go b/service/frauddetector/api_op_DeleteEvent.go index 0b9a6e5c724..f7c7091ee73 100644 --- a/service/frauddetector/api_op_DeleteEvent.go +++ b/service/frauddetector/api_op_DeleteEvent.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteEvent(ctx context.Context, params *DeleteEventInput, optF addawsAwsjson11_serdeOpDeleteEventMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_DeleteRule.go b/service/frauddetector/api_op_DeleteRule.go index e17417e8079..b56ebff1a44 100644 --- a/service/frauddetector/api_op_DeleteRule.go +++ b/service/frauddetector/api_op_DeleteRule.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteRule(ctx context.Context, params *DeleteRuleInput, optFns addawsAwsjson11_serdeOpDeleteRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_DescribeDetector.go b/service/frauddetector/api_op_DescribeDetector.go index fdba90f64f6..fa12df24c23 100644 --- a/service/frauddetector/api_op_DescribeDetector.go +++ b/service/frauddetector/api_op_DescribeDetector.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDetector(ctx context.Context, params *DescribeDetectorI addawsAwsjson11_serdeOpDescribeDetectorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_DescribeModelVersions.go b/service/frauddetector/api_op_DescribeModelVersions.go index 6b2225aca6a..22d284351dc 100644 --- a/service/frauddetector/api_op_DescribeModelVersions.go +++ b/service/frauddetector/api_op_DescribeModelVersions.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeModelVersions(ctx context.Context, params *DescribeMode addawsAwsjson11_serdeOpDescribeModelVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_GetDetectorVersion.go b/service/frauddetector/api_op_GetDetectorVersion.go index 8f774aec0da..2d56ac15ef6 100644 --- a/service/frauddetector/api_op_GetDetectorVersion.go +++ b/service/frauddetector/api_op_GetDetectorVersion.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDetectorVersion(ctx context.Context, params *GetDetectorVers addawsAwsjson11_serdeOpGetDetectorVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_GetDetectors.go b/service/frauddetector/api_op_GetDetectors.go index 91aabd42e35..80da1607aca 100644 --- a/service/frauddetector/api_op_GetDetectors.go +++ b/service/frauddetector/api_op_GetDetectors.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetDetectors(ctx context.Context, params *GetDetectorsInput, op addawsAwsjson11_serdeOpGetDetectorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_GetEntityTypes.go b/service/frauddetector/api_op_GetEntityTypes.go index 3790a2869ac..0df332a829d 100644 --- a/service/frauddetector/api_op_GetEntityTypes.go +++ b/service/frauddetector/api_op_GetEntityTypes.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetEntityTypes(ctx context.Context, params *GetEntityTypesInput addawsAwsjson11_serdeOpGetEntityTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_GetEventPrediction.go b/service/frauddetector/api_op_GetEventPrediction.go index cf9c8a9cef4..dd85f63287a 100644 --- a/service/frauddetector/api_op_GetEventPrediction.go +++ b/service/frauddetector/api_op_GetEventPrediction.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetEventPrediction(ctx context.Context, params *GetEventPredict addawsAwsjson11_serdeOpGetEventPredictionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_GetEventTypes.go b/service/frauddetector/api_op_GetEventTypes.go index 18ce2a5a759..119c0623df6 100644 --- a/service/frauddetector/api_op_GetEventTypes.go +++ b/service/frauddetector/api_op_GetEventTypes.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetEventTypes(ctx context.Context, params *GetEventTypesInput, addawsAwsjson11_serdeOpGetEventTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_GetExternalModels.go b/service/frauddetector/api_op_GetExternalModels.go index cdc7129e17e..95da33b559e 100644 --- a/service/frauddetector/api_op_GetExternalModels.go +++ b/service/frauddetector/api_op_GetExternalModels.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetExternalModels(ctx context.Context, params *GetExternalModel addawsAwsjson11_serdeOpGetExternalModelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_GetKMSEncryptionKey.go b/service/frauddetector/api_op_GetKMSEncryptionKey.go index b828ab8798f..786830cd57f 100644 --- a/service/frauddetector/api_op_GetKMSEncryptionKey.go +++ b/service/frauddetector/api_op_GetKMSEncryptionKey.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetKMSEncryptionKey(ctx context.Context, params *GetKMSEncrypti addawsAwsjson11_serdeOpGetKMSEncryptionKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_GetLabels.go b/service/frauddetector/api_op_GetLabels.go index 84a03a7c874..c32294ae027 100644 --- a/service/frauddetector/api_op_GetLabels.go +++ b/service/frauddetector/api_op_GetLabels.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetLabels(ctx context.Context, params *GetLabelsInput, optFns . addawsAwsjson11_serdeOpGetLabelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_GetModelVersion.go b/service/frauddetector/api_op_GetModelVersion.go index 979e5bcf6fd..0a1b1e69568 100644 --- a/service/frauddetector/api_op_GetModelVersion.go +++ b/service/frauddetector/api_op_GetModelVersion.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetModelVersion(ctx context.Context, params *GetModelVersionInp addawsAwsjson11_serdeOpGetModelVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_GetModels.go b/service/frauddetector/api_op_GetModels.go index d689a9fe483..2388c8fce4a 100644 --- a/service/frauddetector/api_op_GetModels.go +++ b/service/frauddetector/api_op_GetModels.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetModels(ctx context.Context, params *GetModelsInput, optFns . addawsAwsjson11_serdeOpGetModelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_GetOutcomes.go b/service/frauddetector/api_op_GetOutcomes.go index 3d81f54f8b3..6e6bf4d7d50 100644 --- a/service/frauddetector/api_op_GetOutcomes.go +++ b/service/frauddetector/api_op_GetOutcomes.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetOutcomes(ctx context.Context, params *GetOutcomesInput, optF addawsAwsjson11_serdeOpGetOutcomesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_GetRules.go b/service/frauddetector/api_op_GetRules.go index d1a51699748..359952b1e33 100644 --- a/service/frauddetector/api_op_GetRules.go +++ b/service/frauddetector/api_op_GetRules.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetRules(ctx context.Context, params *GetRulesInput, optFns ... addawsAwsjson11_serdeOpGetRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_GetVariables.go b/service/frauddetector/api_op_GetVariables.go index 2b9fd37d36c..9c92da7e6db 100644 --- a/service/frauddetector/api_op_GetVariables.go +++ b/service/frauddetector/api_op_GetVariables.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetVariables(ctx context.Context, params *GetVariablesInput, op addawsAwsjson11_serdeOpGetVariablesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_ListTagsForResource.go b/service/frauddetector/api_op_ListTagsForResource.go index 1af4f99561c..2aaf0f0a94a 100644 --- a/service/frauddetector/api_op_ListTagsForResource.go +++ b/service/frauddetector/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_PutDetector.go b/service/frauddetector/api_op_PutDetector.go index f56e45a02b1..b1b7c354f53 100644 --- a/service/frauddetector/api_op_PutDetector.go +++ b/service/frauddetector/api_op_PutDetector.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutDetector(ctx context.Context, params *PutDetectorInput, optF addawsAwsjson11_serdeOpPutDetectorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_PutEntityType.go b/service/frauddetector/api_op_PutEntityType.go index 0a76f4a8b10..1c07dc6afbd 100644 --- a/service/frauddetector/api_op_PutEntityType.go +++ b/service/frauddetector/api_op_PutEntityType.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) PutEntityType(ctx context.Context, params *PutEntityTypeInput, addawsAwsjson11_serdeOpPutEntityTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_PutEventType.go b/service/frauddetector/api_op_PutEventType.go index a688141345d..e8253b0ad50 100644 --- a/service/frauddetector/api_op_PutEventType.go +++ b/service/frauddetector/api_op_PutEventType.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) PutEventType(ctx context.Context, params *PutEventTypeInput, op addawsAwsjson11_serdeOpPutEventTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_PutExternalModel.go b/service/frauddetector/api_op_PutExternalModel.go index 19c3bd54312..f2f837f0207 100644 --- a/service/frauddetector/api_op_PutExternalModel.go +++ b/service/frauddetector/api_op_PutExternalModel.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) PutExternalModel(ctx context.Context, params *PutExternalModelI addawsAwsjson11_serdeOpPutExternalModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_PutKMSEncryptionKey.go b/service/frauddetector/api_op_PutKMSEncryptionKey.go index a8464cb0794..44bf4e52033 100644 --- a/service/frauddetector/api_op_PutKMSEncryptionKey.go +++ b/service/frauddetector/api_op_PutKMSEncryptionKey.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) PutKMSEncryptionKey(ctx context.Context, params *PutKMSEncrypti addawsAwsjson11_serdeOpPutKMSEncryptionKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_PutLabel.go b/service/frauddetector/api_op_PutLabel.go index 7a9c816f8d6..5d7f4adb43d 100644 --- a/service/frauddetector/api_op_PutLabel.go +++ b/service/frauddetector/api_op_PutLabel.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) PutLabel(ctx context.Context, params *PutLabelInput, optFns ... addawsAwsjson11_serdeOpPutLabelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_PutOutcome.go b/service/frauddetector/api_op_PutOutcome.go index 979b444d6a2..1fa44c4b936 100644 --- a/service/frauddetector/api_op_PutOutcome.go +++ b/service/frauddetector/api_op_PutOutcome.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutOutcome(ctx context.Context, params *PutOutcomeInput, optFns addawsAwsjson11_serdeOpPutOutcomeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_TagResource.go b/service/frauddetector/api_op_TagResource.go index e9a31791285..c843907ee65 100644 --- a/service/frauddetector/api_op_TagResource.go +++ b/service/frauddetector/api_op_TagResource.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_UntagResource.go b/service/frauddetector/api_op_UntagResource.go index f5d8a41fdec..1a3a552538c 100644 --- a/service/frauddetector/api_op_UntagResource.go +++ b/service/frauddetector/api_op_UntagResource.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_UpdateDetectorVersion.go b/service/frauddetector/api_op_UpdateDetectorVersion.go index 00b2acc0a28..d0014e53297 100644 --- a/service/frauddetector/api_op_UpdateDetectorVersion.go +++ b/service/frauddetector/api_op_UpdateDetectorVersion.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateDetectorVersion(ctx context.Context, params *UpdateDetect addawsAwsjson11_serdeOpUpdateDetectorVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_UpdateDetectorVersionMetadata.go b/service/frauddetector/api_op_UpdateDetectorVersionMetadata.go index 50b8e36a949..62eed410e84 100644 --- a/service/frauddetector/api_op_UpdateDetectorVersionMetadata.go +++ b/service/frauddetector/api_op_UpdateDetectorVersionMetadata.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpdateDetectorVersionMetadata(ctx context.Context, params *Upda addawsAwsjson11_serdeOpUpdateDetectorVersionMetadataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_UpdateDetectorVersionStatus.go b/service/frauddetector/api_op_UpdateDetectorVersionStatus.go index 6d141452bb7..9222c3148dd 100644 --- a/service/frauddetector/api_op_UpdateDetectorVersionStatus.go +++ b/service/frauddetector/api_op_UpdateDetectorVersionStatus.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateDetectorVersionStatus(ctx context.Context, params *Update addawsAwsjson11_serdeOpUpdateDetectorVersionStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_UpdateModel.go b/service/frauddetector/api_op_UpdateModel.go index 63c762a2a3f..2f801bc10f9 100644 --- a/service/frauddetector/api_op_UpdateModel.go +++ b/service/frauddetector/api_op_UpdateModel.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateModel(ctx context.Context, params *UpdateModelInput, optF addawsAwsjson11_serdeOpUpdateModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_UpdateModelVersion.go b/service/frauddetector/api_op_UpdateModelVersion.go index ca699978450..fda8e969cef 100644 --- a/service/frauddetector/api_op_UpdateModelVersion.go +++ b/service/frauddetector/api_op_UpdateModelVersion.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateModelVersion(ctx context.Context, params *UpdateModelVers addawsAwsjson11_serdeOpUpdateModelVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_UpdateModelVersionStatus.go b/service/frauddetector/api_op_UpdateModelVersionStatus.go index b57a20b1e77..cfbb762d2b0 100644 --- a/service/frauddetector/api_op_UpdateModelVersionStatus.go +++ b/service/frauddetector/api_op_UpdateModelVersionStatus.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) UpdateModelVersionStatus(ctx context.Context, params *UpdateMod addawsAwsjson11_serdeOpUpdateModelVersionStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_UpdateRuleMetadata.go b/service/frauddetector/api_op_UpdateRuleMetadata.go index 2fa138409e3..6a31cb11b71 100644 --- a/service/frauddetector/api_op_UpdateRuleMetadata.go +++ b/service/frauddetector/api_op_UpdateRuleMetadata.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateRuleMetadata(ctx context.Context, params *UpdateRuleMetad addawsAwsjson11_serdeOpUpdateRuleMetadataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_UpdateRuleVersion.go b/service/frauddetector/api_op_UpdateRuleVersion.go index d4d2fa2fead..ab29db1f982 100644 --- a/service/frauddetector/api_op_UpdateRuleVersion.go +++ b/service/frauddetector/api_op_UpdateRuleVersion.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateRuleVersion(ctx context.Context, params *UpdateRuleVersio addawsAwsjson11_serdeOpUpdateRuleVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/api_op_UpdateVariable.go b/service/frauddetector/api_op_UpdateVariable.go index 14c8c7b6866..677ac497f9b 100644 --- a/service/frauddetector/api_op_UpdateVariable.go +++ b/service/frauddetector/api_op_UpdateVariable.go @@ -5,7 +5,6 @@ package frauddetector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateVariable(ctx context.Context, params *UpdateVariableInput addawsAwsjson11_serdeOpUpdateVariableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/frauddetector/endpoints.go b/service/frauddetector/endpoints.go index 263ed260deb..84c20916892 100644 --- a/service/frauddetector/endpoints.go +++ b/service/frauddetector/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/fsx/api_client.go b/service/fsx/api_client.go index 8ccf7239c74..bac654e6ee3 100644 --- a/service/fsx/api_client.go +++ b/service/fsx/api_client.go @@ -86,34 +86,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -186,6 +158,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/fsx/api_op_CancelDataRepositoryTask.go b/service/fsx/api_op_CancelDataRepositoryTask.go index 29194036470..83690ec371e 100644 --- a/service/fsx/api_op_CancelDataRepositoryTask.go +++ b/service/fsx/api_op_CancelDataRepositoryTask.go @@ -5,7 +5,6 @@ package fsx import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fsx/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) CancelDataRepositoryTask(ctx context.Context, params *CancelDat addawsAwsjson11_serdeOpCancelDataRepositoryTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fsx/api_op_CreateBackup.go b/service/fsx/api_op_CreateBackup.go index 15f152167ef..a3aa851f5e8 100644 --- a/service/fsx/api_op_CreateBackup.go +++ b/service/fsx/api_op_CreateBackup.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fsx/types" smithy "github.com/awslabs/smithy-go" @@ -57,9 +56,9 @@ func (c *Client) CreateBackup(ctx context.Context, params *CreateBackupInput, op addawsAwsjson11_serdeOpCreateBackupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fsx/api_op_CreateDataRepositoryTask.go b/service/fsx/api_op_CreateDataRepositoryTask.go index 666578cee8c..9c4549a02db 100644 --- a/service/fsx/api_op_CreateDataRepositoryTask.go +++ b/service/fsx/api_op_CreateDataRepositoryTask.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fsx/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) CreateDataRepositoryTask(ctx context.Context, params *CreateDat addawsAwsjson11_serdeOpCreateDataRepositoryTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fsx/api_op_CreateFileSystem.go b/service/fsx/api_op_CreateFileSystem.go index f58253f1794..7176d2c7d2d 100644 --- a/service/fsx/api_op_CreateFileSystem.go +++ b/service/fsx/api_op_CreateFileSystem.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fsx/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) CreateFileSystem(ctx context.Context, params *CreateFileSystemI addawsAwsjson11_serdeOpCreateFileSystemMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fsx/api_op_CreateFileSystemFromBackup.go b/service/fsx/api_op_CreateFileSystemFromBackup.go index 55ae12be195..1fec851f6ac 100644 --- a/service/fsx/api_op_CreateFileSystemFromBackup.go +++ b/service/fsx/api_op_CreateFileSystemFromBackup.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fsx/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) CreateFileSystemFromBackup(ctx context.Context, params *CreateF addawsAwsjson11_serdeOpCreateFileSystemFromBackupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fsx/api_op_DeleteBackup.go b/service/fsx/api_op_DeleteBackup.go index bcc67123e45..0b7eace1935 100644 --- a/service/fsx/api_op_DeleteBackup.go +++ b/service/fsx/api_op_DeleteBackup.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fsx/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DeleteBackup(ctx context.Context, params *DeleteBackupInput, op addawsAwsjson11_serdeOpDeleteBackupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fsx/api_op_DeleteFileSystem.go b/service/fsx/api_op_DeleteFileSystem.go index bc20be1e7f0..2f503055901 100644 --- a/service/fsx/api_op_DeleteFileSystem.go +++ b/service/fsx/api_op_DeleteFileSystem.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fsx/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) DeleteFileSystem(ctx context.Context, params *DeleteFileSystemI addawsAwsjson11_serdeOpDeleteFileSystemMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fsx/api_op_DescribeBackups.go b/service/fsx/api_op_DescribeBackups.go index 079a5e9775c..785b0608054 100644 --- a/service/fsx/api_op_DescribeBackups.go +++ b/service/fsx/api_op_DescribeBackups.go @@ -5,7 +5,6 @@ package fsx import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fsx/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) DescribeBackups(ctx context.Context, params *DescribeBackupsInp addawsAwsjson11_serdeOpDescribeBackupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fsx/api_op_DescribeDataRepositoryTasks.go b/service/fsx/api_op_DescribeDataRepositoryTasks.go index 4e79a82e8b0..68308346e9f 100644 --- a/service/fsx/api_op_DescribeDataRepositoryTasks.go +++ b/service/fsx/api_op_DescribeDataRepositoryTasks.go @@ -5,7 +5,6 @@ package fsx import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fsx/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) DescribeDataRepositoryTasks(ctx context.Context, params *Descri addawsAwsjson11_serdeOpDescribeDataRepositoryTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fsx/api_op_DescribeFileSystems.go b/service/fsx/api_op_DescribeFileSystems.go index eadfdc74210..8c9756c88c0 100644 --- a/service/fsx/api_op_DescribeFileSystems.go +++ b/service/fsx/api_op_DescribeFileSystems.go @@ -5,7 +5,6 @@ package fsx import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fsx/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) DescribeFileSystems(ctx context.Context, params *DescribeFileSy addawsAwsjson11_serdeOpDescribeFileSystemsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fsx/api_op_ListTagsForResource.go b/service/fsx/api_op_ListTagsForResource.go index 0dd9e71a77f..adf7d669786 100644 --- a/service/fsx/api_op_ListTagsForResource.go +++ b/service/fsx/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package fsx import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fsx/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fsx/api_op_TagResource.go b/service/fsx/api_op_TagResource.go index f80cae2570f..bcacdf2a7f5 100644 --- a/service/fsx/api_op_TagResource.go +++ b/service/fsx/api_op_TagResource.go @@ -5,7 +5,6 @@ package fsx import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fsx/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fsx/api_op_UntagResource.go b/service/fsx/api_op_UntagResource.go index ec8aa4b6979..fd755fb4600 100644 --- a/service/fsx/api_op_UntagResource.go +++ b/service/fsx/api_op_UntagResource.go @@ -5,7 +5,6 @@ package fsx import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fsx/api_op_UpdateFileSystem.go b/service/fsx/api_op_UpdateFileSystem.go index 7a994e001d6..823b82cabbe 100644 --- a/service/fsx/api_op_UpdateFileSystem.go +++ b/service/fsx/api_op_UpdateFileSystem.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/fsx/types" smithy "github.com/awslabs/smithy-go" @@ -54,9 +53,9 @@ func (c *Client) UpdateFileSystem(ctx context.Context, params *UpdateFileSystemI addawsAwsjson11_serdeOpUpdateFileSystemMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/fsx/endpoints.go b/service/fsx/endpoints.go index 590edf0890b..8d0b88a81b7 100644 --- a/service/fsx/endpoints.go +++ b/service/fsx/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/gamelift/api_client.go b/service/gamelift/api_client.go index 8aa2e975f12..b3b0b05c2e7 100644 --- a/service/gamelift/api_client.go +++ b/service/gamelift/api_client.go @@ -117,30 +117,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -206,6 +182,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/gamelift/api_op_AcceptMatch.go b/service/gamelift/api_op_AcceptMatch.go index 9c8956b7670..470e55a3e0b 100644 --- a/service/gamelift/api_op_AcceptMatch.go +++ b/service/gamelift/api_op_AcceptMatch.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -55,9 +54,9 @@ func (c *Client) AcceptMatch(ctx context.Context, params *AcceptMatchInput, optF addawsAwsjson11_serdeOpAcceptMatchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_ClaimGameServer.go b/service/gamelift/api_op_ClaimGameServer.go index 7a20ffc65ae..97fbef42631 100644 --- a/service/gamelift/api_op_ClaimGameServer.go +++ b/service/gamelift/api_op_ClaimGameServer.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -67,9 +66,9 @@ func (c *Client) ClaimGameServer(ctx context.Context, params *ClaimGameServerInp addawsAwsjson11_serdeOpClaimGameServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_CreateAlias.go b/service/gamelift/api_op_CreateAlias.go index a82c6237a30..41a2f285625 100644 --- a/service/gamelift/api_op_CreateAlias.go +++ b/service/gamelift/api_op_CreateAlias.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -49,9 +48,9 @@ func (c *Client) CreateAlias(ctx context.Context, params *CreateAliasInput, optF addawsAwsjson11_serdeOpCreateAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_CreateBuild.go b/service/gamelift/api_op_CreateBuild.go index 42121958041..24e6b0c6d92 100644 --- a/service/gamelift/api_op_CreateBuild.go +++ b/service/gamelift/api_op_CreateBuild.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -67,9 +66,9 @@ func (c *Client) CreateBuild(ctx context.Context, params *CreateBuildInput, optF addawsAwsjson11_serdeOpCreateBuildMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_CreateFleet.go b/service/gamelift/api_op_CreateFleet.go index 6a2d8b340c4..7bf7cd246be 100644 --- a/service/gamelift/api_op_CreateFleet.go +++ b/service/gamelift/api_op_CreateFleet.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -54,9 +53,9 @@ func (c *Client) CreateFleet(ctx context.Context, params *CreateFleetInput, optF addawsAwsjson11_serdeOpCreateFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_CreateGameServerGroup.go b/service/gamelift/api_op_CreateGameServerGroup.go index 9e44c64746f..790c6101945 100644 --- a/service/gamelift/api_op_CreateGameServerGroup.go +++ b/service/gamelift/api_op_CreateGameServerGroup.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -80,9 +79,9 @@ func (c *Client) CreateGameServerGroup(ctx context.Context, params *CreateGameSe addawsAwsjson11_serdeOpCreateGameServerGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_CreateGameSession.go b/service/gamelift/api_op_CreateGameSession.go index d4a7b711663..a8f82767000 100644 --- a/service/gamelift/api_op_CreateGameSession.go +++ b/service/gamelift/api_op_CreateGameSession.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -68,9 +67,9 @@ func (c *Client) CreateGameSession(ctx context.Context, params *CreateGameSessio addawsAwsjson11_serdeOpCreateGameSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_CreateGameSessionQueue.go b/service/gamelift/api_op_CreateGameSessionQueue.go index 5ffc380eff8..b8c31c3bb19 100644 --- a/service/gamelift/api_op_CreateGameSessionQueue.go +++ b/service/gamelift/api_op_CreateGameSessionQueue.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -62,9 +61,9 @@ func (c *Client) CreateGameSessionQueue(ctx context.Context, params *CreateGameS addawsAwsjson11_serdeOpCreateGameSessionQueueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_CreateMatchmakingConfiguration.go b/service/gamelift/api_op_CreateMatchmakingConfiguration.go index 5dc4a730256..50fefd2c94b 100644 --- a/service/gamelift/api_op_CreateMatchmakingConfiguration.go +++ b/service/gamelift/api_op_CreateMatchmakingConfiguration.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -63,9 +62,9 @@ func (c *Client) CreateMatchmakingConfiguration(ctx context.Context, params *Cre addawsAwsjson11_serdeOpCreateMatchmakingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_CreateMatchmakingRuleSet.go b/service/gamelift/api_op_CreateMatchmakingRuleSet.go index 94af8997602..3dc74b4d926 100644 --- a/service/gamelift/api_op_CreateMatchmakingRuleSet.go +++ b/service/gamelift/api_op_CreateMatchmakingRuleSet.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -65,9 +64,9 @@ func (c *Client) CreateMatchmakingRuleSet(ctx context.Context, params *CreateMat addawsAwsjson11_serdeOpCreateMatchmakingRuleSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_CreatePlayerSession.go b/service/gamelift/api_op_CreatePlayerSession.go index 25c8890e998..643031d4a14 100644 --- a/service/gamelift/api_op_CreatePlayerSession.go +++ b/service/gamelift/api_op_CreatePlayerSession.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -49,9 +48,9 @@ func (c *Client) CreatePlayerSession(ctx context.Context, params *CreatePlayerSe addawsAwsjson11_serdeOpCreatePlayerSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_CreatePlayerSessions.go b/service/gamelift/api_op_CreatePlayerSessions.go index bb0ad16a51b..172e89e6a8d 100644 --- a/service/gamelift/api_op_CreatePlayerSessions.go +++ b/service/gamelift/api_op_CreatePlayerSessions.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -50,9 +49,9 @@ func (c *Client) CreatePlayerSessions(ctx context.Context, params *CreatePlayerS addawsAwsjson11_serdeOpCreatePlayerSessionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_CreateScript.go b/service/gamelift/api_op_CreateScript.go index 8b5d847efd5..73b1c7d14fd 100644 --- a/service/gamelift/api_op_CreateScript.go +++ b/service/gamelift/api_op_CreateScript.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -52,9 +51,9 @@ func (c *Client) CreateScript(ctx context.Context, params *CreateScriptInput, op addawsAwsjson11_serdeOpCreateScriptMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_CreateVpcPeeringAuthorization.go b/service/gamelift/api_op_CreateVpcPeeringAuthorization.go index 1547757264d..bc84ea19378 100644 --- a/service/gamelift/api_op_CreateVpcPeeringAuthorization.go +++ b/service/gamelift/api_op_CreateVpcPeeringAuthorization.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -60,9 +59,9 @@ func (c *Client) CreateVpcPeeringAuthorization(ctx context.Context, params *Crea addawsAwsjson11_serdeOpCreateVpcPeeringAuthorizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_CreateVpcPeeringConnection.go b/service/gamelift/api_op_CreateVpcPeeringConnection.go index 2247711c631..5f156d2e1d0 100644 --- a/service/gamelift/api_op_CreateVpcPeeringConnection.go +++ b/service/gamelift/api_op_CreateVpcPeeringConnection.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -57,9 +56,9 @@ func (c *Client) CreateVpcPeeringConnection(ctx context.Context, params *CreateV addawsAwsjson11_serdeOpCreateVpcPeeringConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DeleteAlias.go b/service/gamelift/api_op_DeleteAlias.go index d1742a1c9e3..ec021329c69 100644 --- a/service/gamelift/api_op_DeleteAlias.go +++ b/service/gamelift/api_op_DeleteAlias.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -38,9 +37,9 @@ func (c *Client) DeleteAlias(ctx context.Context, params *DeleteAliasInput, optF addawsAwsjson11_serdeOpDeleteAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DeleteBuild.go b/service/gamelift/api_op_DeleteBuild.go index 3599627bd75..435446d0233 100644 --- a/service/gamelift/api_op_DeleteBuild.go +++ b/service/gamelift/api_op_DeleteBuild.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -39,9 +38,9 @@ func (c *Client) DeleteBuild(ctx context.Context, params *DeleteBuildInput, optF addawsAwsjson11_serdeOpDeleteBuildMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DeleteFleet.go b/service/gamelift/api_op_DeleteFleet.go index 94de69ebd0d..d6380b73352 100644 --- a/service/gamelift/api_op_DeleteFleet.go +++ b/service/gamelift/api_op_DeleteFleet.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -45,9 +44,9 @@ func (c *Client) DeleteFleet(ctx context.Context, params *DeleteFleetInput, optF addawsAwsjson11_serdeOpDeleteFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DeleteGameServerGroup.go b/service/gamelift/api_op_DeleteGameServerGroup.go index 983cabb5553..90160ade3e7 100644 --- a/service/gamelift/api_op_DeleteGameServerGroup.go +++ b/service/gamelift/api_op_DeleteGameServerGroup.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -57,9 +56,9 @@ func (c *Client) DeleteGameServerGroup(ctx context.Context, params *DeleteGameSe addawsAwsjson11_serdeOpDeleteGameServerGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DeleteGameSessionQueue.go b/service/gamelift/api_op_DeleteGameSessionQueue.go index d3599216d56..43a1bad280f 100644 --- a/service/gamelift/api_op_DeleteGameSessionQueue.go +++ b/service/gamelift/api_op_DeleteGameSessionQueue.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -36,9 +35,9 @@ func (c *Client) DeleteGameSessionQueue(ctx context.Context, params *DeleteGameS addawsAwsjson11_serdeOpDeleteGameSessionQueueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DeleteMatchmakingConfiguration.go b/service/gamelift/api_op_DeleteMatchmakingConfiguration.go index 51ce65ceadf..feb567f87a1 100644 --- a/service/gamelift/api_op_DeleteMatchmakingConfiguration.go +++ b/service/gamelift/api_op_DeleteMatchmakingConfiguration.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -44,9 +43,9 @@ func (c *Client) DeleteMatchmakingConfiguration(ctx context.Context, params *Del addawsAwsjson11_serdeOpDeleteMatchmakingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DeleteMatchmakingRuleSet.go b/service/gamelift/api_op_DeleteMatchmakingRuleSet.go index a5278969f7d..3bfae89df5a 100644 --- a/service/gamelift/api_op_DeleteMatchmakingRuleSet.go +++ b/service/gamelift/api_op_DeleteMatchmakingRuleSet.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -50,9 +49,9 @@ func (c *Client) DeleteMatchmakingRuleSet(ctx context.Context, params *DeleteMat addawsAwsjson11_serdeOpDeleteMatchmakingRuleSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DeleteScalingPolicy.go b/service/gamelift/api_op_DeleteScalingPolicy.go index 1ae420d0fed..c5f13f8ceb1 100644 --- a/service/gamelift/api_op_DeleteScalingPolicy.go +++ b/service/gamelift/api_op_DeleteScalingPolicy.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -51,9 +50,9 @@ func (c *Client) DeleteScalingPolicy(ctx context.Context, params *DeleteScalingP addawsAwsjson11_serdeOpDeleteScalingPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DeleteScript.go b/service/gamelift/api_op_DeleteScript.go index 13e087c7ee9..32ef012f66e 100644 --- a/service/gamelift/api_op_DeleteScript.go +++ b/service/gamelift/api_op_DeleteScript.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) DeleteScript(ctx context.Context, params *DeleteScriptInput, op addawsAwsjson11_serdeOpDeleteScriptMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DeleteVpcPeeringAuthorization.go b/service/gamelift/api_op_DeleteVpcPeeringAuthorization.go index 7507957be7a..43022ce80d3 100644 --- a/service/gamelift/api_op_DeleteVpcPeeringAuthorization.go +++ b/service/gamelift/api_op_DeleteVpcPeeringAuthorization.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -39,9 +38,9 @@ func (c *Client) DeleteVpcPeeringAuthorization(ctx context.Context, params *Dele addawsAwsjson11_serdeOpDeleteVpcPeeringAuthorizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DeleteVpcPeeringConnection.go b/service/gamelift/api_op_DeleteVpcPeeringConnection.go index b50f43484f9..2a0d799f368 100644 --- a/service/gamelift/api_op_DeleteVpcPeeringConnection.go +++ b/service/gamelift/api_op_DeleteVpcPeeringConnection.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -43,9 +42,9 @@ func (c *Client) DeleteVpcPeeringConnection(ctx context.Context, params *DeleteV addawsAwsjson11_serdeOpDeleteVpcPeeringConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DeregisterGameServer.go b/service/gamelift/api_op_DeregisterGameServer.go index 42749beff73..059cfebf001 100644 --- a/service/gamelift/api_op_DeregisterGameServer.go +++ b/service/gamelift/api_op_DeregisterGameServer.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -44,9 +43,9 @@ func (c *Client) DeregisterGameServer(ctx context.Context, params *DeregisterGam addawsAwsjson11_serdeOpDeregisterGameServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeAlias.go b/service/gamelift/api_op_DescribeAlias.go index 21c8ff15923..3b590d1808f 100644 --- a/service/gamelift/api_op_DescribeAlias.go +++ b/service/gamelift/api_op_DescribeAlias.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) DescribeAlias(ctx context.Context, params *DescribeAliasInput, addawsAwsjson11_serdeOpDescribeAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeBuild.go b/service/gamelift/api_op_DescribeBuild.go index 526311f4d36..e004af2cfc9 100644 --- a/service/gamelift/api_op_DescribeBuild.go +++ b/service/gamelift/api_op_DescribeBuild.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) DescribeBuild(ctx context.Context, params *DescribeBuildInput, addawsAwsjson11_serdeOpDescribeBuildMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeEC2InstanceLimits.go b/service/gamelift/api_op_DescribeEC2InstanceLimits.go index adc622b5c92..6034fdd0d85 100644 --- a/service/gamelift/api_op_DescribeEC2InstanceLimits.go +++ b/service/gamelift/api_op_DescribeEC2InstanceLimits.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -50,9 +49,9 @@ func (c *Client) DescribeEC2InstanceLimits(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeEC2InstanceLimitsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeFleetAttributes.go b/service/gamelift/api_op_DescribeFleetAttributes.go index 2753fecc243..7599781df7e 100644 --- a/service/gamelift/api_op_DescribeFleetAttributes.go +++ b/service/gamelift/api_op_DescribeFleetAttributes.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -65,9 +64,9 @@ func (c *Client) DescribeFleetAttributes(ctx context.Context, params *DescribeFl addawsAwsjson11_serdeOpDescribeFleetAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeFleetCapacity.go b/service/gamelift/api_op_DescribeFleetCapacity.go index d9dcf8a680c..e4d71bec84a 100644 --- a/service/gamelift/api_op_DescribeFleetCapacity.go +++ b/service/gamelift/api_op_DescribeFleetCapacity.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -69,9 +68,9 @@ func (c *Client) DescribeFleetCapacity(ctx context.Context, params *DescribeFlee addawsAwsjson11_serdeOpDescribeFleetCapacityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeFleetEvents.go b/service/gamelift/api_op_DescribeFleetEvents.go index ad9d54fc846..6de236bae8d 100644 --- a/service/gamelift/api_op_DescribeFleetEvents.go +++ b/service/gamelift/api_op_DescribeFleetEvents.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -60,9 +59,9 @@ func (c *Client) DescribeFleetEvents(ctx context.Context, params *DescribeFleetE addawsAwsjson11_serdeOpDescribeFleetEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeFleetPortSettings.go b/service/gamelift/api_op_DescribeFleetPortSettings.go index d1d09498773..2cd6603ebcb 100644 --- a/service/gamelift/api_op_DescribeFleetPortSettings.go +++ b/service/gamelift/api_op_DescribeFleetPortSettings.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -63,9 +62,9 @@ func (c *Client) DescribeFleetPortSettings(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeFleetPortSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeFleetUtilization.go b/service/gamelift/api_op_DescribeFleetUtilization.go index dce8c38c7b1..e0e9d319931 100644 --- a/service/gamelift/api_op_DescribeFleetUtilization.go +++ b/service/gamelift/api_op_DescribeFleetUtilization.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -68,9 +67,9 @@ func (c *Client) DescribeFleetUtilization(ctx context.Context, params *DescribeF addawsAwsjson11_serdeOpDescribeFleetUtilizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeGameServer.go b/service/gamelift/api_op_DescribeGameServer.go index f029cd9b97e..66370c346ec 100644 --- a/service/gamelift/api_op_DescribeGameServer.go +++ b/service/gamelift/api_op_DescribeGameServer.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) DescribeGameServer(ctx context.Context, params *DescribeGameSer addawsAwsjson11_serdeOpDescribeGameServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeGameServerGroup.go b/service/gamelift/api_op_DescribeGameServerGroup.go index e1267b8a212..fc09426552d 100644 --- a/service/gamelift/api_op_DescribeGameServerGroup.go +++ b/service/gamelift/api_op_DescribeGameServerGroup.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) DescribeGameServerGroup(ctx context.Context, params *DescribeGa addawsAwsjson11_serdeOpDescribeGameServerGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeGameSessionDetails.go b/service/gamelift/api_op_DescribeGameSessionDetails.go index 58c4c83323d..b5bf4ef8987 100644 --- a/service/gamelift/api_op_DescribeGameSessionDetails.go +++ b/service/gamelift/api_op_DescribeGameSessionDetails.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -56,9 +55,9 @@ func (c *Client) DescribeGameSessionDetails(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeGameSessionDetailsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeGameSessionPlacement.go b/service/gamelift/api_op_DescribeGameSessionPlacement.go index 065cb9c222a..13a63a950bf 100644 --- a/service/gamelift/api_op_DescribeGameSessionPlacement.go +++ b/service/gamelift/api_op_DescribeGameSessionPlacement.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -49,9 +48,9 @@ func (c *Client) DescribeGameSessionPlacement(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribeGameSessionPlacementMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeGameSessionQueues.go b/service/gamelift/api_op_DescribeGameSessionQueues.go index 4e4abc78c7d..33652401c9d 100644 --- a/service/gamelift/api_op_DescribeGameSessionQueues.go +++ b/service/gamelift/api_op_DescribeGameSessionQueues.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) DescribeGameSessionQueues(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeGameSessionQueuesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeGameSessions.go b/service/gamelift/api_op_DescribeGameSessions.go index ad3555c6471..8472a01cdf2 100644 --- a/service/gamelift/api_op_DescribeGameSessions.go +++ b/service/gamelift/api_op_DescribeGameSessions.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -56,9 +55,9 @@ func (c *Client) DescribeGameSessions(ctx context.Context, params *DescribeGameS addawsAwsjson11_serdeOpDescribeGameSessionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeInstances.go b/service/gamelift/api_op_DescribeInstances.go index 1151ccf38c3..3e6b0ad87b7 100644 --- a/service/gamelift/api_op_DescribeInstances.go +++ b/service/gamelift/api_op_DescribeInstances.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) DescribeInstances(ctx context.Context, params *DescribeInstance addawsAwsjson11_serdeOpDescribeInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeMatchmaking.go b/service/gamelift/api_op_DescribeMatchmaking.go index 188f4ba4039..2fa4d5bc044 100644 --- a/service/gamelift/api_op_DescribeMatchmaking.go +++ b/service/gamelift/api_op_DescribeMatchmaking.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) DescribeMatchmaking(ctx context.Context, params *DescribeMatchm addawsAwsjson11_serdeOpDescribeMatchmakingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeMatchmakingConfigurations.go b/service/gamelift/api_op_DescribeMatchmakingConfigurations.go index 1e2b0198d4a..15b987f7640 100644 --- a/service/gamelift/api_op_DescribeMatchmakingConfigurations.go +++ b/service/gamelift/api_op_DescribeMatchmakingConfigurations.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -52,9 +51,9 @@ func (c *Client) DescribeMatchmakingConfigurations(ctx context.Context, params * addawsAwsjson11_serdeOpDescribeMatchmakingConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeMatchmakingRuleSets.go b/service/gamelift/api_op_DescribeMatchmakingRuleSets.go index 391cea49c9b..23260b57728 100644 --- a/service/gamelift/api_op_DescribeMatchmakingRuleSets.go +++ b/service/gamelift/api_op_DescribeMatchmakingRuleSets.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -53,9 +52,9 @@ func (c *Client) DescribeMatchmakingRuleSets(ctx context.Context, params *Descri addawsAwsjson11_serdeOpDescribeMatchmakingRuleSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribePlayerSessions.go b/service/gamelift/api_op_DescribePlayerSessions.go index b171969fcdd..ed7f533e7f0 100644 --- a/service/gamelift/api_op_DescribePlayerSessions.go +++ b/service/gamelift/api_op_DescribePlayerSessions.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -50,9 +49,9 @@ func (c *Client) DescribePlayerSessions(ctx context.Context, params *DescribePla addawsAwsjson11_serdeOpDescribePlayerSessionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeRuntimeConfiguration.go b/service/gamelift/api_op_DescribeRuntimeConfiguration.go index d3dce12b046..f9b4c5b2be3 100644 --- a/service/gamelift/api_op_DescribeRuntimeConfiguration.go +++ b/service/gamelift/api_op_DescribeRuntimeConfiguration.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -63,9 +62,9 @@ func (c *Client) DescribeRuntimeConfiguration(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribeRuntimeConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeScalingPolicies.go b/service/gamelift/api_op_DescribeScalingPolicies.go index ffce9ed6249..17d3c71e9f1 100644 --- a/service/gamelift/api_op_DescribeScalingPolicies.go +++ b/service/gamelift/api_op_DescribeScalingPolicies.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -56,9 +55,9 @@ func (c *Client) DescribeScalingPolicies(ctx context.Context, params *DescribeSc addawsAwsjson11_serdeOpDescribeScalingPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeScript.go b/service/gamelift/api_op_DescribeScript.go index 5ad12769dae..a16a3b5b52e 100644 --- a/service/gamelift/api_op_DescribeScript.go +++ b/service/gamelift/api_op_DescribeScript.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) DescribeScript(ctx context.Context, params *DescribeScriptInput addawsAwsjson11_serdeOpDescribeScriptMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeVpcPeeringAuthorizations.go b/service/gamelift/api_op_DescribeVpcPeeringAuthorizations.go index c2b5eeba620..ac068fa079d 100644 --- a/service/gamelift/api_op_DescribeVpcPeeringAuthorizations.go +++ b/service/gamelift/api_op_DescribeVpcPeeringAuthorizations.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) DescribeVpcPeeringAuthorizations(ctx context.Context, params *D addawsAwsjson11_serdeOpDescribeVpcPeeringAuthorizationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_DescribeVpcPeeringConnections.go b/service/gamelift/api_op_DescribeVpcPeeringConnections.go index 4d9ae0ee7a8..525d42bc652 100644 --- a/service/gamelift/api_op_DescribeVpcPeeringConnections.go +++ b/service/gamelift/api_op_DescribeVpcPeeringConnections.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) DescribeVpcPeeringConnections(ctx context.Context, params *Desc addawsAwsjson11_serdeOpDescribeVpcPeeringConnectionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_GetGameSessionLogUrl.go b/service/gamelift/api_op_GetGameSessionLogUrl.go index 3e547e29516..a21a13c8b1f 100644 --- a/service/gamelift/api_op_GetGameSessionLogUrl.go +++ b/service/gamelift/api_op_GetGameSessionLogUrl.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -52,9 +51,9 @@ func (c *Client) GetGameSessionLogUrl(ctx context.Context, params *GetGameSessio addawsAwsjson11_serdeOpGetGameSessionLogUrlMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_GetInstanceAccess.go b/service/gamelift/api_op_GetInstanceAccess.go index 3bf4f05e2e6..98779feda02 100644 --- a/service/gamelift/api_op_GetInstanceAccess.go +++ b/service/gamelift/api_op_GetInstanceAccess.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) GetInstanceAccess(ctx context.Context, params *GetInstanceAcces addawsAwsjson11_serdeOpGetInstanceAccessMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_ListAliases.go b/service/gamelift/api_op_ListAliases.go index 69ca27827c1..4888f49b63a 100644 --- a/service/gamelift/api_op_ListAliases.go +++ b/service/gamelift/api_op_ListAliases.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) ListAliases(ctx context.Context, params *ListAliasesInput, optF addawsAwsjson11_serdeOpListAliasesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_ListBuilds.go b/service/gamelift/api_op_ListBuilds.go index 9c8e0d6ed2e..9b31aed93e0 100644 --- a/service/gamelift/api_op_ListBuilds.go +++ b/service/gamelift/api_op_ListBuilds.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) ListBuilds(ctx context.Context, params *ListBuildsInput, optFns addawsAwsjson11_serdeOpListBuildsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_ListFleets.go b/service/gamelift/api_op_ListFleets.go index 6fd286d385e..5e969a1f928 100644 --- a/service/gamelift/api_op_ListFleets.go +++ b/service/gamelift/api_op_ListFleets.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -42,9 +41,9 @@ func (c *Client) ListFleets(ctx context.Context, params *ListFleetsInput, optFns addawsAwsjson11_serdeOpListFleetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_ListGameServerGroups.go b/service/gamelift/api_op_ListGameServerGroups.go index 612ddd8c8be..8403323614b 100644 --- a/service/gamelift/api_op_ListGameServerGroups.go +++ b/service/gamelift/api_op_ListGameServerGroups.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) ListGameServerGroups(ctx context.Context, params *ListGameServe addawsAwsjson11_serdeOpListGameServerGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_ListGameServers.go b/service/gamelift/api_op_ListGameServers.go index 4f9dcc7881d..912c54d272b 100644 --- a/service/gamelift/api_op_ListGameServers.go +++ b/service/gamelift/api_op_ListGameServers.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) ListGameServers(ctx context.Context, params *ListGameServersInp addawsAwsjson11_serdeOpListGameServersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_ListScripts.go b/service/gamelift/api_op_ListScripts.go index fd79f886a1e..d762f553372 100644 --- a/service/gamelift/api_op_ListScripts.go +++ b/service/gamelift/api_op_ListScripts.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) ListScripts(ctx context.Context, params *ListScriptsInput, optF addawsAwsjson11_serdeOpListScriptsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_ListTagsForResource.go b/service/gamelift/api_op_ListTagsForResource.go index 401141c133c..4596b02ddf8 100644 --- a/service/gamelift/api_op_ListTagsForResource.go +++ b/service/gamelift/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -56,9 +55,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_PutScalingPolicy.go b/service/gamelift/api_op_PutScalingPolicy.go index 15c1e1c111c..3e337d46587 100644 --- a/service/gamelift/api_op_PutScalingPolicy.go +++ b/service/gamelift/api_op_PutScalingPolicy.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -101,9 +100,9 @@ func (c *Client) PutScalingPolicy(ctx context.Context, params *PutScalingPolicyI addawsAwsjson11_serdeOpPutScalingPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_RegisterGameServer.go b/service/gamelift/api_op_RegisterGameServer.go index c372f7aa9b3..ffaac950785 100644 --- a/service/gamelift/api_op_RegisterGameServer.go +++ b/service/gamelift/api_op_RegisterGameServer.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -53,9 +52,9 @@ func (c *Client) RegisterGameServer(ctx context.Context, params *RegisterGameSer addawsAwsjson11_serdeOpRegisterGameServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_RequestUploadCredentials.go b/service/gamelift/api_op_RequestUploadCredentials.go index 607145b8de9..a8d9f0b75de 100644 --- a/service/gamelift/api_op_RequestUploadCredentials.go +++ b/service/gamelift/api_op_RequestUploadCredentials.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) RequestUploadCredentials(ctx context.Context, params *RequestUp addawsAwsjson11_serdeOpRequestUploadCredentialsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_ResolveAlias.go b/service/gamelift/api_op_ResolveAlias.go index 185864e3059..fea82b5ce37 100644 --- a/service/gamelift/api_op_ResolveAlias.go +++ b/service/gamelift/api_op_ResolveAlias.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -36,9 +35,9 @@ func (c *Client) ResolveAlias(ctx context.Context, params *ResolveAliasInput, op addawsAwsjson11_serdeOpResolveAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_ResumeGameServerGroup.go b/service/gamelift/api_op_ResumeGameServerGroup.go index 46bd940882c..32818630a1b 100644 --- a/service/gamelift/api_op_ResumeGameServerGroup.go +++ b/service/gamelift/api_op_ResumeGameServerGroup.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -50,9 +49,9 @@ func (c *Client) ResumeGameServerGroup(ctx context.Context, params *ResumeGameSe addawsAwsjson11_serdeOpResumeGameServerGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_SearchGameSessions.go b/service/gamelift/api_op_SearchGameSessions.go index b513a520703..1feaad46c13 100644 --- a/service/gamelift/api_op_SearchGameSessions.go +++ b/service/gamelift/api_op_SearchGameSessions.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -98,9 +97,9 @@ func (c *Client) SearchGameSessions(ctx context.Context, params *SearchGameSessi addawsAwsjson11_serdeOpSearchGameSessionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_StartFleetActions.go b/service/gamelift/api_op_StartFleetActions.go index fd94540df02..59082b10485 100644 --- a/service/gamelift/api_op_StartFleetActions.go +++ b/service/gamelift/api_op_StartFleetActions.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) StartFleetActions(ctx context.Context, params *StartFleetAction addawsAwsjson11_serdeOpStartFleetActionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_StartGameSessionPlacement.go b/service/gamelift/api_op_StartGameSessionPlacement.go index ca2925224fb..3c8f4240e11 100644 --- a/service/gamelift/api_op_StartGameSessionPlacement.go +++ b/service/gamelift/api_op_StartGameSessionPlacement.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -84,9 +83,9 @@ func (c *Client) StartGameSessionPlacement(ctx context.Context, params *StartGam addawsAwsjson11_serdeOpStartGameSessionPlacementMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_StartMatchBackfill.go b/service/gamelift/api_op_StartMatchBackfill.go index d2ba21a68e4..821d3209e76 100644 --- a/service/gamelift/api_op_StartMatchBackfill.go +++ b/service/gamelift/api_op_StartMatchBackfill.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -59,9 +58,9 @@ func (c *Client) StartMatchBackfill(ctx context.Context, params *StartMatchBackf addawsAwsjson11_serdeOpStartMatchBackfillMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_StartMatchmaking.go b/service/gamelift/api_op_StartMatchmaking.go index 8f9d9cf5a1f..bc52f7f121c 100644 --- a/service/gamelift/api_op_StartMatchmaking.go +++ b/service/gamelift/api_op_StartMatchmaking.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -102,9 +101,9 @@ func (c *Client) StartMatchmaking(ctx context.Context, params *StartMatchmakingI addawsAwsjson11_serdeOpStartMatchmakingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_StopFleetActions.go b/service/gamelift/api_op_StopFleetActions.go index 77d481a60bb..588cedd74be 100644 --- a/service/gamelift/api_op_StopFleetActions.go +++ b/service/gamelift/api_op_StopFleetActions.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) StopFleetActions(ctx context.Context, params *StopFleetActionsI addawsAwsjson11_serdeOpStopFleetActionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_StopGameSessionPlacement.go b/service/gamelift/api_op_StopGameSessionPlacement.go index f807194959d..ab0da29682e 100644 --- a/service/gamelift/api_op_StopGameSessionPlacement.go +++ b/service/gamelift/api_op_StopGameSessionPlacement.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -49,9 +48,9 @@ func (c *Client) StopGameSessionPlacement(ctx context.Context, params *StopGameS addawsAwsjson11_serdeOpStopGameSessionPlacementMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_StopMatchmaking.go b/service/gamelift/api_op_StopMatchmaking.go index 882c901e820..9d7f6b30402 100644 --- a/service/gamelift/api_op_StopMatchmaking.go +++ b/service/gamelift/api_op_StopMatchmaking.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -44,9 +43,9 @@ func (c *Client) StopMatchmaking(ctx context.Context, params *StopMatchmakingInp addawsAwsjson11_serdeOpStopMatchmakingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_SuspendGameServerGroup.go b/service/gamelift/api_op_SuspendGameServerGroup.go index 25bb15c5626..4497408ace7 100644 --- a/service/gamelift/api_op_SuspendGameServerGroup.go +++ b/service/gamelift/api_op_SuspendGameServerGroup.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -59,9 +58,9 @@ func (c *Client) SuspendGameServerGroup(ctx context.Context, params *SuspendGame addawsAwsjson11_serdeOpSuspendGameServerGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_TagResource.go b/service/gamelift/api_op_TagResource.go index da082a250b8..b5935cb907a 100644 --- a/service/gamelift/api_op_TagResource.go +++ b/service/gamelift/api_op_TagResource.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -59,9 +58,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_UntagResource.go b/service/gamelift/api_op_UntagResource.go index e2810789807..a74139646a3 100644 --- a/service/gamelift/api_op_UntagResource.go +++ b/service/gamelift/api_op_UntagResource.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -57,9 +56,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_UpdateAlias.go b/service/gamelift/api_op_UpdateAlias.go index 442466704b7..d714d259a46 100644 --- a/service/gamelift/api_op_UpdateAlias.go +++ b/service/gamelift/api_op_UpdateAlias.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) UpdateAlias(ctx context.Context, params *UpdateAliasInput, optF addawsAwsjson11_serdeOpUpdateAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_UpdateBuild.go b/service/gamelift/api_op_UpdateBuild.go index 54f19952b4d..fa1d45b9bf0 100644 --- a/service/gamelift/api_op_UpdateBuild.go +++ b/service/gamelift/api_op_UpdateBuild.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) UpdateBuild(ctx context.Context, params *UpdateBuildInput, optF addawsAwsjson11_serdeOpUpdateBuildMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_UpdateFleetAttributes.go b/service/gamelift/api_op_UpdateFleetAttributes.go index bacd990f9d6..29622e18ef0 100644 --- a/service/gamelift/api_op_UpdateFleetAttributes.go +++ b/service/gamelift/api_op_UpdateFleetAttributes.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -52,9 +51,9 @@ func (c *Client) UpdateFleetAttributes(ctx context.Context, params *UpdateFleetA addawsAwsjson11_serdeOpUpdateFleetAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_UpdateFleetCapacity.go b/service/gamelift/api_op_UpdateFleetCapacity.go index a17aff0e90f..2614617ca63 100644 --- a/service/gamelift/api_op_UpdateFleetCapacity.go +++ b/service/gamelift/api_op_UpdateFleetCapacity.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -61,9 +60,9 @@ func (c *Client) UpdateFleetCapacity(ctx context.Context, params *UpdateFleetCap addawsAwsjson11_serdeOpUpdateFleetCapacityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_UpdateFleetPortSettings.go b/service/gamelift/api_op_UpdateFleetPortSettings.go index b5b7f192a93..58887201707 100644 --- a/service/gamelift/api_op_UpdateFleetPortSettings.go +++ b/service/gamelift/api_op_UpdateFleetPortSettings.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -54,9 +53,9 @@ func (c *Client) UpdateFleetPortSettings(ctx context.Context, params *UpdateFlee addawsAwsjson11_serdeOpUpdateFleetPortSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_UpdateGameServer.go b/service/gamelift/api_op_UpdateGameServer.go index 2790944109b..6c65f8b58dc 100644 --- a/service/gamelift/api_op_UpdateGameServer.go +++ b/service/gamelift/api_op_UpdateGameServer.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -67,9 +66,9 @@ func (c *Client) UpdateGameServer(ctx context.Context, params *UpdateGameServerI addawsAwsjson11_serdeOpUpdateGameServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_UpdateGameServerGroup.go b/service/gamelift/api_op_UpdateGameServerGroup.go index 8d765a884db..9006ecf202c 100644 --- a/service/gamelift/api_op_UpdateGameServerGroup.go +++ b/service/gamelift/api_op_UpdateGameServerGroup.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -54,9 +53,9 @@ func (c *Client) UpdateGameServerGroup(ctx context.Context, params *UpdateGameSe addawsAwsjson11_serdeOpUpdateGameServerGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_UpdateGameSession.go b/service/gamelift/api_op_UpdateGameSession.go index a203ee34104..7c9449a77b4 100644 --- a/service/gamelift/api_op_UpdateGameSession.go +++ b/service/gamelift/api_op_UpdateGameSession.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -53,9 +52,9 @@ func (c *Client) UpdateGameSession(ctx context.Context, params *UpdateGameSessio addawsAwsjson11_serdeOpUpdateGameSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_UpdateGameSessionQueue.go b/service/gamelift/api_op_UpdateGameSessionQueue.go index 9e56a578677..d604a249599 100644 --- a/service/gamelift/api_op_UpdateGameSessionQueue.go +++ b/service/gamelift/api_op_UpdateGameSessionQueue.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) UpdateGameSessionQueue(ctx context.Context, params *UpdateGameS addawsAwsjson11_serdeOpUpdateGameSessionQueueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_UpdateMatchmakingConfiguration.go b/service/gamelift/api_op_UpdateMatchmakingConfiguration.go index bbfff6e5f78..9aac07790e3 100644 --- a/service/gamelift/api_op_UpdateMatchmakingConfiguration.go +++ b/service/gamelift/api_op_UpdateMatchmakingConfiguration.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -48,9 +47,9 @@ func (c *Client) UpdateMatchmakingConfiguration(ctx context.Context, params *Upd addawsAwsjson11_serdeOpUpdateMatchmakingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_UpdateRuntimeConfiguration.go b/service/gamelift/api_op_UpdateRuntimeConfiguration.go index 17239005d2e..8c92410b771 100644 --- a/service/gamelift/api_op_UpdateRuntimeConfiguration.go +++ b/service/gamelift/api_op_UpdateRuntimeConfiguration.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -60,9 +59,9 @@ func (c *Client) UpdateRuntimeConfiguration(ctx context.Context, params *UpdateR addawsAwsjson11_serdeOpUpdateRuntimeConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_UpdateScript.go b/service/gamelift/api_op_UpdateScript.go index a77bc039041..b572bfd5b9b 100644 --- a/service/gamelift/api_op_UpdateScript.go +++ b/service/gamelift/api_op_UpdateScript.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/gamelift/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) UpdateScript(ctx context.Context, params *UpdateScriptInput, op addawsAwsjson11_serdeOpUpdateScriptMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/api_op_ValidateMatchmakingRuleSet.go b/service/gamelift/api_op_ValidateMatchmakingRuleSet.go index 176d5bc2c61..8d624e2dd3c 100644 --- a/service/gamelift/api_op_ValidateMatchmakingRuleSet.go +++ b/service/gamelift/api_op_ValidateMatchmakingRuleSet.go @@ -5,7 +5,6 @@ package gamelift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -51,9 +50,9 @@ func (c *Client) ValidateMatchmakingRuleSet(ctx context.Context, params *Validat addawsAwsjson11_serdeOpValidateMatchmakingRuleSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/gamelift/endpoints.go b/service/gamelift/endpoints.go index 40a9cfa2bfa..44f14cf12e7 100644 --- a/service/gamelift/endpoints.go +++ b/service/gamelift/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/glacier/api_client.go b/service/glacier/api_client.go index 27c475b1ac5..e38b8b251ee 100644 --- a/service/glacier/api_client.go +++ b/service/glacier/api_client.go @@ -101,30 +101,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -190,6 +166,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/glacier/api_op_AbortMultipartUpload.go b/service/glacier/api_op_AbortMultipartUpload.go index 7d3d8157fdb..16625d0a750 100644 --- a/service/glacier/api_op_AbortMultipartUpload.go +++ b/service/glacier/api_op_AbortMultipartUpload.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) AbortMultipartUpload(ctx context.Context, params *AbortMultipar addawsRestjson1_serdeOpAbortMultipartUploadMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_AbortVaultLock.go b/service/glacier/api_op_AbortVaultLock.go index fd571ab8f36..3fce29dcc95 100644 --- a/service/glacier/api_op_AbortVaultLock.go +++ b/service/glacier/api_op_AbortVaultLock.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) AbortVaultLock(ctx context.Context, params *AbortVaultLockInput addawsRestjson1_serdeOpAbortVaultLockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_AddTagsToVault.go b/service/glacier/api_op_AddTagsToVault.go index a4a0c6f9804..72a3460f366 100644 --- a/service/glacier/api_op_AddTagsToVault.go +++ b/service/glacier/api_op_AddTagsToVault.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) AddTagsToVault(ctx context.Context, params *AddTagsToVaultInput addawsRestjson1_serdeOpAddTagsToVaultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_CompleteMultipartUpload.go b/service/glacier/api_op_CompleteMultipartUpload.go index d3ead880722..0e01f2929d7 100644 --- a/service/glacier/api_op_CompleteMultipartUpload.go +++ b/service/glacier/api_op_CompleteMultipartUpload.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -61,9 +60,9 @@ func (c *Client) CompleteMultipartUpload(ctx context.Context, params *CompleteMu addawsRestjson1_serdeOpCompleteMultipartUploadMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_CompleteVaultLock.go b/service/glacier/api_op_CompleteVaultLock.go index 7ec8e342907..c96e1c9dbbd 100644 --- a/service/glacier/api_op_CompleteVaultLock.go +++ b/service/glacier/api_op_CompleteVaultLock.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) CompleteVaultLock(ctx context.Context, params *CompleteVaultLoc addawsRestjson1_serdeOpCompleteVaultLockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_CreateVault.go b/service/glacier/api_op_CreateVault.go index e3bfc4c7822..33c6d8f2e7d 100644 --- a/service/glacier/api_op_CreateVault.go +++ b/service/glacier/api_op_CreateVault.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) CreateVault(ctx context.Context, params *CreateVaultInput, optF addawsRestjson1_serdeOpCreateVaultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_DeleteArchive.go b/service/glacier/api_op_DeleteArchive.go index 3a356ff1091..95f038a210c 100644 --- a/service/glacier/api_op_DeleteArchive.go +++ b/service/glacier/api_op_DeleteArchive.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -48,9 +47,9 @@ func (c *Client) DeleteArchive(ctx context.Context, params *DeleteArchiveInput, addawsRestjson1_serdeOpDeleteArchiveMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_DeleteVault.go b/service/glacier/api_op_DeleteVault.go index 846ba27ac7d..941fc72e8da 100644 --- a/service/glacier/api_op_DeleteVault.go +++ b/service/glacier/api_op_DeleteVault.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) DeleteVault(ctx context.Context, params *DeleteVaultInput, optF addawsRestjson1_serdeOpDeleteVaultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_DeleteVaultAccessPolicy.go b/service/glacier/api_op_DeleteVaultAccessPolicy.go index 5c96ab4c61d..0d1f1a45d09 100644 --- a/service/glacier/api_op_DeleteVaultAccessPolicy.go +++ b/service/glacier/api_op_DeleteVaultAccessPolicy.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DeleteVaultAccessPolicy(ctx context.Context, params *DeleteVaul addawsRestjson1_serdeOpDeleteVaultAccessPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_DeleteVaultNotifications.go b/service/glacier/api_op_DeleteVaultNotifications.go index dfbc0b99129..c59656c169f 100644 --- a/service/glacier/api_op_DeleteVaultNotifications.go +++ b/service/glacier/api_op_DeleteVaultNotifications.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) DeleteVaultNotifications(ctx context.Context, params *DeleteVau addawsRestjson1_serdeOpDeleteVaultNotificationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_DescribeJob.go b/service/glacier/api_op_DescribeJob.go index 7a1a2aad21a..7f83650d4ab 100644 --- a/service/glacier/api_op_DescribeJob.go +++ b/service/glacier/api_op_DescribeJob.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/glacier/types" @@ -42,9 +41,9 @@ func (c *Client) DescribeJob(ctx context.Context, params *DescribeJobInput, optF addawsRestjson1_serdeOpDescribeJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_DescribeVault.go b/service/glacier/api_op_DescribeVault.go index bc726442f60..3c749b5afa3 100644 --- a/service/glacier/api_op_DescribeVault.go +++ b/service/glacier/api_op_DescribeVault.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) DescribeVault(ctx context.Context, params *DescribeVaultInput, addawsRestjson1_serdeOpDescribeVaultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_GetDataRetrievalPolicy.go b/service/glacier/api_op_GetDataRetrievalPolicy.go index c3f57b1d349..0ba29c8b944 100644 --- a/service/glacier/api_op_GetDataRetrievalPolicy.go +++ b/service/glacier/api_op_GetDataRetrievalPolicy.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/glacier/types" @@ -27,9 +26,9 @@ func (c *Client) GetDataRetrievalPolicy(ctx context.Context, params *GetDataRetr addawsRestjson1_serdeOpGetDataRetrievalPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_GetJobOutput.go b/service/glacier/api_op_GetJobOutput.go index 67e55cbff6e..abbb7312058 100644 --- a/service/glacier/api_op_GetJobOutput.go +++ b/service/glacier/api_op_GetJobOutput.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -61,9 +60,9 @@ func (c *Client) GetJobOutput(ctx context.Context, params *GetJobOutputInput, op addawsRestjson1_serdeOpGetJobOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_GetVaultAccessPolicy.go b/service/glacier/api_op_GetVaultAccessPolicy.go index 79fd393d394..766028ce9bf 100644 --- a/service/glacier/api_op_GetVaultAccessPolicy.go +++ b/service/glacier/api_op_GetVaultAccessPolicy.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/glacier/types" @@ -31,9 +30,9 @@ func (c *Client) GetVaultAccessPolicy(ctx context.Context, params *GetVaultAcces addawsRestjson1_serdeOpGetVaultAccessPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_GetVaultLock.go b/service/glacier/api_op_GetVaultLock.go index 7550897696b..4e62b57b1a4 100644 --- a/service/glacier/api_op_GetVaultLock.go +++ b/service/glacier/api_op_GetVaultLock.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -48,9 +47,9 @@ func (c *Client) GetVaultLock(ctx context.Context, params *GetVaultLockInput, op addawsRestjson1_serdeOpGetVaultLockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_GetVaultNotifications.go b/service/glacier/api_op_GetVaultNotifications.go index a520ef5c7db..e3121041086 100644 --- a/service/glacier/api_op_GetVaultNotifications.go +++ b/service/glacier/api_op_GetVaultNotifications.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/glacier/types" @@ -42,9 +41,9 @@ func (c *Client) GetVaultNotifications(ctx context.Context, params *GetVaultNoti addawsRestjson1_serdeOpGetVaultNotificationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_InitiateJob.go b/service/glacier/api_op_InitiateJob.go index 05068231e9d..6eeece2e87c 100644 --- a/service/glacier/api_op_InitiateJob.go +++ b/service/glacier/api_op_InitiateJob.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/glacier/types" @@ -27,9 +26,9 @@ func (c *Client) InitiateJob(ctx context.Context, params *InitiateJobInput, optF addawsRestjson1_serdeOpInitiateJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_InitiateMultipartUpload.go b/service/glacier/api_op_InitiateMultipartUpload.go index 9de26cf4cad..98fdf6e409c 100644 --- a/service/glacier/api_op_InitiateMultipartUpload.go +++ b/service/glacier/api_op_InitiateMultipartUpload.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -51,9 +50,9 @@ func (c *Client) InitiateMultipartUpload(ctx context.Context, params *InitiateMu addawsRestjson1_serdeOpInitiateMultipartUploadMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_InitiateVaultLock.go b/service/glacier/api_op_InitiateVaultLock.go index f77d9dd3a6f..d4221e343dd 100644 --- a/service/glacier/api_op_InitiateVaultLock.go +++ b/service/glacier/api_op_InitiateVaultLock.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/glacier/types" @@ -55,9 +54,9 @@ func (c *Client) InitiateVaultLock(ctx context.Context, params *InitiateVaultLoc addawsRestjson1_serdeOpInitiateVaultLockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_ListJobs.go b/service/glacier/api_op_ListJobs.go index 743ed8fcec3..6a21baff7ad 100644 --- a/service/glacier/api_op_ListJobs.go +++ b/service/glacier/api_op_ListJobs.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/glacier/types" @@ -55,9 +54,9 @@ func (c *Client) ListJobs(ctx context.Context, params *ListJobsInput, optFns ... addawsRestjson1_serdeOpListJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_ListMultipartUploads.go b/service/glacier/api_op_ListMultipartUploads.go index 54ad35b6e10..7294cc767d3 100644 --- a/service/glacier/api_op_ListMultipartUploads.go +++ b/service/glacier/api_op_ListMultipartUploads.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/glacier/types" @@ -50,9 +49,9 @@ func (c *Client) ListMultipartUploads(ctx context.Context, params *ListMultipart addawsRestjson1_serdeOpListMultipartUploadsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_ListParts.go b/service/glacier/api_op_ListParts.go index 7b7ba2c6c06..df7674fa459 100644 --- a/service/glacier/api_op_ListParts.go +++ b/service/glacier/api_op_ListParts.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/glacier/types" @@ -46,9 +45,9 @@ func (c *Client) ListParts(ctx context.Context, params *ListPartsInput, optFns . addawsRestjson1_serdeOpListPartsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_ListProvisionedCapacity.go b/service/glacier/api_op_ListProvisionedCapacity.go index a6e11c6dc3d..582199430b3 100644 --- a/service/glacier/api_op_ListProvisionedCapacity.go +++ b/service/glacier/api_op_ListProvisionedCapacity.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/glacier/types" @@ -25,9 +24,9 @@ func (c *Client) ListProvisionedCapacity(ctx context.Context, params *ListProvis addawsRestjson1_serdeOpListProvisionedCapacityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_ListTagsForVault.go b/service/glacier/api_op_ListTagsForVault.go index 61cd3b2d904..7192852dea9 100644 --- a/service/glacier/api_op_ListTagsForVault.go +++ b/service/glacier/api_op_ListTagsForVault.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListTagsForVault(ctx context.Context, params *ListTagsForVaultI addawsRestjson1_serdeOpListTagsForVaultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_ListVaults.go b/service/glacier/api_op_ListVaults.go index 640781e3f7b..df9a1de0c1a 100644 --- a/service/glacier/api_op_ListVaults.go +++ b/service/glacier/api_op_ListVaults.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/glacier/types" @@ -44,9 +43,9 @@ func (c *Client) ListVaults(ctx context.Context, params *ListVaultsInput, optFns addawsRestjson1_serdeOpListVaultsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_PurchaseProvisionedCapacity.go b/service/glacier/api_op_PurchaseProvisionedCapacity.go index 248a5b8a065..fd2a8e3271f 100644 --- a/service/glacier/api_op_PurchaseProvisionedCapacity.go +++ b/service/glacier/api_op_PurchaseProvisionedCapacity.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PurchaseProvisionedCapacity(ctx context.Context, params *Purcha addawsRestjson1_serdeOpPurchaseProvisionedCapacityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_RemoveTagsFromVault.go b/service/glacier/api_op_RemoveTagsFromVault.go index 87b24682c42..780f072863f 100644 --- a/service/glacier/api_op_RemoveTagsFromVault.go +++ b/service/glacier/api_op_RemoveTagsFromVault.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) RemoveTagsFromVault(ctx context.Context, params *RemoveTagsFrom addawsRestjson1_serdeOpRemoveTagsFromVaultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_SetDataRetrievalPolicy.go b/service/glacier/api_op_SetDataRetrievalPolicy.go index d73e8115a18..82b20937a92 100644 --- a/service/glacier/api_op_SetDataRetrievalPolicy.go +++ b/service/glacier/api_op_SetDataRetrievalPolicy.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/glacier/types" @@ -30,9 +29,9 @@ func (c *Client) SetDataRetrievalPolicy(ctx context.Context, params *SetDataRetr addawsRestjson1_serdeOpSetDataRetrievalPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_SetVaultAccessPolicy.go b/service/glacier/api_op_SetVaultAccessPolicy.go index 80a8807b841..7abd38bd70f 100644 --- a/service/glacier/api_op_SetVaultAccessPolicy.go +++ b/service/glacier/api_op_SetVaultAccessPolicy.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/glacier/types" @@ -30,9 +29,9 @@ func (c *Client) SetVaultAccessPolicy(ctx context.Context, params *SetVaultAcces addawsRestjson1_serdeOpSetVaultAccessPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_SetVaultNotifications.go b/service/glacier/api_op_SetVaultNotifications.go index 83c878b8993..95a30ff00db 100644 --- a/service/glacier/api_op_SetVaultNotifications.go +++ b/service/glacier/api_op_SetVaultNotifications.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/glacier/types" @@ -52,9 +51,9 @@ func (c *Client) SetVaultNotifications(ctx context.Context, params *SetVaultNoti addawsRestjson1_serdeOpSetVaultNotificationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_UploadArchive.go b/service/glacier/api_op_UploadArchive.go index 08353097bb1..05b21750c2e 100644 --- a/service/glacier/api_op_UploadArchive.go +++ b/service/glacier/api_op_UploadArchive.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -55,9 +54,9 @@ func (c *Client) UploadArchive(ctx context.Context, params *UploadArchiveInput, addawsRestjson1_serdeOpUploadArchiveMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/api_op_UploadMultipartPart.go b/service/glacier/api_op_UploadMultipartPart.go index 695e73ade5d..be1bcbd1675 100644 --- a/service/glacier/api_op_UploadMultipartPart.go +++ b/service/glacier/api_op_UploadMultipartPart.go @@ -5,7 +5,6 @@ package glacier import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" glaciercust "github.com/aws/aws-sdk-go-v2/service/glacier/internal/customizations" smithy "github.com/awslabs/smithy-go" @@ -59,9 +58,9 @@ func (c *Client) UploadMultipartPart(ctx context.Context, params *UploadMultipar addawsRestjson1_serdeOpUploadMultipartPartMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glacier/endpoints.go b/service/glacier/endpoints.go index 17545c38d08..4b19d5cfbe8 100644 --- a/service/glacier/endpoints.go +++ b/service/glacier/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/globalaccelerator/api_client.go b/service/globalaccelerator/api_client.go index b4f50a23fc8..32499c55293 100644 --- a/service/globalaccelerator/api_client.go +++ b/service/globalaccelerator/api_client.go @@ -164,34 +164,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -264,6 +236,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/globalaccelerator/api_op_AdvertiseByoipCidr.go b/service/globalaccelerator/api_op_AdvertiseByoipCidr.go index 3be74502f81..e1013878143 100644 --- a/service/globalaccelerator/api_op_AdvertiseByoipCidr.go +++ b/service/globalaccelerator/api_op_AdvertiseByoipCidr.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) AdvertiseByoipCidr(ctx context.Context, params *AdvertiseByoipC addawsAwsjson11_serdeOpAdvertiseByoipCidrMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_CreateAccelerator.go b/service/globalaccelerator/api_op_CreateAccelerator.go index 339f265b706..9e48ab60383 100644 --- a/service/globalaccelerator/api_op_CreateAccelerator.go +++ b/service/globalaccelerator/api_op_CreateAccelerator.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) CreateAccelerator(ctx context.Context, params *CreateAccelerato addawsAwsjson11_serdeOpCreateAcceleratorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_CreateEndpointGroup.go b/service/globalaccelerator/api_op_CreateEndpointGroup.go index 6229100e6c1..bb703de8003 100644 --- a/service/globalaccelerator/api_op_CreateEndpointGroup.go +++ b/service/globalaccelerator/api_op_CreateEndpointGroup.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateEndpointGroup(ctx context.Context, params *CreateEndpoint addawsAwsjson11_serdeOpCreateEndpointGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_CreateListener.go b/service/globalaccelerator/api_op_CreateListener.go index 07138fd805b..6da108d5223 100644 --- a/service/globalaccelerator/api_op_CreateListener.go +++ b/service/globalaccelerator/api_op_CreateListener.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateListener(ctx context.Context, params *CreateListenerInput addawsAwsjson11_serdeOpCreateListenerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_DeleteAccelerator.go b/service/globalaccelerator/api_op_DeleteAccelerator.go index c48a2e99737..8ba0c092ca1 100644 --- a/service/globalaccelerator/api_op_DeleteAccelerator.go +++ b/service/globalaccelerator/api_op_DeleteAccelerator.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -37,9 +36,9 @@ func (c *Client) DeleteAccelerator(ctx context.Context, params *DeleteAccelerato addawsAwsjson11_serdeOpDeleteAcceleratorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_DeleteEndpointGroup.go b/service/globalaccelerator/api_op_DeleteEndpointGroup.go index 36dcf8d0a51..1a36aa0dcdc 100644 --- a/service/globalaccelerator/api_op_DeleteEndpointGroup.go +++ b/service/globalaccelerator/api_op_DeleteEndpointGroup.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteEndpointGroup(ctx context.Context, params *DeleteEndpoint addawsAwsjson11_serdeOpDeleteEndpointGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_DeleteListener.go b/service/globalaccelerator/api_op_DeleteListener.go index fa55e4c88ae..b97af2108eb 100644 --- a/service/globalaccelerator/api_op_DeleteListener.go +++ b/service/globalaccelerator/api_op_DeleteListener.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteListener(ctx context.Context, params *DeleteListenerInput addawsAwsjson11_serdeOpDeleteListenerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_DeprovisionByoipCidr.go b/service/globalaccelerator/api_op_DeprovisionByoipCidr.go index 8c6ece681f6..610d1e74420 100644 --- a/service/globalaccelerator/api_op_DeprovisionByoipCidr.go +++ b/service/globalaccelerator/api_op_DeprovisionByoipCidr.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) DeprovisionByoipCidr(ctx context.Context, params *DeprovisionBy addawsAwsjson11_serdeOpDeprovisionByoipCidrMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_DescribeAccelerator.go b/service/globalaccelerator/api_op_DescribeAccelerator.go index c2ea43e8e90..f1836bb6aa2 100644 --- a/service/globalaccelerator/api_op_DescribeAccelerator.go +++ b/service/globalaccelerator/api_op_DescribeAccelerator.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAccelerator(ctx context.Context, params *DescribeAccele addawsAwsjson11_serdeOpDescribeAcceleratorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_DescribeAcceleratorAttributes.go b/service/globalaccelerator/api_op_DescribeAcceleratorAttributes.go index 7ae98b73f52..8405213934b 100644 --- a/service/globalaccelerator/api_op_DescribeAcceleratorAttributes.go +++ b/service/globalaccelerator/api_op_DescribeAcceleratorAttributes.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAcceleratorAttributes(ctx context.Context, params *Desc addawsAwsjson11_serdeOpDescribeAcceleratorAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_DescribeEndpointGroup.go b/service/globalaccelerator/api_op_DescribeEndpointGroup.go index 7cf3c41d008..ac081eb60f1 100644 --- a/service/globalaccelerator/api_op_DescribeEndpointGroup.go +++ b/service/globalaccelerator/api_op_DescribeEndpointGroup.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEndpointGroup(ctx context.Context, params *DescribeEndp addawsAwsjson11_serdeOpDescribeEndpointGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_DescribeListener.go b/service/globalaccelerator/api_op_DescribeListener.go index 3d941cccb88..8d1c1a34cbd 100644 --- a/service/globalaccelerator/api_op_DescribeListener.go +++ b/service/globalaccelerator/api_op_DescribeListener.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeListener(ctx context.Context, params *DescribeListenerI addawsAwsjson11_serdeOpDescribeListenerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_ListAccelerators.go b/service/globalaccelerator/api_op_ListAccelerators.go index 58e175f006c..c2ae2b47797 100644 --- a/service/globalaccelerator/api_op_ListAccelerators.go +++ b/service/globalaccelerator/api_op_ListAccelerators.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListAccelerators(ctx context.Context, params *ListAcceleratorsI addawsAwsjson11_serdeOpListAcceleratorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_ListByoipCidrs.go b/service/globalaccelerator/api_op_ListByoipCidrs.go index e6fc9244966..6ede084a11e 100644 --- a/service/globalaccelerator/api_op_ListByoipCidrs.go +++ b/service/globalaccelerator/api_op_ListByoipCidrs.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListByoipCidrs(ctx context.Context, params *ListByoipCidrsInput addawsAwsjson11_serdeOpListByoipCidrsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_ListEndpointGroups.go b/service/globalaccelerator/api_op_ListEndpointGroups.go index 99756eae4fd..45af33cb7d6 100644 --- a/service/globalaccelerator/api_op_ListEndpointGroups.go +++ b/service/globalaccelerator/api_op_ListEndpointGroups.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListEndpointGroups(ctx context.Context, params *ListEndpointGro addawsAwsjson11_serdeOpListEndpointGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_ListListeners.go b/service/globalaccelerator/api_op_ListListeners.go index 52da8894163..8f1b72a0d65 100644 --- a/service/globalaccelerator/api_op_ListListeners.go +++ b/service/globalaccelerator/api_op_ListListeners.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListListeners(ctx context.Context, params *ListListenersInput, addawsAwsjson11_serdeOpListListenersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_ListTagsForResource.go b/service/globalaccelerator/api_op_ListTagsForResource.go index bf4032018c7..3ca0be12509 100644 --- a/service/globalaccelerator/api_op_ListTagsForResource.go +++ b/service/globalaccelerator/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_ProvisionByoipCidr.go b/service/globalaccelerator/api_op_ProvisionByoipCidr.go index 777ad8eaf32..850b588e73d 100644 --- a/service/globalaccelerator/api_op_ProvisionByoipCidr.go +++ b/service/globalaccelerator/api_op_ProvisionByoipCidr.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) ProvisionByoipCidr(ctx context.Context, params *ProvisionByoipC addawsAwsjson11_serdeOpProvisionByoipCidrMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_TagResource.go b/service/globalaccelerator/api_op_TagResource.go index 6e3d98e3679..1c1c6755e65 100644 --- a/service/globalaccelerator/api_op_TagResource.go +++ b/service/globalaccelerator/api_op_TagResource.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_UntagResource.go b/service/globalaccelerator/api_op_UntagResource.go index 8c9544d2a77..60296837268 100644 --- a/service/globalaccelerator/api_op_UntagResource.go +++ b/service/globalaccelerator/api_op_UntagResource.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_UpdateAccelerator.go b/service/globalaccelerator/api_op_UpdateAccelerator.go index 0e94997faa4..c279559f74a 100644 --- a/service/globalaccelerator/api_op_UpdateAccelerator.go +++ b/service/globalaccelerator/api_op_UpdateAccelerator.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateAccelerator(ctx context.Context, params *UpdateAccelerato addawsAwsjson11_serdeOpUpdateAcceleratorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_UpdateAcceleratorAttributes.go b/service/globalaccelerator/api_op_UpdateAcceleratorAttributes.go index 593cfca5ae3..6903b445170 100644 --- a/service/globalaccelerator/api_op_UpdateAcceleratorAttributes.go +++ b/service/globalaccelerator/api_op_UpdateAcceleratorAttributes.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateAcceleratorAttributes(ctx context.Context, params *Update addawsAwsjson11_serdeOpUpdateAcceleratorAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_UpdateEndpointGroup.go b/service/globalaccelerator/api_op_UpdateEndpointGroup.go index de46b880f14..6b02a325786 100644 --- a/service/globalaccelerator/api_op_UpdateEndpointGroup.go +++ b/service/globalaccelerator/api_op_UpdateEndpointGroup.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateEndpointGroup(ctx context.Context, params *UpdateEndpoint addawsAwsjson11_serdeOpUpdateEndpointGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_UpdateListener.go b/service/globalaccelerator/api_op_UpdateListener.go index 7dd47c054fc..2c98fd9b954 100644 --- a/service/globalaccelerator/api_op_UpdateListener.go +++ b/service/globalaccelerator/api_op_UpdateListener.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateListener(ctx context.Context, params *UpdateListenerInput addawsAwsjson11_serdeOpUpdateListenerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/api_op_WithdrawByoipCidr.go b/service/globalaccelerator/api_op_WithdrawByoipCidr.go index 3adeed82b4e..c42af8bc76b 100644 --- a/service/globalaccelerator/api_op_WithdrawByoipCidr.go +++ b/service/globalaccelerator/api_op_WithdrawByoipCidr.go @@ -5,7 +5,6 @@ package globalaccelerator import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/globalaccelerator/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) WithdrawByoipCidr(ctx context.Context, params *WithdrawByoipCid addawsAwsjson11_serdeOpWithdrawByoipCidrMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/globalaccelerator/endpoints.go b/service/globalaccelerator/endpoints.go index ad086ad22b1..584257ec53a 100644 --- a/service/globalaccelerator/endpoints.go +++ b/service/globalaccelerator/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/glue/api_client.go b/service/glue/api_client.go index b52095c4cf1..81c7edecc6f 100644 --- a/service/glue/api_client.go +++ b/service/glue/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/glue/api_op_BatchCreatePartition.go b/service/glue/api_op_BatchCreatePartition.go index f364953d010..cfd7146ee6f 100644 --- a/service/glue/api_op_BatchCreatePartition.go +++ b/service/glue/api_op_BatchCreatePartition.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchCreatePartition(ctx context.Context, params *BatchCreatePa addawsAwsjson11_serdeOpBatchCreatePartitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_BatchDeleteConnection.go b/service/glue/api_op_BatchDeleteConnection.go index 61744d9f6cc..3d1863ad2bd 100644 --- a/service/glue/api_op_BatchDeleteConnection.go +++ b/service/glue/api_op_BatchDeleteConnection.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchDeleteConnection(ctx context.Context, params *BatchDeleteC addawsAwsjson11_serdeOpBatchDeleteConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_BatchDeletePartition.go b/service/glue/api_op_BatchDeletePartition.go index 1e4683c7c65..fb290c3587d 100644 --- a/service/glue/api_op_BatchDeletePartition.go +++ b/service/glue/api_op_BatchDeletePartition.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchDeletePartition(ctx context.Context, params *BatchDeletePa addawsAwsjson11_serdeOpBatchDeletePartitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_BatchDeleteTable.go b/service/glue/api_op_BatchDeleteTable.go index 1bc995f6c40..01554689218 100644 --- a/service/glue/api_op_BatchDeleteTable.go +++ b/service/glue/api_op_BatchDeleteTable.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) BatchDeleteTable(ctx context.Context, params *BatchDeleteTableI addawsAwsjson11_serdeOpBatchDeleteTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_BatchDeleteTableVersion.go b/service/glue/api_op_BatchDeleteTableVersion.go index fc9b8e889c4..b3cd8f69ac9 100644 --- a/service/glue/api_op_BatchDeleteTableVersion.go +++ b/service/glue/api_op_BatchDeleteTableVersion.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchDeleteTableVersion(ctx context.Context, params *BatchDelet addawsAwsjson11_serdeOpBatchDeleteTableVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_BatchGetCrawlers.go b/service/glue/api_op_BatchGetCrawlers.go index 00a1d9d6ac7..9d23774a5e1 100644 --- a/service/glue/api_op_BatchGetCrawlers.go +++ b/service/glue/api_op_BatchGetCrawlers.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) BatchGetCrawlers(ctx context.Context, params *BatchGetCrawlersI addawsAwsjson11_serdeOpBatchGetCrawlersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_BatchGetDevEndpoints.go b/service/glue/api_op_BatchGetDevEndpoints.go index 15e71206292..034b91ca25b 100644 --- a/service/glue/api_op_BatchGetDevEndpoints.go +++ b/service/glue/api_op_BatchGetDevEndpoints.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) BatchGetDevEndpoints(ctx context.Context, params *BatchGetDevEn addawsAwsjson11_serdeOpBatchGetDevEndpointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_BatchGetJobs.go b/service/glue/api_op_BatchGetJobs.go index 6cc95eea0b9..88d7ad3045e 100644 --- a/service/glue/api_op_BatchGetJobs.go +++ b/service/glue/api_op_BatchGetJobs.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) BatchGetJobs(ctx context.Context, params *BatchGetJobsInput, op addawsAwsjson11_serdeOpBatchGetJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_BatchGetPartition.go b/service/glue/api_op_BatchGetPartition.go index a0c33022850..2763f398c59 100644 --- a/service/glue/api_op_BatchGetPartition.go +++ b/service/glue/api_op_BatchGetPartition.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchGetPartition(ctx context.Context, params *BatchGetPartitio addawsAwsjson11_serdeOpBatchGetPartitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_BatchGetTriggers.go b/service/glue/api_op_BatchGetTriggers.go index 03f661ecf34..0b50d7ed2a6 100644 --- a/service/glue/api_op_BatchGetTriggers.go +++ b/service/glue/api_op_BatchGetTriggers.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) BatchGetTriggers(ctx context.Context, params *BatchGetTriggersI addawsAwsjson11_serdeOpBatchGetTriggersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_BatchGetWorkflows.go b/service/glue/api_op_BatchGetWorkflows.go index 9854938dcb8..e6b08dbb34b 100644 --- a/service/glue/api_op_BatchGetWorkflows.go +++ b/service/glue/api_op_BatchGetWorkflows.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) BatchGetWorkflows(ctx context.Context, params *BatchGetWorkflow addawsAwsjson11_serdeOpBatchGetWorkflowsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_BatchStopJobRun.go b/service/glue/api_op_BatchStopJobRun.go index 0e5e70faed1..9a0d0fb0e65 100644 --- a/service/glue/api_op_BatchStopJobRun.go +++ b/service/glue/api_op_BatchStopJobRun.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchStopJobRun(ctx context.Context, params *BatchStopJobRunInp addawsAwsjson11_serdeOpBatchStopJobRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_CancelMLTaskRun.go b/service/glue/api_op_CancelMLTaskRun.go index ad254158b94..dafef58c80a 100644 --- a/service/glue/api_op_CancelMLTaskRun.go +++ b/service/glue/api_op_CancelMLTaskRun.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CancelMLTaskRun(ctx context.Context, params *CancelMLTaskRunInp addawsAwsjson11_serdeOpCancelMLTaskRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_CreateClassifier.go b/service/glue/api_op_CreateClassifier.go index 040cb145d48..e23c5632803 100644 --- a/service/glue/api_op_CreateClassifier.go +++ b/service/glue/api_op_CreateClassifier.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateClassifier(ctx context.Context, params *CreateClassifierI addawsAwsjson11_serdeOpCreateClassifierMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_CreateConnection.go b/service/glue/api_op_CreateConnection.go index caad0bafac2..60702c8b833 100644 --- a/service/glue/api_op_CreateConnection.go +++ b/service/glue/api_op_CreateConnection.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateConnection(ctx context.Context, params *CreateConnectionI addawsAwsjson11_serdeOpCreateConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_CreateCrawler.go b/service/glue/api_op_CreateCrawler.go index 5d72d0a0e88..f18cb12584c 100644 --- a/service/glue/api_op_CreateCrawler.go +++ b/service/glue/api_op_CreateCrawler.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateCrawler(ctx context.Context, params *CreateCrawlerInput, addawsAwsjson11_serdeOpCreateCrawlerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_CreateDatabase.go b/service/glue/api_op_CreateDatabase.go index c789533fef7..e38c0a66308 100644 --- a/service/glue/api_op_CreateDatabase.go +++ b/service/glue/api_op_CreateDatabase.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDatabase(ctx context.Context, params *CreateDatabaseInput addawsAwsjson11_serdeOpCreateDatabaseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_CreateDevEndpoint.go b/service/glue/api_op_CreateDevEndpoint.go index 7fdb46f4818..e0cfce49db5 100644 --- a/service/glue/api_op_CreateDevEndpoint.go +++ b/service/glue/api_op_CreateDevEndpoint.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateDevEndpoint(ctx context.Context, params *CreateDevEndpoin addawsAwsjson11_serdeOpCreateDevEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_CreateJob.go b/service/glue/api_op_CreateJob.go index 891c694f5be..5e524b469f4 100644 --- a/service/glue/api_op_CreateJob.go +++ b/service/glue/api_op_CreateJob.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateJob(ctx context.Context, params *CreateJobInput, optFns . addawsAwsjson11_serdeOpCreateJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_CreateMLTransform.go b/service/glue/api_op_CreateMLTransform.go index 4895265016c..b8e05c4febf 100644 --- a/service/glue/api_op_CreateMLTransform.go +++ b/service/glue/api_op_CreateMLTransform.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) CreateMLTransform(ctx context.Context, params *CreateMLTransfor addawsAwsjson11_serdeOpCreateMLTransformMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_CreatePartition.go b/service/glue/api_op_CreatePartition.go index 78bd1f20440..1bee1df2247 100644 --- a/service/glue/api_op_CreatePartition.go +++ b/service/glue/api_op_CreatePartition.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreatePartition(ctx context.Context, params *CreatePartitionInp addawsAwsjson11_serdeOpCreatePartitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_CreateScript.go b/service/glue/api_op_CreateScript.go index e83a3e94fdf..015cb54f120 100644 --- a/service/glue/api_op_CreateScript.go +++ b/service/glue/api_op_CreateScript.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateScript(ctx context.Context, params *CreateScriptInput, op addawsAwsjson11_serdeOpCreateScriptMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_CreateSecurityConfiguration.go b/service/glue/api_op_CreateSecurityConfiguration.go index b986f347154..b49a201b5be 100644 --- a/service/glue/api_op_CreateSecurityConfiguration.go +++ b/service/glue/api_op_CreateSecurityConfiguration.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateSecurityConfiguration(ctx context.Context, params *Create addawsAwsjson11_serdeOpCreateSecurityConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_CreateTable.go b/service/glue/api_op_CreateTable.go index 547ba40aced..8e0af56d655 100644 --- a/service/glue/api_op_CreateTable.go +++ b/service/glue/api_op_CreateTable.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateTable(ctx context.Context, params *CreateTableInput, optF addawsAwsjson11_serdeOpCreateTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_CreateTrigger.go b/service/glue/api_op_CreateTrigger.go index 4f9bfd3c761..3fd5cbd2404 100644 --- a/service/glue/api_op_CreateTrigger.go +++ b/service/glue/api_op_CreateTrigger.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateTrigger(ctx context.Context, params *CreateTriggerInput, addawsAwsjson11_serdeOpCreateTriggerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_CreateUserDefinedFunction.go b/service/glue/api_op_CreateUserDefinedFunction.go index 7dd1ff7c75f..cff037a4f29 100644 --- a/service/glue/api_op_CreateUserDefinedFunction.go +++ b/service/glue/api_op_CreateUserDefinedFunction.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateUserDefinedFunction(ctx context.Context, params *CreateUs addawsAwsjson11_serdeOpCreateUserDefinedFunctionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_CreateWorkflow.go b/service/glue/api_op_CreateWorkflow.go index 57205d1c861..10cc1678853 100644 --- a/service/glue/api_op_CreateWorkflow.go +++ b/service/glue/api_op_CreateWorkflow.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateWorkflow(ctx context.Context, params *CreateWorkflowInput addawsAwsjson11_serdeOpCreateWorkflowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_DeleteClassifier.go b/service/glue/api_op_DeleteClassifier.go index cee479c5417..c24a8fefea4 100644 --- a/service/glue/api_op_DeleteClassifier.go +++ b/service/glue/api_op_DeleteClassifier.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteClassifier(ctx context.Context, params *DeleteClassifierI addawsAwsjson11_serdeOpDeleteClassifierMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_DeleteColumnStatisticsForPartition.go b/service/glue/api_op_DeleteColumnStatisticsForPartition.go index 4b367f5e225..b6832f6e28a 100644 --- a/service/glue/api_op_DeleteColumnStatisticsForPartition.go +++ b/service/glue/api_op_DeleteColumnStatisticsForPartition.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteColumnStatisticsForPartition(ctx context.Context, params addawsAwsjson11_serdeOpDeleteColumnStatisticsForPartitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_DeleteColumnStatisticsForTable.go b/service/glue/api_op_DeleteColumnStatisticsForTable.go index f9d62dc114b..9b17eebedd7 100644 --- a/service/glue/api_op_DeleteColumnStatisticsForTable.go +++ b/service/glue/api_op_DeleteColumnStatisticsForTable.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteColumnStatisticsForTable(ctx context.Context, params *Del addawsAwsjson11_serdeOpDeleteColumnStatisticsForTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_DeleteConnection.go b/service/glue/api_op_DeleteConnection.go index b80d2503ff9..e81c81c3483 100644 --- a/service/glue/api_op_DeleteConnection.go +++ b/service/glue/api_op_DeleteConnection.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteConnection(ctx context.Context, params *DeleteConnectionI addawsAwsjson11_serdeOpDeleteConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_DeleteCrawler.go b/service/glue/api_op_DeleteCrawler.go index 4ad7fddfff3..7c13b4b7e7e 100644 --- a/service/glue/api_op_DeleteCrawler.go +++ b/service/glue/api_op_DeleteCrawler.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteCrawler(ctx context.Context, params *DeleteCrawlerInput, addawsAwsjson11_serdeOpDeleteCrawlerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_DeleteDatabase.go b/service/glue/api_op_DeleteDatabase.go index 197494d5f44..5b1d72b7a58 100644 --- a/service/glue/api_op_DeleteDatabase.go +++ b/service/glue/api_op_DeleteDatabase.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) DeleteDatabase(ctx context.Context, params *DeleteDatabaseInput addawsAwsjson11_serdeOpDeleteDatabaseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_DeleteDevEndpoint.go b/service/glue/api_op_DeleteDevEndpoint.go index d375f74b614..2c2aabdb9a7 100644 --- a/service/glue/api_op_DeleteDevEndpoint.go +++ b/service/glue/api_op_DeleteDevEndpoint.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDevEndpoint(ctx context.Context, params *DeleteDevEndpoin addawsAwsjson11_serdeOpDeleteDevEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_DeleteJob.go b/service/glue/api_op_DeleteJob.go index f07dce96a17..71789e8d8df 100644 --- a/service/glue/api_op_DeleteJob.go +++ b/service/glue/api_op_DeleteJob.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteJob(ctx context.Context, params *DeleteJobInput, optFns . addawsAwsjson11_serdeOpDeleteJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_DeleteMLTransform.go b/service/glue/api_op_DeleteMLTransform.go index 7379dc8ef2c..7c0c496041f 100644 --- a/service/glue/api_op_DeleteMLTransform.go +++ b/service/glue/api_op_DeleteMLTransform.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteMLTransform(ctx context.Context, params *DeleteMLTransfor addawsAwsjson11_serdeOpDeleteMLTransformMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_DeletePartition.go b/service/glue/api_op_DeletePartition.go index f2aa202ce9c..127d2523917 100644 --- a/service/glue/api_op_DeletePartition.go +++ b/service/glue/api_op_DeletePartition.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeletePartition(ctx context.Context, params *DeletePartitionInp addawsAwsjson11_serdeOpDeletePartitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_DeleteResourcePolicy.go b/service/glue/api_op_DeleteResourcePolicy.go index f14b2ea8303..365fef15624 100644 --- a/service/glue/api_op_DeleteResourcePolicy.go +++ b/service/glue/api_op_DeleteResourcePolicy.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteResourcePolicy(ctx context.Context, params *DeleteResourc addawsAwsjson11_serdeOpDeleteResourcePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_DeleteSecurityConfiguration.go b/service/glue/api_op_DeleteSecurityConfiguration.go index d1c72f4cecc..a1b7dab6907 100644 --- a/service/glue/api_op_DeleteSecurityConfiguration.go +++ b/service/glue/api_op_DeleteSecurityConfiguration.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSecurityConfiguration(ctx context.Context, params *Delete addawsAwsjson11_serdeOpDeleteSecurityConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_DeleteTable.go b/service/glue/api_op_DeleteTable.go index bff2a1420bb..ae69dea9c77 100644 --- a/service/glue/api_op_DeleteTable.go +++ b/service/glue/api_op_DeleteTable.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeleteTable(ctx context.Context, params *DeleteTableInput, optF addawsAwsjson11_serdeOpDeleteTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_DeleteTableVersion.go b/service/glue/api_op_DeleteTableVersion.go index c2df366ca05..dd96fcda2d4 100644 --- a/service/glue/api_op_DeleteTableVersion.go +++ b/service/glue/api_op_DeleteTableVersion.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteTableVersion(ctx context.Context, params *DeleteTableVers addawsAwsjson11_serdeOpDeleteTableVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_DeleteTrigger.go b/service/glue/api_op_DeleteTrigger.go index a52fc02b7cb..31407078641 100644 --- a/service/glue/api_op_DeleteTrigger.go +++ b/service/glue/api_op_DeleteTrigger.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteTrigger(ctx context.Context, params *DeleteTriggerInput, addawsAwsjson11_serdeOpDeleteTriggerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_DeleteUserDefinedFunction.go b/service/glue/api_op_DeleteUserDefinedFunction.go index ad2c853233b..749f804c5b8 100644 --- a/service/glue/api_op_DeleteUserDefinedFunction.go +++ b/service/glue/api_op_DeleteUserDefinedFunction.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteUserDefinedFunction(ctx context.Context, params *DeleteUs addawsAwsjson11_serdeOpDeleteUserDefinedFunctionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_DeleteWorkflow.go b/service/glue/api_op_DeleteWorkflow.go index 5deab7c79f1..9bf6becba7f 100644 --- a/service/glue/api_op_DeleteWorkflow.go +++ b/service/glue/api_op_DeleteWorkflow.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteWorkflow(ctx context.Context, params *DeleteWorkflowInput addawsAwsjson11_serdeOpDeleteWorkflowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetCatalogImportStatus.go b/service/glue/api_op_GetCatalogImportStatus.go index 1e523a4c5ac..4d02fd1af38 100644 --- a/service/glue/api_op_GetCatalogImportStatus.go +++ b/service/glue/api_op_GetCatalogImportStatus.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetCatalogImportStatus(ctx context.Context, params *GetCatalogI addawsAwsjson11_serdeOpGetCatalogImportStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetClassifier.go b/service/glue/api_op_GetClassifier.go index 83b68d3c1c4..8bcf4d87553 100644 --- a/service/glue/api_op_GetClassifier.go +++ b/service/glue/api_op_GetClassifier.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetClassifier(ctx context.Context, params *GetClassifierInput, addawsAwsjson11_serdeOpGetClassifierMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetClassifiers.go b/service/glue/api_op_GetClassifiers.go index 2a1f3f591d3..6411550454c 100644 --- a/service/glue/api_op_GetClassifiers.go +++ b/service/glue/api_op_GetClassifiers.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetClassifiers(ctx context.Context, params *GetClassifiersInput addawsAwsjson11_serdeOpGetClassifiersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetColumnStatisticsForPartition.go b/service/glue/api_op_GetColumnStatisticsForPartition.go index d5e53315061..75d95774630 100644 --- a/service/glue/api_op_GetColumnStatisticsForPartition.go +++ b/service/glue/api_op_GetColumnStatisticsForPartition.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetColumnStatisticsForPartition(ctx context.Context, params *Ge addawsAwsjson11_serdeOpGetColumnStatisticsForPartitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetColumnStatisticsForTable.go b/service/glue/api_op_GetColumnStatisticsForTable.go index 2ac8e72e590..e5f1a908b41 100644 --- a/service/glue/api_op_GetColumnStatisticsForTable.go +++ b/service/glue/api_op_GetColumnStatisticsForTable.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetColumnStatisticsForTable(ctx context.Context, params *GetCol addawsAwsjson11_serdeOpGetColumnStatisticsForTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetConnection.go b/service/glue/api_op_GetConnection.go index ec99d2624b3..703a7a5f8bf 100644 --- a/service/glue/api_op_GetConnection.go +++ b/service/glue/api_op_GetConnection.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetConnection(ctx context.Context, params *GetConnectionInput, addawsAwsjson11_serdeOpGetConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetConnections.go b/service/glue/api_op_GetConnections.go index 85da3ee709d..1c4ef2f82b0 100644 --- a/service/glue/api_op_GetConnections.go +++ b/service/glue/api_op_GetConnections.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetConnections(ctx context.Context, params *GetConnectionsInput addawsAwsjson11_serdeOpGetConnectionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetCrawler.go b/service/glue/api_op_GetCrawler.go index 1628d957f5e..3bc07085381 100644 --- a/service/glue/api_op_GetCrawler.go +++ b/service/glue/api_op_GetCrawler.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetCrawler(ctx context.Context, params *GetCrawlerInput, optFns addawsAwsjson11_serdeOpGetCrawlerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetCrawlerMetrics.go b/service/glue/api_op_GetCrawlerMetrics.go index 19107929a59..5a88e38a588 100644 --- a/service/glue/api_op_GetCrawlerMetrics.go +++ b/service/glue/api_op_GetCrawlerMetrics.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetCrawlerMetrics(ctx context.Context, params *GetCrawlerMetric addawsAwsjson11_serdeOpGetCrawlerMetricsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetCrawlers.go b/service/glue/api_op_GetCrawlers.go index 2f704798ff0..d4e93842119 100644 --- a/service/glue/api_op_GetCrawlers.go +++ b/service/glue/api_op_GetCrawlers.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetCrawlers(ctx context.Context, params *GetCrawlersInput, optF addawsAwsjson11_serdeOpGetCrawlersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetDataCatalogEncryptionSettings.go b/service/glue/api_op_GetDataCatalogEncryptionSettings.go index 10f86ca3bf3..bafdd72ca28 100644 --- a/service/glue/api_op_GetDataCatalogEncryptionSettings.go +++ b/service/glue/api_op_GetDataCatalogEncryptionSettings.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDataCatalogEncryptionSettings(ctx context.Context, params *G addawsAwsjson11_serdeOpGetDataCatalogEncryptionSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetDatabase.go b/service/glue/api_op_GetDatabase.go index e3c4d11006f..b7e5ca987f3 100644 --- a/service/glue/api_op_GetDatabase.go +++ b/service/glue/api_op_GetDatabase.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDatabase(ctx context.Context, params *GetDatabaseInput, optF addawsAwsjson11_serdeOpGetDatabaseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetDatabases.go b/service/glue/api_op_GetDatabases.go index 4e2fb98bb7c..a50b56c2b42 100644 --- a/service/glue/api_op_GetDatabases.go +++ b/service/glue/api_op_GetDatabases.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDatabases(ctx context.Context, params *GetDatabasesInput, op addawsAwsjson11_serdeOpGetDatabasesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetDataflowGraph.go b/service/glue/api_op_GetDataflowGraph.go index ae5bc1f310b..68436096932 100644 --- a/service/glue/api_op_GetDataflowGraph.go +++ b/service/glue/api_op_GetDataflowGraph.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDataflowGraph(ctx context.Context, params *GetDataflowGraphI addawsAwsjson11_serdeOpGetDataflowGraphMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetDevEndpoint.go b/service/glue/api_op_GetDevEndpoint.go index d47b801f478..dfdb0767412 100644 --- a/service/glue/api_op_GetDevEndpoint.go +++ b/service/glue/api_op_GetDevEndpoint.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetDevEndpoint(ctx context.Context, params *GetDevEndpointInput addawsAwsjson11_serdeOpGetDevEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetDevEndpoints.go b/service/glue/api_op_GetDevEndpoints.go index 9c7784e8498..c49dd00f51c 100644 --- a/service/glue/api_op_GetDevEndpoints.go +++ b/service/glue/api_op_GetDevEndpoints.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetDevEndpoints(ctx context.Context, params *GetDevEndpointsInp addawsAwsjson11_serdeOpGetDevEndpointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetJob.go b/service/glue/api_op_GetJob.go index 08410c2271c..0f429df863c 100644 --- a/service/glue/api_op_GetJob.go +++ b/service/glue/api_op_GetJob.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetJob(ctx context.Context, params *GetJobInput, optFns ...func addawsAwsjson11_serdeOpGetJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetJobBookmark.go b/service/glue/api_op_GetJobBookmark.go index 2feecff7d51..68c5e91d405 100644 --- a/service/glue/api_op_GetJobBookmark.go +++ b/service/glue/api_op_GetJobBookmark.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetJobBookmark(ctx context.Context, params *GetJobBookmarkInput addawsAwsjson11_serdeOpGetJobBookmarkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetJobRun.go b/service/glue/api_op_GetJobRun.go index b2ab992e709..eae8059b5ed 100644 --- a/service/glue/api_op_GetJobRun.go +++ b/service/glue/api_op_GetJobRun.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetJobRun(ctx context.Context, params *GetJobRunInput, optFns . addawsAwsjson11_serdeOpGetJobRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetJobRuns.go b/service/glue/api_op_GetJobRuns.go index e019aef904f..334908f1f36 100644 --- a/service/glue/api_op_GetJobRuns.go +++ b/service/glue/api_op_GetJobRuns.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetJobRuns(ctx context.Context, params *GetJobRunsInput, optFns addawsAwsjson11_serdeOpGetJobRunsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetJobs.go b/service/glue/api_op_GetJobs.go index b350a1bd6fc..1b93e0cea5d 100644 --- a/service/glue/api_op_GetJobs.go +++ b/service/glue/api_op_GetJobs.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetJobs(ctx context.Context, params *GetJobsInput, optFns ...fu addawsAwsjson11_serdeOpGetJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetMLTaskRun.go b/service/glue/api_op_GetMLTaskRun.go index 673e711c6b6..4ffc6a1f236 100644 --- a/service/glue/api_op_GetMLTaskRun.go +++ b/service/glue/api_op_GetMLTaskRun.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetMLTaskRun(ctx context.Context, params *GetMLTaskRunInput, op addawsAwsjson11_serdeOpGetMLTaskRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetMLTaskRuns.go b/service/glue/api_op_GetMLTaskRuns.go index 80b3208ff85..7d56920330b 100644 --- a/service/glue/api_op_GetMLTaskRuns.go +++ b/service/glue/api_op_GetMLTaskRuns.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetMLTaskRuns(ctx context.Context, params *GetMLTaskRunsInput, addawsAwsjson11_serdeOpGetMLTaskRunsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetMLTransform.go b/service/glue/api_op_GetMLTransform.go index 0f312e569e8..a81885bd5e6 100644 --- a/service/glue/api_op_GetMLTransform.go +++ b/service/glue/api_op_GetMLTransform.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetMLTransform(ctx context.Context, params *GetMLTransformInput addawsAwsjson11_serdeOpGetMLTransformMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetMLTransforms.go b/service/glue/api_op_GetMLTransforms.go index 973db1b3be6..30bc1769d2f 100644 --- a/service/glue/api_op_GetMLTransforms.go +++ b/service/glue/api_op_GetMLTransforms.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetMLTransforms(ctx context.Context, params *GetMLTransformsInp addawsAwsjson11_serdeOpGetMLTransformsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetMapping.go b/service/glue/api_op_GetMapping.go index 772336c2f31..90e4bc671c5 100644 --- a/service/glue/api_op_GetMapping.go +++ b/service/glue/api_op_GetMapping.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetMapping(ctx context.Context, params *GetMappingInput, optFns addawsAwsjson11_serdeOpGetMappingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetPartition.go b/service/glue/api_op_GetPartition.go index 90de9c4d0de..4e1cbdc41ae 100644 --- a/service/glue/api_op_GetPartition.go +++ b/service/glue/api_op_GetPartition.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetPartition(ctx context.Context, params *GetPartitionInput, op addawsAwsjson11_serdeOpGetPartitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetPartitions.go b/service/glue/api_op_GetPartitions.go index 0591ee12025..32ce9923a7c 100644 --- a/service/glue/api_op_GetPartitions.go +++ b/service/glue/api_op_GetPartitions.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetPartitions(ctx context.Context, params *GetPartitionsInput, addawsAwsjson11_serdeOpGetPartitionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetPlan.go b/service/glue/api_op_GetPlan.go index b1f75561186..9a4488f87f2 100644 --- a/service/glue/api_op_GetPlan.go +++ b/service/glue/api_op_GetPlan.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetPlan(ctx context.Context, params *GetPlanInput, optFns ...fu addawsAwsjson11_serdeOpGetPlanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetResourcePolicies.go b/service/glue/api_op_GetResourcePolicies.go index 8f1bdaa250b..442e6a24439 100644 --- a/service/glue/api_op_GetResourcePolicies.go +++ b/service/glue/api_op_GetResourcePolicies.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetResourcePolicies(ctx context.Context, params *GetResourcePol addawsAwsjson11_serdeOpGetResourcePoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetResourcePolicy.go b/service/glue/api_op_GetResourcePolicy.go index 3ebc6c1b2a2..56f64321ce8 100644 --- a/service/glue/api_op_GetResourcePolicy.go +++ b/service/glue/api_op_GetResourcePolicy.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetResourcePolicy(ctx context.Context, params *GetResourcePolic addawsAwsjson11_serdeOpGetResourcePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetSecurityConfiguration.go b/service/glue/api_op_GetSecurityConfiguration.go index 4cbcdbb37e6..075a872079a 100644 --- a/service/glue/api_op_GetSecurityConfiguration.go +++ b/service/glue/api_op_GetSecurityConfiguration.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetSecurityConfiguration(ctx context.Context, params *GetSecuri addawsAwsjson11_serdeOpGetSecurityConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetSecurityConfigurations.go b/service/glue/api_op_GetSecurityConfigurations.go index 393cb69d8b4..b15a6e1891e 100644 --- a/service/glue/api_op_GetSecurityConfigurations.go +++ b/service/glue/api_op_GetSecurityConfigurations.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetSecurityConfigurations(ctx context.Context, params *GetSecur addawsAwsjson11_serdeOpGetSecurityConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetTable.go b/service/glue/api_op_GetTable.go index 2cd0018584f..4db59914dfc 100644 --- a/service/glue/api_op_GetTable.go +++ b/service/glue/api_op_GetTable.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetTable(ctx context.Context, params *GetTableInput, optFns ... addawsAwsjson11_serdeOpGetTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetTableVersion.go b/service/glue/api_op_GetTableVersion.go index 006c7cb7cdd..02298ee2147 100644 --- a/service/glue/api_op_GetTableVersion.go +++ b/service/glue/api_op_GetTableVersion.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetTableVersion(ctx context.Context, params *GetTableVersionInp addawsAwsjson11_serdeOpGetTableVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetTableVersions.go b/service/glue/api_op_GetTableVersions.go index 333ddbc7106..a47c0985661 100644 --- a/service/glue/api_op_GetTableVersions.go +++ b/service/glue/api_op_GetTableVersions.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetTableVersions(ctx context.Context, params *GetTableVersionsI addawsAwsjson11_serdeOpGetTableVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetTables.go b/service/glue/api_op_GetTables.go index a0f529e41f3..7c53ddecb72 100644 --- a/service/glue/api_op_GetTables.go +++ b/service/glue/api_op_GetTables.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetTables(ctx context.Context, params *GetTablesInput, optFns . addawsAwsjson11_serdeOpGetTablesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetTags.go b/service/glue/api_op_GetTags.go index 402c9f6a1b1..4d105145404 100644 --- a/service/glue/api_op_GetTags.go +++ b/service/glue/api_op_GetTags.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetTags(ctx context.Context, params *GetTagsInput, optFns ...fu addawsAwsjson11_serdeOpGetTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetTrigger.go b/service/glue/api_op_GetTrigger.go index 511a1607256..99841fc2202 100644 --- a/service/glue/api_op_GetTrigger.go +++ b/service/glue/api_op_GetTrigger.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetTrigger(ctx context.Context, params *GetTriggerInput, optFns addawsAwsjson11_serdeOpGetTriggerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetTriggers.go b/service/glue/api_op_GetTriggers.go index ce8b1f5e881..417e2936055 100644 --- a/service/glue/api_op_GetTriggers.go +++ b/service/glue/api_op_GetTriggers.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetTriggers(ctx context.Context, params *GetTriggersInput, optF addawsAwsjson11_serdeOpGetTriggersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetUserDefinedFunction.go b/service/glue/api_op_GetUserDefinedFunction.go index 411bdcf65c7..257e761fdac 100644 --- a/service/glue/api_op_GetUserDefinedFunction.go +++ b/service/glue/api_op_GetUserDefinedFunction.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetUserDefinedFunction(ctx context.Context, params *GetUserDefi addawsAwsjson11_serdeOpGetUserDefinedFunctionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetUserDefinedFunctions.go b/service/glue/api_op_GetUserDefinedFunctions.go index d210a0f73fd..b8b1588d867 100644 --- a/service/glue/api_op_GetUserDefinedFunctions.go +++ b/service/glue/api_op_GetUserDefinedFunctions.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetUserDefinedFunctions(ctx context.Context, params *GetUserDef addawsAwsjson11_serdeOpGetUserDefinedFunctionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetWorkflow.go b/service/glue/api_op_GetWorkflow.go index b94092fa114..602984121f6 100644 --- a/service/glue/api_op_GetWorkflow.go +++ b/service/glue/api_op_GetWorkflow.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetWorkflow(ctx context.Context, params *GetWorkflowInput, optF addawsAwsjson11_serdeOpGetWorkflowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetWorkflowRun.go b/service/glue/api_op_GetWorkflowRun.go index 8399099f23d..a8f1abf6e37 100644 --- a/service/glue/api_op_GetWorkflowRun.go +++ b/service/glue/api_op_GetWorkflowRun.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetWorkflowRun(ctx context.Context, params *GetWorkflowRunInput addawsAwsjson11_serdeOpGetWorkflowRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetWorkflowRunProperties.go b/service/glue/api_op_GetWorkflowRunProperties.go index 3c4dcbce92d..4c98ec6ca67 100644 --- a/service/glue/api_op_GetWorkflowRunProperties.go +++ b/service/glue/api_op_GetWorkflowRunProperties.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetWorkflowRunProperties(ctx context.Context, params *GetWorkfl addawsAwsjson11_serdeOpGetWorkflowRunPropertiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_GetWorkflowRuns.go b/service/glue/api_op_GetWorkflowRuns.go index c749d60fd89..3ab0c443ce7 100644 --- a/service/glue/api_op_GetWorkflowRuns.go +++ b/service/glue/api_op_GetWorkflowRuns.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetWorkflowRuns(ctx context.Context, params *GetWorkflowRunsInp addawsAwsjson11_serdeOpGetWorkflowRunsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_ImportCatalogToGlue.go b/service/glue/api_op_ImportCatalogToGlue.go index 4ed3e310f8d..9e8ab399e51 100644 --- a/service/glue/api_op_ImportCatalogToGlue.go +++ b/service/glue/api_op_ImportCatalogToGlue.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ImportCatalogToGlue(ctx context.Context, params *ImportCatalogT addawsAwsjson11_serdeOpImportCatalogToGlueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_ListCrawlers.go b/service/glue/api_op_ListCrawlers.go index 0acce227cc2..164b7768e89 100644 --- a/service/glue/api_op_ListCrawlers.go +++ b/service/glue/api_op_ListCrawlers.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) ListCrawlers(ctx context.Context, params *ListCrawlersInput, op addawsAwsjson11_serdeOpListCrawlersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_ListDevEndpoints.go b/service/glue/api_op_ListDevEndpoints.go index 0d64f88c979..21b261d61d5 100644 --- a/service/glue/api_op_ListDevEndpoints.go +++ b/service/glue/api_op_ListDevEndpoints.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) ListDevEndpoints(ctx context.Context, params *ListDevEndpointsI addawsAwsjson11_serdeOpListDevEndpointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_ListJobs.go b/service/glue/api_op_ListJobs.go index 40be57219c2..e6e37d762b2 100644 --- a/service/glue/api_op_ListJobs.go +++ b/service/glue/api_op_ListJobs.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) ListJobs(ctx context.Context, params *ListJobsInput, optFns ... addawsAwsjson11_serdeOpListJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_ListMLTransforms.go b/service/glue/api_op_ListMLTransforms.go index a2e52109915..09bfd64622f 100644 --- a/service/glue/api_op_ListMLTransforms.go +++ b/service/glue/api_op_ListMLTransforms.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListMLTransforms(ctx context.Context, params *ListMLTransformsI addawsAwsjson11_serdeOpListMLTransformsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_ListTriggers.go b/service/glue/api_op_ListTriggers.go index 97562c4da0a..709713d9e3e 100644 --- a/service/glue/api_op_ListTriggers.go +++ b/service/glue/api_op_ListTriggers.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) ListTriggers(ctx context.Context, params *ListTriggersInput, op addawsAwsjson11_serdeOpListTriggersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_ListWorkflows.go b/service/glue/api_op_ListWorkflows.go index d70d1ba5091..9d803587ff6 100644 --- a/service/glue/api_op_ListWorkflows.go +++ b/service/glue/api_op_ListWorkflows.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListWorkflows(ctx context.Context, params *ListWorkflowsInput, addawsAwsjson11_serdeOpListWorkflowsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_PutDataCatalogEncryptionSettings.go b/service/glue/api_op_PutDataCatalogEncryptionSettings.go index d04f0b8d1f8..b7495204b52 100644 --- a/service/glue/api_op_PutDataCatalogEncryptionSettings.go +++ b/service/glue/api_op_PutDataCatalogEncryptionSettings.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) PutDataCatalogEncryptionSettings(ctx context.Context, params *P addawsAwsjson11_serdeOpPutDataCatalogEncryptionSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_PutResourcePolicy.go b/service/glue/api_op_PutResourcePolicy.go index 33731d19880..5dd12192c25 100644 --- a/service/glue/api_op_PutResourcePolicy.go +++ b/service/glue/api_op_PutResourcePolicy.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutResourcePolicy(ctx context.Context, params *PutResourcePolic addawsAwsjson11_serdeOpPutResourcePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_PutWorkflowRunProperties.go b/service/glue/api_op_PutWorkflowRunProperties.go index 91f48be530d..9c01a2281b9 100644 --- a/service/glue/api_op_PutWorkflowRunProperties.go +++ b/service/glue/api_op_PutWorkflowRunProperties.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) PutWorkflowRunProperties(ctx context.Context, params *PutWorkfl addawsAwsjson11_serdeOpPutWorkflowRunPropertiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_ResetJobBookmark.go b/service/glue/api_op_ResetJobBookmark.go index b808232d7de..392f5f36711 100644 --- a/service/glue/api_op_ResetJobBookmark.go +++ b/service/glue/api_op_ResetJobBookmark.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ResetJobBookmark(ctx context.Context, params *ResetJobBookmarkI addawsAwsjson11_serdeOpResetJobBookmarkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_ResumeWorkflowRun.go b/service/glue/api_op_ResumeWorkflowRun.go index d0482cb6ade..32b1ede7501 100644 --- a/service/glue/api_op_ResumeWorkflowRun.go +++ b/service/glue/api_op_ResumeWorkflowRun.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ResumeWorkflowRun(ctx context.Context, params *ResumeWorkflowRu addawsAwsjson11_serdeOpResumeWorkflowRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_SearchTables.go b/service/glue/api_op_SearchTables.go index 2fe6eacc940..8364d2c6463 100644 --- a/service/glue/api_op_SearchTables.go +++ b/service/glue/api_op_SearchTables.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) SearchTables(ctx context.Context, params *SearchTablesInput, op addawsAwsjson11_serdeOpSearchTablesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_StartCrawler.go b/service/glue/api_op_StartCrawler.go index 352ff1459ee..251e7976701 100644 --- a/service/glue/api_op_StartCrawler.go +++ b/service/glue/api_op_StartCrawler.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) StartCrawler(ctx context.Context, params *StartCrawlerInput, op addawsAwsjson11_serdeOpStartCrawlerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_StartCrawlerSchedule.go b/service/glue/api_op_StartCrawlerSchedule.go index bb5d9bd21d5..701ac5be609 100644 --- a/service/glue/api_op_StartCrawlerSchedule.go +++ b/service/glue/api_op_StartCrawlerSchedule.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) StartCrawlerSchedule(ctx context.Context, params *StartCrawlerS addawsAwsjson11_serdeOpStartCrawlerScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_StartExportLabelsTaskRun.go b/service/glue/api_op_StartExportLabelsTaskRun.go index e3ab3bee26a..c660232ca76 100644 --- a/service/glue/api_op_StartExportLabelsTaskRun.go +++ b/service/glue/api_op_StartExportLabelsTaskRun.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) StartExportLabelsTaskRun(ctx context.Context, params *StartExpo addawsAwsjson11_serdeOpStartExportLabelsTaskRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_StartImportLabelsTaskRun.go b/service/glue/api_op_StartImportLabelsTaskRun.go index a103bdcfb4d..ea168fdd9d9 100644 --- a/service/glue/api_op_StartImportLabelsTaskRun.go +++ b/service/glue/api_op_StartImportLabelsTaskRun.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -45,9 +44,9 @@ func (c *Client) StartImportLabelsTaskRun(ctx context.Context, params *StartImpo addawsAwsjson11_serdeOpStartImportLabelsTaskRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_StartJobRun.go b/service/glue/api_op_StartJobRun.go index 9311b06712d..0cecac9b062 100644 --- a/service/glue/api_op_StartJobRun.go +++ b/service/glue/api_op_StartJobRun.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StartJobRun(ctx context.Context, params *StartJobRunInput, optF addawsAwsjson11_serdeOpStartJobRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_StartMLEvaluationTaskRun.go b/service/glue/api_op_StartMLEvaluationTaskRun.go index cc4096faab7..ff68769d044 100644 --- a/service/glue/api_op_StartMLEvaluationTaskRun.go +++ b/service/glue/api_op_StartMLEvaluationTaskRun.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) StartMLEvaluationTaskRun(ctx context.Context, params *StartMLEv addawsAwsjson11_serdeOpStartMLEvaluationTaskRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_StartMLLabelingSetGenerationTaskRun.go b/service/glue/api_op_StartMLLabelingSetGenerationTaskRun.go index 5699be235f8..45b4f9f4883 100644 --- a/service/glue/api_op_StartMLLabelingSetGenerationTaskRun.go +++ b/service/glue/api_op_StartMLLabelingSetGenerationTaskRun.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) StartMLLabelingSetGenerationTaskRun(ctx context.Context, params addawsAwsjson11_serdeOpStartMLLabelingSetGenerationTaskRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_StartTrigger.go b/service/glue/api_op_StartTrigger.go index 3bb78a4db60..14783f7f45a 100644 --- a/service/glue/api_op_StartTrigger.go +++ b/service/glue/api_op_StartTrigger.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) StartTrigger(ctx context.Context, params *StartTriggerInput, op addawsAwsjson11_serdeOpStartTriggerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_StartWorkflowRun.go b/service/glue/api_op_StartWorkflowRun.go index 88147d0fbd2..5ee85297468 100644 --- a/service/glue/api_op_StartWorkflowRun.go +++ b/service/glue/api_op_StartWorkflowRun.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StartWorkflowRun(ctx context.Context, params *StartWorkflowRunI addawsAwsjson11_serdeOpStartWorkflowRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_StopCrawler.go b/service/glue/api_op_StopCrawler.go index cbee19f7946..2fbd277a0fa 100644 --- a/service/glue/api_op_StopCrawler.go +++ b/service/glue/api_op_StopCrawler.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StopCrawler(ctx context.Context, params *StopCrawlerInput, optF addawsAwsjson11_serdeOpStopCrawlerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_StopCrawlerSchedule.go b/service/glue/api_op_StopCrawlerSchedule.go index 3f6a41095bb..275b891ae9f 100644 --- a/service/glue/api_op_StopCrawlerSchedule.go +++ b/service/glue/api_op_StopCrawlerSchedule.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) StopCrawlerSchedule(ctx context.Context, params *StopCrawlerSch addawsAwsjson11_serdeOpStopCrawlerScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_StopTrigger.go b/service/glue/api_op_StopTrigger.go index 7aeff102047..e9be3153a9b 100644 --- a/service/glue/api_op_StopTrigger.go +++ b/service/glue/api_op_StopTrigger.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StopTrigger(ctx context.Context, params *StopTriggerInput, optF addawsAwsjson11_serdeOpStopTriggerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_StopWorkflowRun.go b/service/glue/api_op_StopWorkflowRun.go index 66b153e06e1..78b9b5c0ccc 100644 --- a/service/glue/api_op_StopWorkflowRun.go +++ b/service/glue/api_op_StopWorkflowRun.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StopWorkflowRun(ctx context.Context, params *StopWorkflowRunInp addawsAwsjson11_serdeOpStopWorkflowRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_TagResource.go b/service/glue/api_op_TagResource.go index 50949fc1442..858c9304408 100644 --- a/service/glue/api_op_TagResource.go +++ b/service/glue/api_op_TagResource.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_UntagResource.go b/service/glue/api_op_UntagResource.go index 3a59ec13ba0..d0ae3b5a2fb 100644 --- a/service/glue/api_op_UntagResource.go +++ b/service/glue/api_op_UntagResource.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_UpdateClassifier.go b/service/glue/api_op_UpdateClassifier.go index 7e190dd1349..82bebe7fe24 100644 --- a/service/glue/api_op_UpdateClassifier.go +++ b/service/glue/api_op_UpdateClassifier.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateClassifier(ctx context.Context, params *UpdateClassifierI addawsAwsjson11_serdeOpUpdateClassifierMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_UpdateColumnStatisticsForPartition.go b/service/glue/api_op_UpdateColumnStatisticsForPartition.go index 6826da01fa4..28aa4670aa5 100644 --- a/service/glue/api_op_UpdateColumnStatisticsForPartition.go +++ b/service/glue/api_op_UpdateColumnStatisticsForPartition.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateColumnStatisticsForPartition(ctx context.Context, params addawsAwsjson11_serdeOpUpdateColumnStatisticsForPartitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_UpdateColumnStatisticsForTable.go b/service/glue/api_op_UpdateColumnStatisticsForTable.go index 1f6b09e5ddd..66d07bb075e 100644 --- a/service/glue/api_op_UpdateColumnStatisticsForTable.go +++ b/service/glue/api_op_UpdateColumnStatisticsForTable.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateColumnStatisticsForTable(ctx context.Context, params *Upd addawsAwsjson11_serdeOpUpdateColumnStatisticsForTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_UpdateConnection.go b/service/glue/api_op_UpdateConnection.go index d0a7feec7b5..87959398643 100644 --- a/service/glue/api_op_UpdateConnection.go +++ b/service/glue/api_op_UpdateConnection.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateConnection(ctx context.Context, params *UpdateConnectionI addawsAwsjson11_serdeOpUpdateConnectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_UpdateCrawler.go b/service/glue/api_op_UpdateCrawler.go index b945053513d..bff0da38753 100644 --- a/service/glue/api_op_UpdateCrawler.go +++ b/service/glue/api_op_UpdateCrawler.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateCrawler(ctx context.Context, params *UpdateCrawlerInput, addawsAwsjson11_serdeOpUpdateCrawlerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_UpdateCrawlerSchedule.go b/service/glue/api_op_UpdateCrawlerSchedule.go index f18eb974a4b..4843df70355 100644 --- a/service/glue/api_op_UpdateCrawlerSchedule.go +++ b/service/glue/api_op_UpdateCrawlerSchedule.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateCrawlerSchedule(ctx context.Context, params *UpdateCrawle addawsAwsjson11_serdeOpUpdateCrawlerScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_UpdateDatabase.go b/service/glue/api_op_UpdateDatabase.go index 12e41bec5d5..b88ae30c67f 100644 --- a/service/glue/api_op_UpdateDatabase.go +++ b/service/glue/api_op_UpdateDatabase.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDatabase(ctx context.Context, params *UpdateDatabaseInput addawsAwsjson11_serdeOpUpdateDatabaseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_UpdateDevEndpoint.go b/service/glue/api_op_UpdateDevEndpoint.go index ab4ca49ad1e..bd3b711fdfe 100644 --- a/service/glue/api_op_UpdateDevEndpoint.go +++ b/service/glue/api_op_UpdateDevEndpoint.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDevEndpoint(ctx context.Context, params *UpdateDevEndpoin addawsAwsjson11_serdeOpUpdateDevEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_UpdateJob.go b/service/glue/api_op_UpdateJob.go index b4e8bb68e18..f370b43d284 100644 --- a/service/glue/api_op_UpdateJob.go +++ b/service/glue/api_op_UpdateJob.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateJob(ctx context.Context, params *UpdateJobInput, optFns . addawsAwsjson11_serdeOpUpdateJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_UpdateMLTransform.go b/service/glue/api_op_UpdateMLTransform.go index f0d7ef47e7b..afc393c268d 100644 --- a/service/glue/api_op_UpdateMLTransform.go +++ b/service/glue/api_op_UpdateMLTransform.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) UpdateMLTransform(ctx context.Context, params *UpdateMLTransfor addawsAwsjson11_serdeOpUpdateMLTransformMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_UpdatePartition.go b/service/glue/api_op_UpdatePartition.go index 81c11283e6a..c0d6204d1ff 100644 --- a/service/glue/api_op_UpdatePartition.go +++ b/service/glue/api_op_UpdatePartition.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdatePartition(ctx context.Context, params *UpdatePartitionInp addawsAwsjson11_serdeOpUpdatePartitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_UpdateTable.go b/service/glue/api_op_UpdateTable.go index 17b4fdbe75f..41d87a78c9a 100644 --- a/service/glue/api_op_UpdateTable.go +++ b/service/glue/api_op_UpdateTable.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateTable(ctx context.Context, params *UpdateTableInput, optF addawsAwsjson11_serdeOpUpdateTableMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_UpdateTrigger.go b/service/glue/api_op_UpdateTrigger.go index 9978a54648f..0b3180e4c05 100644 --- a/service/glue/api_op_UpdateTrigger.go +++ b/service/glue/api_op_UpdateTrigger.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateTrigger(ctx context.Context, params *UpdateTriggerInput, addawsAwsjson11_serdeOpUpdateTriggerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_UpdateUserDefinedFunction.go b/service/glue/api_op_UpdateUserDefinedFunction.go index d3f675cb71f..3fcf4a8dad6 100644 --- a/service/glue/api_op_UpdateUserDefinedFunction.go +++ b/service/glue/api_op_UpdateUserDefinedFunction.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/glue/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateUserDefinedFunction(ctx context.Context, params *UpdateUs addawsAwsjson11_serdeOpUpdateUserDefinedFunctionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/api_op_UpdateWorkflow.go b/service/glue/api_op_UpdateWorkflow.go index a7292fdca32..ad2b3ffb44a 100644 --- a/service/glue/api_op_UpdateWorkflow.go +++ b/service/glue/api_op_UpdateWorkflow.go @@ -5,7 +5,6 @@ package glue import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateWorkflow(ctx context.Context, params *UpdateWorkflowInput addawsAwsjson11_serdeOpUpdateWorkflowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/glue/endpoints.go b/service/glue/endpoints.go index 409dde53278..5b1ba2f7c31 100644 --- a/service/glue/endpoints.go +++ b/service/glue/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/greengrass/api_client.go b/service/greengrass/api_client.go index b0c7095feff..5530fb46be6 100644 --- a/service/greengrass/api_client.go +++ b/service/greengrass/api_client.go @@ -82,30 +82,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -171,6 +147,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/greengrass/api_op_AssociateRoleToGroup.go b/service/greengrass/api_op_AssociateRoleToGroup.go index 439ec5c7cf0..234ae64e684 100644 --- a/service/greengrass/api_op_AssociateRoleToGroup.go +++ b/service/greengrass/api_op_AssociateRoleToGroup.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) AssociateRoleToGroup(ctx context.Context, params *AssociateRole addawsRestjson1_serdeOpAssociateRoleToGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_AssociateServiceRoleToAccount.go b/service/greengrass/api_op_AssociateServiceRoleToAccount.go index eccaa64df15..093b98bc663 100644 --- a/service/greengrass/api_op_AssociateServiceRoleToAccount.go +++ b/service/greengrass/api_op_AssociateServiceRoleToAccount.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) AssociateServiceRoleToAccount(ctx context.Context, params *Asso addawsRestjson1_serdeOpAssociateServiceRoleToAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateConnectorDefinition.go b/service/greengrass/api_op_CreateConnectorDefinition.go index ef66b558eaf..b3ae25f0377 100644 --- a/service/greengrass/api_op_CreateConnectorDefinition.go +++ b/service/greengrass/api_op_CreateConnectorDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateConnectorDefinition(ctx context.Context, params *CreateCo addawsRestjson1_serdeOpCreateConnectorDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateConnectorDefinitionVersion.go b/service/greengrass/api_op_CreateConnectorDefinitionVersion.go index 84f56be5266..967d5527fa2 100644 --- a/service/greengrass/api_op_CreateConnectorDefinitionVersion.go +++ b/service/greengrass/api_op_CreateConnectorDefinitionVersion.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateConnectorDefinitionVersion(ctx context.Context, params *C addawsRestjson1_serdeOpCreateConnectorDefinitionVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateCoreDefinition.go b/service/greengrass/api_op_CreateCoreDefinition.go index c0c32c13f05..58df2a7eeb0 100644 --- a/service/greengrass/api_op_CreateCoreDefinition.go +++ b/service/greengrass/api_op_CreateCoreDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateCoreDefinition(ctx context.Context, params *CreateCoreDef addawsRestjson1_serdeOpCreateCoreDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateCoreDefinitionVersion.go b/service/greengrass/api_op_CreateCoreDefinitionVersion.go index c14fef3ebca..a51ac5aab07 100644 --- a/service/greengrass/api_op_CreateCoreDefinitionVersion.go +++ b/service/greengrass/api_op_CreateCoreDefinitionVersion.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateCoreDefinitionVersion(ctx context.Context, params *Create addawsRestjson1_serdeOpCreateCoreDefinitionVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateDeployment.go b/service/greengrass/api_op_CreateDeployment.go index b547752c576..8564b2cda78 100644 --- a/service/greengrass/api_op_CreateDeployment.go +++ b/service/greengrass/api_op_CreateDeployment.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateDeployment(ctx context.Context, params *CreateDeploymentI addawsRestjson1_serdeOpCreateDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateDeviceDefinition.go b/service/greengrass/api_op_CreateDeviceDefinition.go index 520e8bb996c..7345fdbcdd8 100644 --- a/service/greengrass/api_op_CreateDeviceDefinition.go +++ b/service/greengrass/api_op_CreateDeviceDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateDeviceDefinition(ctx context.Context, params *CreateDevic addawsRestjson1_serdeOpCreateDeviceDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateDeviceDefinitionVersion.go b/service/greengrass/api_op_CreateDeviceDefinitionVersion.go index c8565ad83d8..b1372dfcf45 100644 --- a/service/greengrass/api_op_CreateDeviceDefinitionVersion.go +++ b/service/greengrass/api_op_CreateDeviceDefinitionVersion.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDeviceDefinitionVersion(ctx context.Context, params *Crea addawsRestjson1_serdeOpCreateDeviceDefinitionVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateFunctionDefinition.go b/service/greengrass/api_op_CreateFunctionDefinition.go index 4d65f55a1b7..af45551ca1a 100644 --- a/service/greengrass/api_op_CreateFunctionDefinition.go +++ b/service/greengrass/api_op_CreateFunctionDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateFunctionDefinition(ctx context.Context, params *CreateFun addawsRestjson1_serdeOpCreateFunctionDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateFunctionDefinitionVersion.go b/service/greengrass/api_op_CreateFunctionDefinitionVersion.go index d6adb6724a0..51068bfa456 100644 --- a/service/greengrass/api_op_CreateFunctionDefinitionVersion.go +++ b/service/greengrass/api_op_CreateFunctionDefinitionVersion.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateFunctionDefinitionVersion(ctx context.Context, params *Cr addawsRestjson1_serdeOpCreateFunctionDefinitionVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateGroup.go b/service/greengrass/api_op_CreateGroup.go index 632e5a86216..fd1f8205720 100644 --- a/service/greengrass/api_op_CreateGroup.go +++ b/service/greengrass/api_op_CreateGroup.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateGroup(ctx context.Context, params *CreateGroupInput, optF addawsRestjson1_serdeOpCreateGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateGroupCertificateAuthority.go b/service/greengrass/api_op_CreateGroupCertificateAuthority.go index b001c77b6f7..cf16b7020d2 100644 --- a/service/greengrass/api_op_CreateGroupCertificateAuthority.go +++ b/service/greengrass/api_op_CreateGroupCertificateAuthority.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateGroupCertificateAuthority(ctx context.Context, params *Cr addawsRestjson1_serdeOpCreateGroupCertificateAuthorityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateGroupVersion.go b/service/greengrass/api_op_CreateGroupVersion.go index c5dc9094e6b..1e20daf6090 100644 --- a/service/greengrass/api_op_CreateGroupVersion.go +++ b/service/greengrass/api_op_CreateGroupVersion.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateGroupVersion(ctx context.Context, params *CreateGroupVers addawsRestjson1_serdeOpCreateGroupVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateLoggerDefinition.go b/service/greengrass/api_op_CreateLoggerDefinition.go index ae70b0f5966..c13765c0e91 100644 --- a/service/greengrass/api_op_CreateLoggerDefinition.go +++ b/service/greengrass/api_op_CreateLoggerDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateLoggerDefinition(ctx context.Context, params *CreateLogge addawsRestjson1_serdeOpCreateLoggerDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateLoggerDefinitionVersion.go b/service/greengrass/api_op_CreateLoggerDefinitionVersion.go index 88b9d4894e0..821fc4d4afc 100644 --- a/service/greengrass/api_op_CreateLoggerDefinitionVersion.go +++ b/service/greengrass/api_op_CreateLoggerDefinitionVersion.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateLoggerDefinitionVersion(ctx context.Context, params *Crea addawsRestjson1_serdeOpCreateLoggerDefinitionVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateResourceDefinition.go b/service/greengrass/api_op_CreateResourceDefinition.go index b708a041374..cea373559a1 100644 --- a/service/greengrass/api_op_CreateResourceDefinition.go +++ b/service/greengrass/api_op_CreateResourceDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateResourceDefinition(ctx context.Context, params *CreateRes addawsRestjson1_serdeOpCreateResourceDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateResourceDefinitionVersion.go b/service/greengrass/api_op_CreateResourceDefinitionVersion.go index e6464ce671d..f2b5729a773 100644 --- a/service/greengrass/api_op_CreateResourceDefinitionVersion.go +++ b/service/greengrass/api_op_CreateResourceDefinitionVersion.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateResourceDefinitionVersion(ctx context.Context, params *Cr addawsRestjson1_serdeOpCreateResourceDefinitionVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateSoftwareUpdateJob.go b/service/greengrass/api_op_CreateSoftwareUpdateJob.go index e5cd4e79746..34ce15609ae 100644 --- a/service/greengrass/api_op_CreateSoftwareUpdateJob.go +++ b/service/greengrass/api_op_CreateSoftwareUpdateJob.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateSoftwareUpdateJob(ctx context.Context, params *CreateSoft addawsRestjson1_serdeOpCreateSoftwareUpdateJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateSubscriptionDefinition.go b/service/greengrass/api_op_CreateSubscriptionDefinition.go index e13dc8ceae2..3d3440541ca 100644 --- a/service/greengrass/api_op_CreateSubscriptionDefinition.go +++ b/service/greengrass/api_op_CreateSubscriptionDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateSubscriptionDefinition(ctx context.Context, params *Creat addawsRestjson1_serdeOpCreateSubscriptionDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_CreateSubscriptionDefinitionVersion.go b/service/greengrass/api_op_CreateSubscriptionDefinitionVersion.go index 9b40f94140e..009d4380333 100644 --- a/service/greengrass/api_op_CreateSubscriptionDefinitionVersion.go +++ b/service/greengrass/api_op_CreateSubscriptionDefinitionVersion.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateSubscriptionDefinitionVersion(ctx context.Context, params addawsRestjson1_serdeOpCreateSubscriptionDefinitionVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_DeleteConnectorDefinition.go b/service/greengrass/api_op_DeleteConnectorDefinition.go index 0717deb2521..cecf013778e 100644 --- a/service/greengrass/api_op_DeleteConnectorDefinition.go +++ b/service/greengrass/api_op_DeleteConnectorDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteConnectorDefinition(ctx context.Context, params *DeleteCo addawsRestjson1_serdeOpDeleteConnectorDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_DeleteCoreDefinition.go b/service/greengrass/api_op_DeleteCoreDefinition.go index 14f1be62af3..7660973708a 100644 --- a/service/greengrass/api_op_DeleteCoreDefinition.go +++ b/service/greengrass/api_op_DeleteCoreDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteCoreDefinition(ctx context.Context, params *DeleteCoreDef addawsRestjson1_serdeOpDeleteCoreDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_DeleteDeviceDefinition.go b/service/greengrass/api_op_DeleteDeviceDefinition.go index 210f1f697fa..e1f6637be1d 100644 --- a/service/greengrass/api_op_DeleteDeviceDefinition.go +++ b/service/greengrass/api_op_DeleteDeviceDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDeviceDefinition(ctx context.Context, params *DeleteDevic addawsRestjson1_serdeOpDeleteDeviceDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_DeleteFunctionDefinition.go b/service/greengrass/api_op_DeleteFunctionDefinition.go index 994d9941cb3..a1d61e82d3a 100644 --- a/service/greengrass/api_op_DeleteFunctionDefinition.go +++ b/service/greengrass/api_op_DeleteFunctionDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteFunctionDefinition(ctx context.Context, params *DeleteFun addawsRestjson1_serdeOpDeleteFunctionDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_DeleteGroup.go b/service/greengrass/api_op_DeleteGroup.go index 070dc83742a..7bbfb35421e 100644 --- a/service/greengrass/api_op_DeleteGroup.go +++ b/service/greengrass/api_op_DeleteGroup.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteGroup(ctx context.Context, params *DeleteGroupInput, optF addawsRestjson1_serdeOpDeleteGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_DeleteLoggerDefinition.go b/service/greengrass/api_op_DeleteLoggerDefinition.go index 0e2345869bc..5f7c8c55c53 100644 --- a/service/greengrass/api_op_DeleteLoggerDefinition.go +++ b/service/greengrass/api_op_DeleteLoggerDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteLoggerDefinition(ctx context.Context, params *DeleteLogge addawsRestjson1_serdeOpDeleteLoggerDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_DeleteResourceDefinition.go b/service/greengrass/api_op_DeleteResourceDefinition.go index a72cd09392e..46db8dbc12a 100644 --- a/service/greengrass/api_op_DeleteResourceDefinition.go +++ b/service/greengrass/api_op_DeleteResourceDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteResourceDefinition(ctx context.Context, params *DeleteRes addawsRestjson1_serdeOpDeleteResourceDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_DeleteSubscriptionDefinition.go b/service/greengrass/api_op_DeleteSubscriptionDefinition.go index b8a2345a503..d8ba8cceaa9 100644 --- a/service/greengrass/api_op_DeleteSubscriptionDefinition.go +++ b/service/greengrass/api_op_DeleteSubscriptionDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSubscriptionDefinition(ctx context.Context, params *Delet addawsRestjson1_serdeOpDeleteSubscriptionDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_DisassociateRoleFromGroup.go b/service/greengrass/api_op_DisassociateRoleFromGroup.go index f26e4168041..5d0f975b68c 100644 --- a/service/greengrass/api_op_DisassociateRoleFromGroup.go +++ b/service/greengrass/api_op_DisassociateRoleFromGroup.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisassociateRoleFromGroup(ctx context.Context, params *Disassoc addawsRestjson1_serdeOpDisassociateRoleFromGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_DisassociateServiceRoleFromAccount.go b/service/greengrass/api_op_DisassociateServiceRoleFromAccount.go index dc38c0daf81..627ba481ab6 100644 --- a/service/greengrass/api_op_DisassociateServiceRoleFromAccount.go +++ b/service/greengrass/api_op_DisassociateServiceRoleFromAccount.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisassociateServiceRoleFromAccount(ctx context.Context, params addawsRestjson1_serdeOpDisassociateServiceRoleFromAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetAssociatedRole.go b/service/greengrass/api_op_GetAssociatedRole.go index 970bfa4dba5..3f8651070c6 100644 --- a/service/greengrass/api_op_GetAssociatedRole.go +++ b/service/greengrass/api_op_GetAssociatedRole.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetAssociatedRole(ctx context.Context, params *GetAssociatedRol addawsRestjson1_serdeOpGetAssociatedRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetBulkDeploymentStatus.go b/service/greengrass/api_op_GetBulkDeploymentStatus.go index b3325bdd6e0..52405e95c95 100644 --- a/service/greengrass/api_op_GetBulkDeploymentStatus.go +++ b/service/greengrass/api_op_GetBulkDeploymentStatus.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetBulkDeploymentStatus(ctx context.Context, params *GetBulkDep addawsRestjson1_serdeOpGetBulkDeploymentStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetConnectivityInfo.go b/service/greengrass/api_op_GetConnectivityInfo.go index c4643fba583..e58f444b1bf 100644 --- a/service/greengrass/api_op_GetConnectivityInfo.go +++ b/service/greengrass/api_op_GetConnectivityInfo.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetConnectivityInfo(ctx context.Context, params *GetConnectivit addawsRestjson1_serdeOpGetConnectivityInfoMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetConnectorDefinition.go b/service/greengrass/api_op_GetConnectorDefinition.go index cbbbcc4df74..12c5e4a7daf 100644 --- a/service/greengrass/api_op_GetConnectorDefinition.go +++ b/service/greengrass/api_op_GetConnectorDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetConnectorDefinition(ctx context.Context, params *GetConnecto addawsRestjson1_serdeOpGetConnectorDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetConnectorDefinitionVersion.go b/service/greengrass/api_op_GetConnectorDefinitionVersion.go index 07c67d47950..809c9cf31d7 100644 --- a/service/greengrass/api_op_GetConnectorDefinitionVersion.go +++ b/service/greengrass/api_op_GetConnectorDefinitionVersion.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetConnectorDefinitionVersion(ctx context.Context, params *GetC addawsRestjson1_serdeOpGetConnectorDefinitionVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetCoreDefinition.go b/service/greengrass/api_op_GetCoreDefinition.go index 1d0537cfb65..624cb1c1894 100644 --- a/service/greengrass/api_op_GetCoreDefinition.go +++ b/service/greengrass/api_op_GetCoreDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetCoreDefinition(ctx context.Context, params *GetCoreDefinitio addawsRestjson1_serdeOpGetCoreDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetCoreDefinitionVersion.go b/service/greengrass/api_op_GetCoreDefinitionVersion.go index 857bf9c188d..22ee960228a 100644 --- a/service/greengrass/api_op_GetCoreDefinitionVersion.go +++ b/service/greengrass/api_op_GetCoreDefinitionVersion.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetCoreDefinitionVersion(ctx context.Context, params *GetCoreDe addawsRestjson1_serdeOpGetCoreDefinitionVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetDeploymentStatus.go b/service/greengrass/api_op_GetDeploymentStatus.go index d772d75543f..7abe92eab54 100644 --- a/service/greengrass/api_op_GetDeploymentStatus.go +++ b/service/greengrass/api_op_GetDeploymentStatus.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDeploymentStatus(ctx context.Context, params *GetDeploymentS addawsRestjson1_serdeOpGetDeploymentStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetDeviceDefinition.go b/service/greengrass/api_op_GetDeviceDefinition.go index d2e31ff4a5c..cc4366e4ade 100644 --- a/service/greengrass/api_op_GetDeviceDefinition.go +++ b/service/greengrass/api_op_GetDeviceDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetDeviceDefinition(ctx context.Context, params *GetDeviceDefin addawsRestjson1_serdeOpGetDeviceDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetDeviceDefinitionVersion.go b/service/greengrass/api_op_GetDeviceDefinitionVersion.go index 1f83e79a504..88fcb3d8b65 100644 --- a/service/greengrass/api_op_GetDeviceDefinitionVersion.go +++ b/service/greengrass/api_op_GetDeviceDefinitionVersion.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDeviceDefinitionVersion(ctx context.Context, params *GetDevi addawsRestjson1_serdeOpGetDeviceDefinitionVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetFunctionDefinition.go b/service/greengrass/api_op_GetFunctionDefinition.go index d7f370d4921..5eece8ddcd7 100644 --- a/service/greengrass/api_op_GetFunctionDefinition.go +++ b/service/greengrass/api_op_GetFunctionDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetFunctionDefinition(ctx context.Context, params *GetFunctionD addawsRestjson1_serdeOpGetFunctionDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetFunctionDefinitionVersion.go b/service/greengrass/api_op_GetFunctionDefinitionVersion.go index 86318edfcba..3c8edf6d778 100644 --- a/service/greengrass/api_op_GetFunctionDefinitionVersion.go +++ b/service/greengrass/api_op_GetFunctionDefinitionVersion.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetFunctionDefinitionVersion(ctx context.Context, params *GetFu addawsRestjson1_serdeOpGetFunctionDefinitionVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetGroup.go b/service/greengrass/api_op_GetGroup.go index 8f2f796055b..f8d22e7bb9a 100644 --- a/service/greengrass/api_op_GetGroup.go +++ b/service/greengrass/api_op_GetGroup.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetGroup(ctx context.Context, params *GetGroupInput, optFns ... addawsRestjson1_serdeOpGetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetGroupCertificateAuthority.go b/service/greengrass/api_op_GetGroupCertificateAuthority.go index a86b9543c38..a601613811a 100644 --- a/service/greengrass/api_op_GetGroupCertificateAuthority.go +++ b/service/greengrass/api_op_GetGroupCertificateAuthority.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetGroupCertificateAuthority(ctx context.Context, params *GetGr addawsRestjson1_serdeOpGetGroupCertificateAuthorityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetGroupCertificateConfiguration.go b/service/greengrass/api_op_GetGroupCertificateConfiguration.go index 55307ffe8be..431aea698ec 100644 --- a/service/greengrass/api_op_GetGroupCertificateConfiguration.go +++ b/service/greengrass/api_op_GetGroupCertificateConfiguration.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetGroupCertificateConfiguration(ctx context.Context, params *G addawsRestjson1_serdeOpGetGroupCertificateConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetGroupVersion.go b/service/greengrass/api_op_GetGroupVersion.go index 378369a3cb7..959820398cb 100644 --- a/service/greengrass/api_op_GetGroupVersion.go +++ b/service/greengrass/api_op_GetGroupVersion.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetGroupVersion(ctx context.Context, params *GetGroupVersionInp addawsRestjson1_serdeOpGetGroupVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetLoggerDefinition.go b/service/greengrass/api_op_GetLoggerDefinition.go index a16f34a400f..9801cee5937 100644 --- a/service/greengrass/api_op_GetLoggerDefinition.go +++ b/service/greengrass/api_op_GetLoggerDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetLoggerDefinition(ctx context.Context, params *GetLoggerDefin addawsRestjson1_serdeOpGetLoggerDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetLoggerDefinitionVersion.go b/service/greengrass/api_op_GetLoggerDefinitionVersion.go index dda419187c1..c234463dda9 100644 --- a/service/greengrass/api_op_GetLoggerDefinitionVersion.go +++ b/service/greengrass/api_op_GetLoggerDefinitionVersion.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetLoggerDefinitionVersion(ctx context.Context, params *GetLogg addawsRestjson1_serdeOpGetLoggerDefinitionVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetResourceDefinition.go b/service/greengrass/api_op_GetResourceDefinition.go index eb9f2671cbf..753f2aef58c 100644 --- a/service/greengrass/api_op_GetResourceDefinition.go +++ b/service/greengrass/api_op_GetResourceDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetResourceDefinition(ctx context.Context, params *GetResourceD addawsRestjson1_serdeOpGetResourceDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetResourceDefinitionVersion.go b/service/greengrass/api_op_GetResourceDefinitionVersion.go index 36128bf023c..7eb7899f719 100644 --- a/service/greengrass/api_op_GetResourceDefinitionVersion.go +++ b/service/greengrass/api_op_GetResourceDefinitionVersion.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetResourceDefinitionVersion(ctx context.Context, params *GetRe addawsRestjson1_serdeOpGetResourceDefinitionVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetServiceRoleForAccount.go b/service/greengrass/api_op_GetServiceRoleForAccount.go index cc1efaf1a75..90b439582ab 100644 --- a/service/greengrass/api_op_GetServiceRoleForAccount.go +++ b/service/greengrass/api_op_GetServiceRoleForAccount.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetServiceRoleForAccount(ctx context.Context, params *GetServic addawsRestjson1_serdeOpGetServiceRoleForAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetSubscriptionDefinition.go b/service/greengrass/api_op_GetSubscriptionDefinition.go index 2958f46bf32..a6c09143733 100644 --- a/service/greengrass/api_op_GetSubscriptionDefinition.go +++ b/service/greengrass/api_op_GetSubscriptionDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetSubscriptionDefinition(ctx context.Context, params *GetSubsc addawsRestjson1_serdeOpGetSubscriptionDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_GetSubscriptionDefinitionVersion.go b/service/greengrass/api_op_GetSubscriptionDefinitionVersion.go index ebf298b0b85..586b1713ac0 100644 --- a/service/greengrass/api_op_GetSubscriptionDefinitionVersion.go +++ b/service/greengrass/api_op_GetSubscriptionDefinitionVersion.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetSubscriptionDefinitionVersion(ctx context.Context, params *G addawsRestjson1_serdeOpGetSubscriptionDefinitionVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListBulkDeploymentDetailedReports.go b/service/greengrass/api_op_ListBulkDeploymentDetailedReports.go index 7468933ea4c..4e67a913190 100644 --- a/service/greengrass/api_op_ListBulkDeploymentDetailedReports.go +++ b/service/greengrass/api_op_ListBulkDeploymentDetailedReports.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListBulkDeploymentDetailedReports(ctx context.Context, params * addawsRestjson1_serdeOpListBulkDeploymentDetailedReportsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListBulkDeployments.go b/service/greengrass/api_op_ListBulkDeployments.go index f1afc91660c..917a39e5cda 100644 --- a/service/greengrass/api_op_ListBulkDeployments.go +++ b/service/greengrass/api_op_ListBulkDeployments.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListBulkDeployments(ctx context.Context, params *ListBulkDeploy addawsRestjson1_serdeOpListBulkDeploymentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListConnectorDefinitionVersions.go b/service/greengrass/api_op_ListConnectorDefinitionVersions.go index bc7a2c629ee..b37b3965882 100644 --- a/service/greengrass/api_op_ListConnectorDefinitionVersions.go +++ b/service/greengrass/api_op_ListConnectorDefinitionVersions.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListConnectorDefinitionVersions(ctx context.Context, params *Li addawsRestjson1_serdeOpListConnectorDefinitionVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListConnectorDefinitions.go b/service/greengrass/api_op_ListConnectorDefinitions.go index a216030e831..fdbcbbf674c 100644 --- a/service/greengrass/api_op_ListConnectorDefinitions.go +++ b/service/greengrass/api_op_ListConnectorDefinitions.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListConnectorDefinitions(ctx context.Context, params *ListConne addawsRestjson1_serdeOpListConnectorDefinitionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListCoreDefinitionVersions.go b/service/greengrass/api_op_ListCoreDefinitionVersions.go index de220130d28..58ccdd2679d 100644 --- a/service/greengrass/api_op_ListCoreDefinitionVersions.go +++ b/service/greengrass/api_op_ListCoreDefinitionVersions.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListCoreDefinitionVersions(ctx context.Context, params *ListCor addawsRestjson1_serdeOpListCoreDefinitionVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListCoreDefinitions.go b/service/greengrass/api_op_ListCoreDefinitions.go index 6dcada0672d..7e5ace711ff 100644 --- a/service/greengrass/api_op_ListCoreDefinitions.go +++ b/service/greengrass/api_op_ListCoreDefinitions.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListCoreDefinitions(ctx context.Context, params *ListCoreDefini addawsRestjson1_serdeOpListCoreDefinitionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListDeployments.go b/service/greengrass/api_op_ListDeployments.go index ee9076c9891..1a3817f8086 100644 --- a/service/greengrass/api_op_ListDeployments.go +++ b/service/greengrass/api_op_ListDeployments.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDeployments(ctx context.Context, params *ListDeploymentsInp addawsRestjson1_serdeOpListDeploymentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListDeviceDefinitionVersions.go b/service/greengrass/api_op_ListDeviceDefinitionVersions.go index e021bef13ad..6a91fa7de40 100644 --- a/service/greengrass/api_op_ListDeviceDefinitionVersions.go +++ b/service/greengrass/api_op_ListDeviceDefinitionVersions.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDeviceDefinitionVersions(ctx context.Context, params *ListD addawsRestjson1_serdeOpListDeviceDefinitionVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListDeviceDefinitions.go b/service/greengrass/api_op_ListDeviceDefinitions.go index 368e02a34a2..1e49a2d7561 100644 --- a/service/greengrass/api_op_ListDeviceDefinitions.go +++ b/service/greengrass/api_op_ListDeviceDefinitions.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDeviceDefinitions(ctx context.Context, params *ListDeviceDe addawsRestjson1_serdeOpListDeviceDefinitionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListFunctionDefinitionVersions.go b/service/greengrass/api_op_ListFunctionDefinitionVersions.go index abce5dd176f..bea120f42fd 100644 --- a/service/greengrass/api_op_ListFunctionDefinitionVersions.go +++ b/service/greengrass/api_op_ListFunctionDefinitionVersions.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListFunctionDefinitionVersions(ctx context.Context, params *Lis addawsRestjson1_serdeOpListFunctionDefinitionVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListFunctionDefinitions.go b/service/greengrass/api_op_ListFunctionDefinitions.go index a5d7c3c40e6..649a623fc1a 100644 --- a/service/greengrass/api_op_ListFunctionDefinitions.go +++ b/service/greengrass/api_op_ListFunctionDefinitions.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListFunctionDefinitions(ctx context.Context, params *ListFuncti addawsRestjson1_serdeOpListFunctionDefinitionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListGroupCertificateAuthorities.go b/service/greengrass/api_op_ListGroupCertificateAuthorities.go index 2137936431d..756f2fd10f6 100644 --- a/service/greengrass/api_op_ListGroupCertificateAuthorities.go +++ b/service/greengrass/api_op_ListGroupCertificateAuthorities.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListGroupCertificateAuthorities(ctx context.Context, params *Li addawsRestjson1_serdeOpListGroupCertificateAuthoritiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListGroupVersions.go b/service/greengrass/api_op_ListGroupVersions.go index 942573e74ab..e0cc2c135b2 100644 --- a/service/greengrass/api_op_ListGroupVersions.go +++ b/service/greengrass/api_op_ListGroupVersions.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListGroupVersions(ctx context.Context, params *ListGroupVersion addawsRestjson1_serdeOpListGroupVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListGroups.go b/service/greengrass/api_op_ListGroups.go index 95a37eb6d17..11621512efa 100644 --- a/service/greengrass/api_op_ListGroups.go +++ b/service/greengrass/api_op_ListGroups.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListGroups(ctx context.Context, params *ListGroupsInput, optFns addawsRestjson1_serdeOpListGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListLoggerDefinitionVersions.go b/service/greengrass/api_op_ListLoggerDefinitionVersions.go index 97f946b39ef..ba3ee534d04 100644 --- a/service/greengrass/api_op_ListLoggerDefinitionVersions.go +++ b/service/greengrass/api_op_ListLoggerDefinitionVersions.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListLoggerDefinitionVersions(ctx context.Context, params *ListL addawsRestjson1_serdeOpListLoggerDefinitionVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListLoggerDefinitions.go b/service/greengrass/api_op_ListLoggerDefinitions.go index 385771e3438..45383a533af 100644 --- a/service/greengrass/api_op_ListLoggerDefinitions.go +++ b/service/greengrass/api_op_ListLoggerDefinitions.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListLoggerDefinitions(ctx context.Context, params *ListLoggerDe addawsRestjson1_serdeOpListLoggerDefinitionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListResourceDefinitionVersions.go b/service/greengrass/api_op_ListResourceDefinitionVersions.go index e9c2a28b1d8..751ff8bd44d 100644 --- a/service/greengrass/api_op_ListResourceDefinitionVersions.go +++ b/service/greengrass/api_op_ListResourceDefinitionVersions.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListResourceDefinitionVersions(ctx context.Context, params *Lis addawsRestjson1_serdeOpListResourceDefinitionVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListResourceDefinitions.go b/service/greengrass/api_op_ListResourceDefinitions.go index d72ce4596cf..5ae4d2c24f3 100644 --- a/service/greengrass/api_op_ListResourceDefinitions.go +++ b/service/greengrass/api_op_ListResourceDefinitions.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListResourceDefinitions(ctx context.Context, params *ListResour addawsRestjson1_serdeOpListResourceDefinitionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListSubscriptionDefinitionVersions.go b/service/greengrass/api_op_ListSubscriptionDefinitionVersions.go index 8ecc470bd38..45c127e82d4 100644 --- a/service/greengrass/api_op_ListSubscriptionDefinitionVersions.go +++ b/service/greengrass/api_op_ListSubscriptionDefinitionVersions.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListSubscriptionDefinitionVersions(ctx context.Context, params addawsRestjson1_serdeOpListSubscriptionDefinitionVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListSubscriptionDefinitions.go b/service/greengrass/api_op_ListSubscriptionDefinitions.go index 9e588065f97..651a8fa19f7 100644 --- a/service/greengrass/api_op_ListSubscriptionDefinitions.go +++ b/service/greengrass/api_op_ListSubscriptionDefinitions.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListSubscriptionDefinitions(ctx context.Context, params *ListSu addawsRestjson1_serdeOpListSubscriptionDefinitionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ListTagsForResource.go b/service/greengrass/api_op_ListTagsForResource.go index fbe439b6eaf..8bd7998099e 100644 --- a/service/greengrass/api_op_ListTagsForResource.go +++ b/service/greengrass/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_ResetDeployments.go b/service/greengrass/api_op_ResetDeployments.go index 066e0dbf34f..c70f291923f 100644 --- a/service/greengrass/api_op_ResetDeployments.go +++ b/service/greengrass/api_op_ResetDeployments.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ResetDeployments(ctx context.Context, params *ResetDeploymentsI addawsRestjson1_serdeOpResetDeploymentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_StartBulkDeployment.go b/service/greengrass/api_op_StartBulkDeployment.go index a25c6f15ec2..feed4e9e60a 100644 --- a/service/greengrass/api_op_StartBulkDeployment.go +++ b/service/greengrass/api_op_StartBulkDeployment.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) StartBulkDeployment(ctx context.Context, params *StartBulkDeplo addawsRestjson1_serdeOpStartBulkDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_StopBulkDeployment.go b/service/greengrass/api_op_StopBulkDeployment.go index 9d0320b8b97..bed5ac22079 100644 --- a/service/greengrass/api_op_StopBulkDeployment.go +++ b/service/greengrass/api_op_StopBulkDeployment.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) StopBulkDeployment(ctx context.Context, params *StopBulkDeploym addawsRestjson1_serdeOpStopBulkDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_TagResource.go b/service/greengrass/api_op_TagResource.go index a0555dca06f..ef1558a42a7 100644 --- a/service/greengrass/api_op_TagResource.go +++ b/service/greengrass/api_op_TagResource.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_UntagResource.go b/service/greengrass/api_op_UntagResource.go index 743d68dd4d2..965c11e3526 100644 --- a/service/greengrass/api_op_UntagResource.go +++ b/service/greengrass/api_op_UntagResource.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_UpdateConnectivityInfo.go b/service/greengrass/api_op_UpdateConnectivityInfo.go index 2c25f662831..4c12d0c7aa2 100644 --- a/service/greengrass/api_op_UpdateConnectivityInfo.go +++ b/service/greengrass/api_op_UpdateConnectivityInfo.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/greengrass/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateConnectivityInfo(ctx context.Context, params *UpdateConne addawsRestjson1_serdeOpUpdateConnectivityInfoMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_UpdateConnectorDefinition.go b/service/greengrass/api_op_UpdateConnectorDefinition.go index 67e3d86a701..defda2d13a3 100644 --- a/service/greengrass/api_op_UpdateConnectorDefinition.go +++ b/service/greengrass/api_op_UpdateConnectorDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateConnectorDefinition(ctx context.Context, params *UpdateCo addawsRestjson1_serdeOpUpdateConnectorDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_UpdateCoreDefinition.go b/service/greengrass/api_op_UpdateCoreDefinition.go index e5769d778e1..8d8edbaa40e 100644 --- a/service/greengrass/api_op_UpdateCoreDefinition.go +++ b/service/greengrass/api_op_UpdateCoreDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateCoreDefinition(ctx context.Context, params *UpdateCoreDef addawsRestjson1_serdeOpUpdateCoreDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_UpdateDeviceDefinition.go b/service/greengrass/api_op_UpdateDeviceDefinition.go index 15921992b71..cc7adefad80 100644 --- a/service/greengrass/api_op_UpdateDeviceDefinition.go +++ b/service/greengrass/api_op_UpdateDeviceDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateDeviceDefinition(ctx context.Context, params *UpdateDevic addawsRestjson1_serdeOpUpdateDeviceDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_UpdateFunctionDefinition.go b/service/greengrass/api_op_UpdateFunctionDefinition.go index 0ca5c96f1b5..c8b49c060e3 100644 --- a/service/greengrass/api_op_UpdateFunctionDefinition.go +++ b/service/greengrass/api_op_UpdateFunctionDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateFunctionDefinition(ctx context.Context, params *UpdateFun addawsRestjson1_serdeOpUpdateFunctionDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_UpdateGroup.go b/service/greengrass/api_op_UpdateGroup.go index 14a286e7371..880d67558e1 100644 --- a/service/greengrass/api_op_UpdateGroup.go +++ b/service/greengrass/api_op_UpdateGroup.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateGroup(ctx context.Context, params *UpdateGroupInput, optF addawsRestjson1_serdeOpUpdateGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_UpdateGroupCertificateConfiguration.go b/service/greengrass/api_op_UpdateGroupCertificateConfiguration.go index 0d3e092a6b3..49cda3ea5cf 100644 --- a/service/greengrass/api_op_UpdateGroupCertificateConfiguration.go +++ b/service/greengrass/api_op_UpdateGroupCertificateConfiguration.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateGroupCertificateConfiguration(ctx context.Context, params addawsRestjson1_serdeOpUpdateGroupCertificateConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_UpdateLoggerDefinition.go b/service/greengrass/api_op_UpdateLoggerDefinition.go index 8fe7394cb25..83e136e2821 100644 --- a/service/greengrass/api_op_UpdateLoggerDefinition.go +++ b/service/greengrass/api_op_UpdateLoggerDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateLoggerDefinition(ctx context.Context, params *UpdateLogge addawsRestjson1_serdeOpUpdateLoggerDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_UpdateResourceDefinition.go b/service/greengrass/api_op_UpdateResourceDefinition.go index 819ac746f7c..6240d64bbd8 100644 --- a/service/greengrass/api_op_UpdateResourceDefinition.go +++ b/service/greengrass/api_op_UpdateResourceDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateResourceDefinition(ctx context.Context, params *UpdateRes addawsRestjson1_serdeOpUpdateResourceDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/api_op_UpdateSubscriptionDefinition.go b/service/greengrass/api_op_UpdateSubscriptionDefinition.go index 4cca91061b8..18a1b13a82c 100644 --- a/service/greengrass/api_op_UpdateSubscriptionDefinition.go +++ b/service/greengrass/api_op_UpdateSubscriptionDefinition.go @@ -5,7 +5,6 @@ package greengrass import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateSubscriptionDefinition(ctx context.Context, params *Updat addawsRestjson1_serdeOpUpdateSubscriptionDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/greengrass/endpoints.go b/service/greengrass/endpoints.go index c4506009da9..2f6008736b4 100644 --- a/service/greengrass/endpoints.go +++ b/service/greengrass/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/groundstation/api_client.go b/service/groundstation/api_client.go index f6e7b8f68c1..9bd604056bb 100644 --- a/service/groundstation/api_client.go +++ b/service/groundstation/api_client.go @@ -81,30 +81,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -170,6 +146,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/groundstation/api_op_CancelContact.go b/service/groundstation/api_op_CancelContact.go index 68a22e760f2..925f492fefc 100644 --- a/service/groundstation/api_op_CancelContact.go +++ b/service/groundstation/api_op_CancelContact.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CancelContact(ctx context.Context, params *CancelContactInput, addawsRestjson1_serdeOpCancelContactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_CreateConfig.go b/service/groundstation/api_op_CreateConfig.go index 44a87b21740..37d7ee1434c 100644 --- a/service/groundstation/api_op_CreateConfig.go +++ b/service/groundstation/api_op_CreateConfig.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/groundstation/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateConfig(ctx context.Context, params *CreateConfigInput, op addawsRestjson1_serdeOpCreateConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_CreateDataflowEndpointGroup.go b/service/groundstation/api_op_CreateDataflowEndpointGroup.go index 2b1cc39cd8d..cf7a2feb935 100644 --- a/service/groundstation/api_op_CreateDataflowEndpointGroup.go +++ b/service/groundstation/api_op_CreateDataflowEndpointGroup.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/groundstation/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateDataflowEndpointGroup(ctx context.Context, params *Create addawsRestjson1_serdeOpCreateDataflowEndpointGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_CreateMissionProfile.go b/service/groundstation/api_op_CreateMissionProfile.go index 433a7bd6938..4b212bee705 100644 --- a/service/groundstation/api_op_CreateMissionProfile.go +++ b/service/groundstation/api_op_CreateMissionProfile.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateMissionProfile(ctx context.Context, params *CreateMission addawsRestjson1_serdeOpCreateMissionProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_DeleteConfig.go b/service/groundstation/api_op_DeleteConfig.go index 17a42bbedc0..547d38d0895 100644 --- a/service/groundstation/api_op_DeleteConfig.go +++ b/service/groundstation/api_op_DeleteConfig.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/groundstation/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteConfig(ctx context.Context, params *DeleteConfigInput, op addawsRestjson1_serdeOpDeleteConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_DeleteDataflowEndpointGroup.go b/service/groundstation/api_op_DeleteDataflowEndpointGroup.go index d0648e270c8..9805b74352f 100644 --- a/service/groundstation/api_op_DeleteDataflowEndpointGroup.go +++ b/service/groundstation/api_op_DeleteDataflowEndpointGroup.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDataflowEndpointGroup(ctx context.Context, params *Delete addawsRestjson1_serdeOpDeleteDataflowEndpointGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_DeleteMissionProfile.go b/service/groundstation/api_op_DeleteMissionProfile.go index e79ba562f5a..bc971a7a02c 100644 --- a/service/groundstation/api_op_DeleteMissionProfile.go +++ b/service/groundstation/api_op_DeleteMissionProfile.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteMissionProfile(ctx context.Context, params *DeleteMission addawsRestjson1_serdeOpDeleteMissionProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_DescribeContact.go b/service/groundstation/api_op_DescribeContact.go index 17a3b111798..b22c94cd7f4 100644 --- a/service/groundstation/api_op_DescribeContact.go +++ b/service/groundstation/api_op_DescribeContact.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/groundstation/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeContact(ctx context.Context, params *DescribeContactInp addawsRestjson1_serdeOpDescribeContactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_GetConfig.go b/service/groundstation/api_op_GetConfig.go index 67cebc05f56..c38f6fc8d49 100644 --- a/service/groundstation/api_op_GetConfig.go +++ b/service/groundstation/api_op_GetConfig.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/groundstation/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetConfig(ctx context.Context, params *GetConfigInput, optFns . addawsRestjson1_serdeOpGetConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_GetDataflowEndpointGroup.go b/service/groundstation/api_op_GetDataflowEndpointGroup.go index 6b6e6d49dcb..d6cf2e80eb6 100644 --- a/service/groundstation/api_op_GetDataflowEndpointGroup.go +++ b/service/groundstation/api_op_GetDataflowEndpointGroup.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/groundstation/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDataflowEndpointGroup(ctx context.Context, params *GetDatafl addawsRestjson1_serdeOpGetDataflowEndpointGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_GetMinuteUsage.go b/service/groundstation/api_op_GetMinuteUsage.go index 2d892730117..5015ca6129a 100644 --- a/service/groundstation/api_op_GetMinuteUsage.go +++ b/service/groundstation/api_op_GetMinuteUsage.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetMinuteUsage(ctx context.Context, params *GetMinuteUsageInput addawsRestjson1_serdeOpGetMinuteUsageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_GetMissionProfile.go b/service/groundstation/api_op_GetMissionProfile.go index f32325e9779..8fe4f0ede4c 100644 --- a/service/groundstation/api_op_GetMissionProfile.go +++ b/service/groundstation/api_op_GetMissionProfile.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetMissionProfile(ctx context.Context, params *GetMissionProfil addawsRestjson1_serdeOpGetMissionProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_GetSatellite.go b/service/groundstation/api_op_GetSatellite.go index 05f0aa31ef2..6c14970d42f 100644 --- a/service/groundstation/api_op_GetSatellite.go +++ b/service/groundstation/api_op_GetSatellite.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetSatellite(ctx context.Context, params *GetSatelliteInput, op addawsRestjson1_serdeOpGetSatelliteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_ListConfigs.go b/service/groundstation/api_op_ListConfigs.go index 059638c1f6a..77f6e4839c6 100644 --- a/service/groundstation/api_op_ListConfigs.go +++ b/service/groundstation/api_op_ListConfigs.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/groundstation/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListConfigs(ctx context.Context, params *ListConfigsInput, optF addawsRestjson1_serdeOpListConfigsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_ListContacts.go b/service/groundstation/api_op_ListContacts.go index 78b45b8cbb3..400c67684f8 100644 --- a/service/groundstation/api_op_ListContacts.go +++ b/service/groundstation/api_op_ListContacts.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/groundstation/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListContacts(ctx context.Context, params *ListContactsInput, op addawsRestjson1_serdeOpListContactsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_ListDataflowEndpointGroups.go b/service/groundstation/api_op_ListDataflowEndpointGroups.go index 4dd8bca495d..d07a03627fa 100644 --- a/service/groundstation/api_op_ListDataflowEndpointGroups.go +++ b/service/groundstation/api_op_ListDataflowEndpointGroups.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/groundstation/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDataflowEndpointGroups(ctx context.Context, params *ListDat addawsRestjson1_serdeOpListDataflowEndpointGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_ListGroundStations.go b/service/groundstation/api_op_ListGroundStations.go index 9e309cda688..026b79e7a89 100644 --- a/service/groundstation/api_op_ListGroundStations.go +++ b/service/groundstation/api_op_ListGroundStations.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/groundstation/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListGroundStations(ctx context.Context, params *ListGroundStati addawsRestjson1_serdeOpListGroundStationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_ListMissionProfiles.go b/service/groundstation/api_op_ListMissionProfiles.go index 4f1ad44076c..fc74196c795 100644 --- a/service/groundstation/api_op_ListMissionProfiles.go +++ b/service/groundstation/api_op_ListMissionProfiles.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/groundstation/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListMissionProfiles(ctx context.Context, params *ListMissionPro addawsRestjson1_serdeOpListMissionProfilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_ListSatellites.go b/service/groundstation/api_op_ListSatellites.go index 73004559c9e..466990a5f6d 100644 --- a/service/groundstation/api_op_ListSatellites.go +++ b/service/groundstation/api_op_ListSatellites.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/groundstation/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListSatellites(ctx context.Context, params *ListSatellitesInput addawsRestjson1_serdeOpListSatellitesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_ListTagsForResource.go b/service/groundstation/api_op_ListTagsForResource.go index 496842450a2..37068b2c99a 100644 --- a/service/groundstation/api_op_ListTagsForResource.go +++ b/service/groundstation/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_ReserveContact.go b/service/groundstation/api_op_ReserveContact.go index 936d5a204cb..0a6dcd43b8d 100644 --- a/service/groundstation/api_op_ReserveContact.go +++ b/service/groundstation/api_op_ReserveContact.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ReserveContact(ctx context.Context, params *ReserveContactInput addawsRestjson1_serdeOpReserveContactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_TagResource.go b/service/groundstation/api_op_TagResource.go index 6c2505e8667..2e462380e0e 100644 --- a/service/groundstation/api_op_TagResource.go +++ b/service/groundstation/api_op_TagResource.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_UntagResource.go b/service/groundstation/api_op_UntagResource.go index 959e644634a..7429e6abeb4 100644 --- a/service/groundstation/api_op_UntagResource.go +++ b/service/groundstation/api_op_UntagResource.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_UpdateConfig.go b/service/groundstation/api_op_UpdateConfig.go index d1e89a4819b..910eec212ee 100644 --- a/service/groundstation/api_op_UpdateConfig.go +++ b/service/groundstation/api_op_UpdateConfig.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/groundstation/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateConfig(ctx context.Context, params *UpdateConfigInput, op addawsRestjson1_serdeOpUpdateConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/api_op_UpdateMissionProfile.go b/service/groundstation/api_op_UpdateMissionProfile.go index 1072274636b..95bc5105c6c 100644 --- a/service/groundstation/api_op_UpdateMissionProfile.go +++ b/service/groundstation/api_op_UpdateMissionProfile.go @@ -5,7 +5,6 @@ package groundstation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpdateMissionProfile(ctx context.Context, params *UpdateMission addawsRestjson1_serdeOpUpdateMissionProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/groundstation/endpoints.go b/service/groundstation/endpoints.go index 9e58031c21a..b30b5e01862 100644 --- a/service/groundstation/endpoints.go +++ b/service/groundstation/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/guardduty/api_client.go b/service/guardduty/api_client.go index d919f775854..f411c7cd391 100644 --- a/service/guardduty/api_client.go +++ b/service/guardduty/api_client.go @@ -100,34 +100,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -200,6 +172,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/guardduty/api_op_AcceptInvitation.go b/service/guardduty/api_op_AcceptInvitation.go index 7ca815c0abe..e6165f4f61c 100644 --- a/service/guardduty/api_op_AcceptInvitation.go +++ b/service/guardduty/api_op_AcceptInvitation.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AcceptInvitation(ctx context.Context, params *AcceptInvitationI addawsRestjson1_serdeOpAcceptInvitationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_ArchiveFindings.go b/service/guardduty/api_op_ArchiveFindings.go index 0b766493d2c..4489d74ad33 100644 --- a/service/guardduty/api_op_ArchiveFindings.go +++ b/service/guardduty/api_op_ArchiveFindings.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ArchiveFindings(ctx context.Context, params *ArchiveFindingsInp addawsRestjson1_serdeOpArchiveFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_CreateDetector.go b/service/guardduty/api_op_CreateDetector.go index 328474c657b..533cb348f43 100644 --- a/service/guardduty/api_op_CreateDetector.go +++ b/service/guardduty/api_op_CreateDetector.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateDetector(ctx context.Context, params *CreateDetectorInput addawsRestjson1_serdeOpCreateDetectorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_CreateFilter.go b/service/guardduty/api_op_CreateFilter.go index 5d3d9b97954..54928a362fb 100644 --- a/service/guardduty/api_op_CreateFilter.go +++ b/service/guardduty/api_op_CreateFilter.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateFilter(ctx context.Context, params *CreateFilterInput, op addawsRestjson1_serdeOpCreateFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_CreateIPSet.go b/service/guardduty/api_op_CreateIPSet.go index bc7975f588b..ecc746da230 100644 --- a/service/guardduty/api_op_CreateIPSet.go +++ b/service/guardduty/api_op_CreateIPSet.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateIPSet(ctx context.Context, params *CreateIPSetInput, optF addawsRestjson1_serdeOpCreateIPSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_CreateMembers.go b/service/guardduty/api_op_CreateMembers.go index 21b5da8470d..e87ba6b8ab4 100644 --- a/service/guardduty/api_op_CreateMembers.go +++ b/service/guardduty/api_op_CreateMembers.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateMembers(ctx context.Context, params *CreateMembersInput, addawsRestjson1_serdeOpCreateMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_CreatePublishingDestination.go b/service/guardduty/api_op_CreatePublishingDestination.go index e8a164e2a5c..244ec049b19 100644 --- a/service/guardduty/api_op_CreatePublishingDestination.go +++ b/service/guardduty/api_op_CreatePublishingDestination.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreatePublishingDestination(ctx context.Context, params *Create addawsRestjson1_serdeOpCreatePublishingDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_CreateSampleFindings.go b/service/guardduty/api_op_CreateSampleFindings.go index edc6cee1f39..85ad9aa46ad 100644 --- a/service/guardduty/api_op_CreateSampleFindings.go +++ b/service/guardduty/api_op_CreateSampleFindings.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CreateSampleFindings(ctx context.Context, params *CreateSampleF addawsRestjson1_serdeOpCreateSampleFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_CreateThreatIntelSet.go b/service/guardduty/api_op_CreateThreatIntelSet.go index 9c86b43570d..afaa7c091b5 100644 --- a/service/guardduty/api_op_CreateThreatIntelSet.go +++ b/service/guardduty/api_op_CreateThreatIntelSet.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateThreatIntelSet(ctx context.Context, params *CreateThreatI addawsRestjson1_serdeOpCreateThreatIntelSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_DeclineInvitations.go b/service/guardduty/api_op_DeclineInvitations.go index db011ac2d68..fdd80a9671b 100644 --- a/service/guardduty/api_op_DeclineInvitations.go +++ b/service/guardduty/api_op_DeclineInvitations.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeclineInvitations(ctx context.Context, params *DeclineInvitati addawsRestjson1_serdeOpDeclineInvitationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_DeleteDetector.go b/service/guardduty/api_op_DeleteDetector.go index d04fc7bd025..6c67c58fc25 100644 --- a/service/guardduty/api_op_DeleteDetector.go +++ b/service/guardduty/api_op_DeleteDetector.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDetector(ctx context.Context, params *DeleteDetectorInput addawsRestjson1_serdeOpDeleteDetectorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_DeleteFilter.go b/service/guardduty/api_op_DeleteFilter.go index 0e8d5cb7b64..edb72bbb58e 100644 --- a/service/guardduty/api_op_DeleteFilter.go +++ b/service/guardduty/api_op_DeleteFilter.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteFilter(ctx context.Context, params *DeleteFilterInput, op addawsRestjson1_serdeOpDeleteFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_DeleteIPSet.go b/service/guardduty/api_op_DeleteIPSet.go index db8d9c80d8c..4b6d6a99d57 100644 --- a/service/guardduty/api_op_DeleteIPSet.go +++ b/service/guardduty/api_op_DeleteIPSet.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteIPSet(ctx context.Context, params *DeleteIPSetInput, optF addawsRestjson1_serdeOpDeleteIPSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_DeleteInvitations.go b/service/guardduty/api_op_DeleteInvitations.go index 0d81b09b5aa..2e937ffaa36 100644 --- a/service/guardduty/api_op_DeleteInvitations.go +++ b/service/guardduty/api_op_DeleteInvitations.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteInvitations(ctx context.Context, params *DeleteInvitation addawsRestjson1_serdeOpDeleteInvitationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_DeleteMembers.go b/service/guardduty/api_op_DeleteMembers.go index be618e7c4a1..df9fcdad6bb 100644 --- a/service/guardduty/api_op_DeleteMembers.go +++ b/service/guardduty/api_op_DeleteMembers.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteMembers(ctx context.Context, params *DeleteMembersInput, addawsRestjson1_serdeOpDeleteMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_DeletePublishingDestination.go b/service/guardduty/api_op_DeletePublishingDestination.go index 9b4252518a7..18a3ea4467e 100644 --- a/service/guardduty/api_op_DeletePublishingDestination.go +++ b/service/guardduty/api_op_DeletePublishingDestination.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeletePublishingDestination(ctx context.Context, params *Delete addawsRestjson1_serdeOpDeletePublishingDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_DeleteThreatIntelSet.go b/service/guardduty/api_op_DeleteThreatIntelSet.go index ed3c345dc17..4465c119569 100644 --- a/service/guardduty/api_op_DeleteThreatIntelSet.go +++ b/service/guardduty/api_op_DeleteThreatIntelSet.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteThreatIntelSet(ctx context.Context, params *DeleteThreatI addawsRestjson1_serdeOpDeleteThreatIntelSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_DescribeOrganizationConfiguration.go b/service/guardduty/api_op_DescribeOrganizationConfiguration.go index f72e02b041b..6c4de9e2021 100644 --- a/service/guardduty/api_op_DescribeOrganizationConfiguration.go +++ b/service/guardduty/api_op_DescribeOrganizationConfiguration.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeOrganizationConfiguration(ctx context.Context, params * addawsRestjson1_serdeOpDescribeOrganizationConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_DescribePublishingDestination.go b/service/guardduty/api_op_DescribePublishingDestination.go index 2ed33a11075..f7daf2810ec 100644 --- a/service/guardduty/api_op_DescribePublishingDestination.go +++ b/service/guardduty/api_op_DescribePublishingDestination.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribePublishingDestination(ctx context.Context, params *Desc addawsRestjson1_serdeOpDescribePublishingDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_DisableOrganizationAdminAccount.go b/service/guardduty/api_op_DisableOrganizationAdminAccount.go index 2f3f36e04e7..32f3767a5fe 100644 --- a/service/guardduty/api_op_DisableOrganizationAdminAccount.go +++ b/service/guardduty/api_op_DisableOrganizationAdminAccount.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisableOrganizationAdminAccount(ctx context.Context, params *Di addawsRestjson1_serdeOpDisableOrganizationAdminAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_DisassociateFromMasterAccount.go b/service/guardduty/api_op_DisassociateFromMasterAccount.go index 6d15cb3430a..8254c39d56b 100644 --- a/service/guardduty/api_op_DisassociateFromMasterAccount.go +++ b/service/guardduty/api_op_DisassociateFromMasterAccount.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisassociateFromMasterAccount(ctx context.Context, params *Disa addawsRestjson1_serdeOpDisassociateFromMasterAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_DisassociateMembers.go b/service/guardduty/api_op_DisassociateMembers.go index 0891570e055..6ce839ed789 100644 --- a/service/guardduty/api_op_DisassociateMembers.go +++ b/service/guardduty/api_op_DisassociateMembers.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DisassociateMembers(ctx context.Context, params *DisassociateMe addawsRestjson1_serdeOpDisassociateMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_EnableOrganizationAdminAccount.go b/service/guardduty/api_op_EnableOrganizationAdminAccount.go index 655dec36df2..3f447e6bf9e 100644 --- a/service/guardduty/api_op_EnableOrganizationAdminAccount.go +++ b/service/guardduty/api_op_EnableOrganizationAdminAccount.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) EnableOrganizationAdminAccount(ctx context.Context, params *Ena addawsRestjson1_serdeOpEnableOrganizationAdminAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_GetDetector.go b/service/guardduty/api_op_GetDetector.go index 4d15d0b9f3f..d52a1ef1d06 100644 --- a/service/guardduty/api_op_GetDetector.go +++ b/service/guardduty/api_op_GetDetector.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDetector(ctx context.Context, params *GetDetectorInput, optF addawsRestjson1_serdeOpGetDetectorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_GetFilter.go b/service/guardduty/api_op_GetFilter.go index 01244879e74..9727fe477e7 100644 --- a/service/guardduty/api_op_GetFilter.go +++ b/service/guardduty/api_op_GetFilter.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetFilter(ctx context.Context, params *GetFilterInput, optFns . addawsRestjson1_serdeOpGetFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_GetFindings.go b/service/guardduty/api_op_GetFindings.go index 24f3f1723e9..8c786798176 100644 --- a/service/guardduty/api_op_GetFindings.go +++ b/service/guardduty/api_op_GetFindings.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetFindings(ctx context.Context, params *GetFindingsInput, optF addawsRestjson1_serdeOpGetFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_GetFindingsStatistics.go b/service/guardduty/api_op_GetFindingsStatistics.go index 730c4567435..fb9217aba9a 100644 --- a/service/guardduty/api_op_GetFindingsStatistics.go +++ b/service/guardduty/api_op_GetFindingsStatistics.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetFindingsStatistics(ctx context.Context, params *GetFindingsS addawsRestjson1_serdeOpGetFindingsStatisticsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_GetIPSet.go b/service/guardduty/api_op_GetIPSet.go index 0add0fd244a..1725c0932db 100644 --- a/service/guardduty/api_op_GetIPSet.go +++ b/service/guardduty/api_op_GetIPSet.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetIPSet(ctx context.Context, params *GetIPSetInput, optFns ... addawsRestjson1_serdeOpGetIPSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_GetInvitationsCount.go b/service/guardduty/api_op_GetInvitationsCount.go index af72466f5af..c8b921fedba 100644 --- a/service/guardduty/api_op_GetInvitationsCount.go +++ b/service/guardduty/api_op_GetInvitationsCount.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetInvitationsCount(ctx context.Context, params *GetInvitations addawsRestjson1_serdeOpGetInvitationsCountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_GetMasterAccount.go b/service/guardduty/api_op_GetMasterAccount.go index ea166509481..6b6e42649a6 100644 --- a/service/guardduty/api_op_GetMasterAccount.go +++ b/service/guardduty/api_op_GetMasterAccount.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetMasterAccount(ctx context.Context, params *GetMasterAccountI addawsRestjson1_serdeOpGetMasterAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_GetMemberDetectors.go b/service/guardduty/api_op_GetMemberDetectors.go index 6b3a69d3cdf..539c559eb96 100644 --- a/service/guardduty/api_op_GetMemberDetectors.go +++ b/service/guardduty/api_op_GetMemberDetectors.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetMemberDetectors(ctx context.Context, params *GetMemberDetect addawsRestjson1_serdeOpGetMemberDetectorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_GetMembers.go b/service/guardduty/api_op_GetMembers.go index 16eca215009..d2bfd41cd50 100644 --- a/service/guardduty/api_op_GetMembers.go +++ b/service/guardduty/api_op_GetMembers.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetMembers(ctx context.Context, params *GetMembersInput, optFns addawsRestjson1_serdeOpGetMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_GetThreatIntelSet.go b/service/guardduty/api_op_GetThreatIntelSet.go index a839c13e09d..0477f26426b 100644 --- a/service/guardduty/api_op_GetThreatIntelSet.go +++ b/service/guardduty/api_op_GetThreatIntelSet.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetThreatIntelSet(ctx context.Context, params *GetThreatIntelSe addawsRestjson1_serdeOpGetThreatIntelSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_GetUsageStatistics.go b/service/guardduty/api_op_GetUsageStatistics.go index 433bd20bd76..0a65dc61c37 100644 --- a/service/guardduty/api_op_GetUsageStatistics.go +++ b/service/guardduty/api_op_GetUsageStatistics.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetUsageStatistics(ctx context.Context, params *GetUsageStatist addawsRestjson1_serdeOpGetUsageStatisticsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_InviteMembers.go b/service/guardduty/api_op_InviteMembers.go index e2510362137..658f54cb7f3 100644 --- a/service/guardduty/api_op_InviteMembers.go +++ b/service/guardduty/api_op_InviteMembers.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) InviteMembers(ctx context.Context, params *InviteMembersInput, addawsRestjson1_serdeOpInviteMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_ListDetectors.go b/service/guardduty/api_op_ListDetectors.go index 79cbe816522..81054795e3a 100644 --- a/service/guardduty/api_op_ListDetectors.go +++ b/service/guardduty/api_op_ListDetectors.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListDetectors(ctx context.Context, params *ListDetectorsInput, addawsRestjson1_serdeOpListDetectorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_ListFilters.go b/service/guardduty/api_op_ListFilters.go index e459c1f4e98..8de7c553e25 100644 --- a/service/guardduty/api_op_ListFilters.go +++ b/service/guardduty/api_op_ListFilters.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListFilters(ctx context.Context, params *ListFiltersInput, optF addawsRestjson1_serdeOpListFiltersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_ListFindings.go b/service/guardduty/api_op_ListFindings.go index 185da9306fd..3db733fa33d 100644 --- a/service/guardduty/api_op_ListFindings.go +++ b/service/guardduty/api_op_ListFindings.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListFindings(ctx context.Context, params *ListFindingsInput, op addawsRestjson1_serdeOpListFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_ListIPSets.go b/service/guardduty/api_op_ListIPSets.go index c95c9a7ac01..546fe4ed709 100644 --- a/service/guardduty/api_op_ListIPSets.go +++ b/service/guardduty/api_op_ListIPSets.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ListIPSets(ctx context.Context, params *ListIPSetsInput, optFns addawsRestjson1_serdeOpListIPSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_ListInvitations.go b/service/guardduty/api_op_ListInvitations.go index ab3368d2edf..dad97ca587d 100644 --- a/service/guardduty/api_op_ListInvitations.go +++ b/service/guardduty/api_op_ListInvitations.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListInvitations(ctx context.Context, params *ListInvitationsInp addawsRestjson1_serdeOpListInvitationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_ListMembers.go b/service/guardduty/api_op_ListMembers.go index 816d4a546c9..0da67823637 100644 --- a/service/guardduty/api_op_ListMembers.go +++ b/service/guardduty/api_op_ListMembers.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListMembers(ctx context.Context, params *ListMembersInput, optF addawsRestjson1_serdeOpListMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_ListOrganizationAdminAccounts.go b/service/guardduty/api_op_ListOrganizationAdminAccounts.go index 42e926df82f..55d694485db 100644 --- a/service/guardduty/api_op_ListOrganizationAdminAccounts.go +++ b/service/guardduty/api_op_ListOrganizationAdminAccounts.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListOrganizationAdminAccounts(ctx context.Context, params *List addawsRestjson1_serdeOpListOrganizationAdminAccountsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_ListPublishingDestinations.go b/service/guardduty/api_op_ListPublishingDestinations.go index e4d7fcf2ffa..d2c34d6ad62 100644 --- a/service/guardduty/api_op_ListPublishingDestinations.go +++ b/service/guardduty/api_op_ListPublishingDestinations.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListPublishingDestinations(ctx context.Context, params *ListPub addawsRestjson1_serdeOpListPublishingDestinationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_ListTagsForResource.go b/service/guardduty/api_op_ListTagsForResource.go index 1978411ca59..8b40b7f3fd3 100644 --- a/service/guardduty/api_op_ListTagsForResource.go +++ b/service/guardduty/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_ListThreatIntelSets.go b/service/guardduty/api_op_ListThreatIntelSets.go index cdee224357e..71eafebed67 100644 --- a/service/guardduty/api_op_ListThreatIntelSets.go +++ b/service/guardduty/api_op_ListThreatIntelSets.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ListThreatIntelSets(ctx context.Context, params *ListThreatInte addawsRestjson1_serdeOpListThreatIntelSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_StartMonitoringMembers.go b/service/guardduty/api_op_StartMonitoringMembers.go index 022510219f5..8fab795fcc1 100644 --- a/service/guardduty/api_op_StartMonitoringMembers.go +++ b/service/guardduty/api_op_StartMonitoringMembers.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) StartMonitoringMembers(ctx context.Context, params *StartMonito addawsRestjson1_serdeOpStartMonitoringMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_StopMonitoringMembers.go b/service/guardduty/api_op_StopMonitoringMembers.go index 1155b4c9b30..0bae6d9cf67 100644 --- a/service/guardduty/api_op_StopMonitoringMembers.go +++ b/service/guardduty/api_op_StopMonitoringMembers.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) StopMonitoringMembers(ctx context.Context, params *StopMonitori addawsRestjson1_serdeOpStopMonitoringMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_TagResource.go b/service/guardduty/api_op_TagResource.go index 66c22d2cb51..8243800bab0 100644 --- a/service/guardduty/api_op_TagResource.go +++ b/service/guardduty/api_op_TagResource.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_UnarchiveFindings.go b/service/guardduty/api_op_UnarchiveFindings.go index ecf73577fc8..fdc48ed0976 100644 --- a/service/guardduty/api_op_UnarchiveFindings.go +++ b/service/guardduty/api_op_UnarchiveFindings.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UnarchiveFindings(ctx context.Context, params *UnarchiveFinding addawsRestjson1_serdeOpUnarchiveFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_UntagResource.go b/service/guardduty/api_op_UntagResource.go index de8d463448e..b074f01447a 100644 --- a/service/guardduty/api_op_UntagResource.go +++ b/service/guardduty/api_op_UntagResource.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_UpdateDetector.go b/service/guardduty/api_op_UpdateDetector.go index 1fb8d671ab2..d85411bdd70 100644 --- a/service/guardduty/api_op_UpdateDetector.go +++ b/service/guardduty/api_op_UpdateDetector.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDetector(ctx context.Context, params *UpdateDetectorInput addawsRestjson1_serdeOpUpdateDetectorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_UpdateFilter.go b/service/guardduty/api_op_UpdateFilter.go index ce4232cb3d9..9ef0290e449 100644 --- a/service/guardduty/api_op_UpdateFilter.go +++ b/service/guardduty/api_op_UpdateFilter.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateFilter(ctx context.Context, params *UpdateFilterInput, op addawsRestjson1_serdeOpUpdateFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_UpdateFindingsFeedback.go b/service/guardduty/api_op_UpdateFindingsFeedback.go index 235d9a9d077..78ee741b29d 100644 --- a/service/guardduty/api_op_UpdateFindingsFeedback.go +++ b/service/guardduty/api_op_UpdateFindingsFeedback.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateFindingsFeedback(ctx context.Context, params *UpdateFindi addawsRestjson1_serdeOpUpdateFindingsFeedbackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_UpdateIPSet.go b/service/guardduty/api_op_UpdateIPSet.go index a1553718f0f..25fb6081111 100644 --- a/service/guardduty/api_op_UpdateIPSet.go +++ b/service/guardduty/api_op_UpdateIPSet.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateIPSet(ctx context.Context, params *UpdateIPSetInput, optF addawsRestjson1_serdeOpUpdateIPSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_UpdateMemberDetectors.go b/service/guardduty/api_op_UpdateMemberDetectors.go index 7b2cc64c3d2..f4484ba8667 100644 --- a/service/guardduty/api_op_UpdateMemberDetectors.go +++ b/service/guardduty/api_op_UpdateMemberDetectors.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateMemberDetectors(ctx context.Context, params *UpdateMember addawsRestjson1_serdeOpUpdateMemberDetectorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_UpdateOrganizationConfiguration.go b/service/guardduty/api_op_UpdateOrganizationConfiguration.go index 97da5c19472..4e8a7707f2b 100644 --- a/service/guardduty/api_op_UpdateOrganizationConfiguration.go +++ b/service/guardduty/api_op_UpdateOrganizationConfiguration.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateOrganizationConfiguration(ctx context.Context, params *Up addawsRestjson1_serdeOpUpdateOrganizationConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_UpdatePublishingDestination.go b/service/guardduty/api_op_UpdatePublishingDestination.go index 4725136f6fd..1da8b73803b 100644 --- a/service/guardduty/api_op_UpdatePublishingDestination.go +++ b/service/guardduty/api_op_UpdatePublishingDestination.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/guardduty/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdatePublishingDestination(ctx context.Context, params *Update addawsRestjson1_serdeOpUpdatePublishingDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/api_op_UpdateThreatIntelSet.go b/service/guardduty/api_op_UpdateThreatIntelSet.go index c9c64bbbbfb..520f8c26aa2 100644 --- a/service/guardduty/api_op_UpdateThreatIntelSet.go +++ b/service/guardduty/api_op_UpdateThreatIntelSet.go @@ -5,7 +5,6 @@ package guardduty import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateThreatIntelSet(ctx context.Context, params *UpdateThreatI addawsRestjson1_serdeOpUpdateThreatIntelSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/guardduty/endpoints.go b/service/guardduty/endpoints.go index e8fdf4ac48e..72ac7c70eaf 100644 --- a/service/guardduty/endpoints.go +++ b/service/guardduty/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/health/api_client.go b/service/health/api_client.go index 07234e74d84..7265149cb27 100644 --- a/service/health/api_client.go +++ b/service/health/api_client.go @@ -120,30 +120,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -209,6 +185,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/health/api_op_DescribeAffectedAccountsForOrganization.go b/service/health/api_op_DescribeAffectedAccountsForOrganization.go index 521e1f689a3..9bd86dfa82e 100644 --- a/service/health/api_op_DescribeAffectedAccountsForOrganization.go +++ b/service/health/api_op_DescribeAffectedAccountsForOrganization.go @@ -5,7 +5,6 @@ package health import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/health/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeAffectedAccountsForOrganization(ctx context.Context, pa addawsAwsjson11_serdeOpDescribeAffectedAccountsForOrganizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/health/api_op_DescribeAffectedEntities.go b/service/health/api_op_DescribeAffectedEntities.go index 106e725a764..8f392009c29 100644 --- a/service/health/api_op_DescribeAffectedEntities.go +++ b/service/health/api_op_DescribeAffectedEntities.go @@ -5,7 +5,6 @@ package health import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/health/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeAffectedEntities(ctx context.Context, params *DescribeA addawsAwsjson11_serdeOpDescribeAffectedEntitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/health/api_op_DescribeAffectedEntitiesForOrganization.go b/service/health/api_op_DescribeAffectedEntitiesForOrganization.go index 4e1c22b4c4d..1e9b15c84a5 100644 --- a/service/health/api_op_DescribeAffectedEntitiesForOrganization.go +++ b/service/health/api_op_DescribeAffectedEntitiesForOrganization.go @@ -5,7 +5,6 @@ package health import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/health/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DescribeAffectedEntitiesForOrganization(ctx context.Context, pa addawsAwsjson11_serdeOpDescribeAffectedEntitiesForOrganizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/health/api_op_DescribeEntityAggregates.go b/service/health/api_op_DescribeEntityAggregates.go index b7f1a56e313..eae5ea63719 100644 --- a/service/health/api_op_DescribeEntityAggregates.go +++ b/service/health/api_op_DescribeEntityAggregates.go @@ -5,7 +5,6 @@ package health import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/health/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeEntityAggregates(ctx context.Context, params *DescribeE addawsAwsjson11_serdeOpDescribeEntityAggregatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/health/api_op_DescribeEventAggregates.go b/service/health/api_op_DescribeEventAggregates.go index 1efd584bfce..7cca00fe534 100644 --- a/service/health/api_op_DescribeEventAggregates.go +++ b/service/health/api_op_DescribeEventAggregates.go @@ -5,7 +5,6 @@ package health import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/health/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeEventAggregates(ctx context.Context, params *DescribeEv addawsAwsjson11_serdeOpDescribeEventAggregatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/health/api_op_DescribeEventDetails.go b/service/health/api_op_DescribeEventDetails.go index 6aedd59584c..146727167a6 100644 --- a/service/health/api_op_DescribeEventDetails.go +++ b/service/health/api_op_DescribeEventDetails.go @@ -5,7 +5,6 @@ package health import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/health/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeEventDetails(ctx context.Context, params *DescribeEvent addawsAwsjson11_serdeOpDescribeEventDetailsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/health/api_op_DescribeEventDetailsForOrganization.go b/service/health/api_op_DescribeEventDetailsForOrganization.go index a809146edde..dd9e2a232a7 100644 --- a/service/health/api_op_DescribeEventDetailsForOrganization.go +++ b/service/health/api_op_DescribeEventDetailsForOrganization.go @@ -5,7 +5,6 @@ package health import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/health/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DescribeEventDetailsForOrganization(ctx context.Context, params addawsAwsjson11_serdeOpDescribeEventDetailsForOrganizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/health/api_op_DescribeEventTypes.go b/service/health/api_op_DescribeEventTypes.go index fc39f65b4a5..51311003a58 100644 --- a/service/health/api_op_DescribeEventTypes.go +++ b/service/health/api_op_DescribeEventTypes.go @@ -5,7 +5,6 @@ package health import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/health/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEventTypes(ctx context.Context, params *DescribeEventTy addawsAwsjson11_serdeOpDescribeEventTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/health/api_op_DescribeEvents.go b/service/health/api_op_DescribeEvents.go index f7195491458..b76e02b7146 100644 --- a/service/health/api_op_DescribeEvents.go +++ b/service/health/api_op_DescribeEvents.go @@ -5,7 +5,6 @@ package health import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/health/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeEvents(ctx context.Context, params *DescribeEventsInput addawsAwsjson11_serdeOpDescribeEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/health/api_op_DescribeEventsForOrganization.go b/service/health/api_op_DescribeEventsForOrganization.go index 2ed9134fdb3..8f053dfda86 100644 --- a/service/health/api_op_DescribeEventsForOrganization.go +++ b/service/health/api_op_DescribeEventsForOrganization.go @@ -5,7 +5,6 @@ package health import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/health/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) DescribeEventsForOrganization(ctx context.Context, params *Desc addawsAwsjson11_serdeOpDescribeEventsForOrganizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/health/api_op_DescribeHealthServiceStatusForOrganization.go b/service/health/api_op_DescribeHealthServiceStatusForOrganization.go index 6606834178b..418e243c789 100644 --- a/service/health/api_op_DescribeHealthServiceStatusForOrganization.go +++ b/service/health/api_op_DescribeHealthServiceStatusForOrganization.go @@ -5,7 +5,6 @@ package health import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DescribeHealthServiceStatusForOrganization(ctx context.Context, addawsAwsjson11_serdeOpDescribeHealthServiceStatusForOrganizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/health/api_op_DisableHealthServiceAccessForOrganization.go b/service/health/api_op_DisableHealthServiceAccessForOrganization.go index 85836f143bf..517eb3326ed 100644 --- a/service/health/api_op_DisableHealthServiceAccessForOrganization.go +++ b/service/health/api_op_DisableHealthServiceAccessForOrganization.go @@ -5,7 +5,6 @@ package health import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DisableHealthServiceAccessForOrganization(ctx context.Context, addawsAwsjson11_serdeOpDisableHealthServiceAccessForOrganizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/health/api_op_EnableHealthServiceAccessForOrganization.go b/service/health/api_op_EnableHealthServiceAccessForOrganization.go index b74b03359e1..716b8382eb3 100644 --- a/service/health/api_op_EnableHealthServiceAccessForOrganization.go +++ b/service/health/api_op_EnableHealthServiceAccessForOrganization.go @@ -5,7 +5,6 @@ package health import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) EnableHealthServiceAccessForOrganization(ctx context.Context, p addawsAwsjson11_serdeOpEnableHealthServiceAccessForOrganizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/health/endpoints.go b/service/health/endpoints.go index 6e8e3fccbb7..a0b325c9e71 100644 --- a/service/health/endpoints.go +++ b/service/health/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/honeycode/api_client.go b/service/honeycode/api_client.go index e53000e1c10..5510b2b7b95 100644 --- a/service/honeycode/api_client.go +++ b/service/honeycode/api_client.go @@ -80,30 +80,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -169,6 +145,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/honeycode/api_op_GetScreenData.go b/service/honeycode/api_op_GetScreenData.go index 7749d766308..97f5c54f72e 100644 --- a/service/honeycode/api_op_GetScreenData.go +++ b/service/honeycode/api_op_GetScreenData.go @@ -5,7 +5,6 @@ package honeycode import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/honeycode/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetScreenData(ctx context.Context, params *GetScreenDataInput, addawsRestjson1_serdeOpGetScreenDataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/honeycode/api_op_InvokeScreenAutomation.go b/service/honeycode/api_op_InvokeScreenAutomation.go index d13314bff63..c6337a824b6 100644 --- a/service/honeycode/api_op_InvokeScreenAutomation.go +++ b/service/honeycode/api_op_InvokeScreenAutomation.go @@ -5,7 +5,6 @@ package honeycode import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/honeycode/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) InvokeScreenAutomation(ctx context.Context, params *InvokeScree addawsRestjson1_serdeOpInvokeScreenAutomationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/honeycode/endpoints.go b/service/honeycode/endpoints.go index bf25fbd0cf6..64c653a95af 100644 --- a/service/honeycode/endpoints.go +++ b/service/honeycode/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/iam/api_client.go b/service/iam/api_client.go index e0dc3fa61f8..339cd401134 100644 --- a/service/iam/api_client.go +++ b/service/iam/api_client.go @@ -83,30 +83,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -172,6 +148,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/iam/api_op_AddClientIDToOpenIDConnectProvider.go b/service/iam/api_op_AddClientIDToOpenIDConnectProvider.go index b7fdc9e1e8a..fb12d8fad89 100644 --- a/service/iam/api_op_AddClientIDToOpenIDConnectProvider.go +++ b/service/iam/api_op_AddClientIDToOpenIDConnectProvider.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) AddClientIDToOpenIDConnectProvider(ctx context.Context, params addawsAwsquery_serdeOpAddClientIDToOpenIDConnectProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_AddRoleToInstanceProfile.go b/service/iam/api_op_AddRoleToInstanceProfile.go index 5005da939df..04d7418aca5 100644 --- a/service/iam/api_op_AddRoleToInstanceProfile.go +++ b/service/iam/api_op_AddRoleToInstanceProfile.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -39,9 +38,9 @@ func (c *Client) AddRoleToInstanceProfile(ctx context.Context, params *AddRoleTo addawsAwsquery_serdeOpAddRoleToInstanceProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_AddUserToGroup.go b/service/iam/api_op_AddUserToGroup.go index a5b71174ad0..bea216176e4 100644 --- a/service/iam/api_op_AddUserToGroup.go +++ b/service/iam/api_op_AddUserToGroup.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AddUserToGroup(ctx context.Context, params *AddUserToGroupInput addawsAwsquery_serdeOpAddUserToGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_AttachGroupPolicy.go b/service/iam/api_op_AttachGroupPolicy.go index 14836c6bff8..d46be8554a9 100644 --- a/service/iam/api_op_AttachGroupPolicy.go +++ b/service/iam/api_op_AttachGroupPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) AttachGroupPolicy(ctx context.Context, params *AttachGroupPolic addawsAwsquery_serdeOpAttachGroupPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_AttachRolePolicy.go b/service/iam/api_op_AttachRolePolicy.go index a1f14316844..ae5534b29b9 100644 --- a/service/iam/api_op_AttachRolePolicy.go +++ b/service/iam/api_op_AttachRolePolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) AttachRolePolicy(ctx context.Context, params *AttachRolePolicyI addawsAwsquery_serdeOpAttachRolePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_AttachUserPolicy.go b/service/iam/api_op_AttachUserPolicy.go index 1240a4fab4f..1e01f292d50 100644 --- a/service/iam/api_op_AttachUserPolicy.go +++ b/service/iam/api_op_AttachUserPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) AttachUserPolicy(ctx context.Context, params *AttachUserPolicyI addawsAwsquery_serdeOpAttachUserPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ChangePassword.go b/service/iam/api_op_ChangePassword.go index 9d7634ca4ee..9376ad0c55c 100644 --- a/service/iam/api_op_ChangePassword.go +++ b/service/iam/api_op_ChangePassword.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) ChangePassword(ctx context.Context, params *ChangePasswordInput addawsAwsquery_serdeOpChangePasswordMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_CreateAccessKey.go b/service/iam/api_op_CreateAccessKey.go index 68a81590d9a..1cf7de9683c 100644 --- a/service/iam/api_op_CreateAccessKey.go +++ b/service/iam/api_op_CreateAccessKey.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) CreateAccessKey(ctx context.Context, params *CreateAccessKeyInp addawsAwsquery_serdeOpCreateAccessKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_CreateAccountAlias.go b/service/iam/api_op_CreateAccountAlias.go index 59ad729673e..81e3b4a0b71 100644 --- a/service/iam/api_op_CreateAccountAlias.go +++ b/service/iam/api_op_CreateAccountAlias.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) CreateAccountAlias(ctx context.Context, params *CreateAccountAl addawsAwsquery_serdeOpCreateAccountAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_CreateGroup.go b/service/iam/api_op_CreateGroup.go index 2fb2108956e..05408a66112 100644 --- a/service/iam/api_op_CreateGroup.go +++ b/service/iam/api_op_CreateGroup.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateGroup(ctx context.Context, params *CreateGroupInput, optF addawsAwsquery_serdeOpCreateGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_CreateInstanceProfile.go b/service/iam/api_op_CreateInstanceProfile.go index 094b3a7ea37..33c07934b74 100644 --- a/service/iam/api_op_CreateInstanceProfile.go +++ b/service/iam/api_op_CreateInstanceProfile.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateInstanceProfile(ctx context.Context, params *CreateInstan addawsAwsquery_serdeOpCreateInstanceProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_CreateLoginProfile.go b/service/iam/api_op_CreateLoginProfile.go index af2692eda5e..73348021ca5 100644 --- a/service/iam/api_op_CreateLoginProfile.go +++ b/service/iam/api_op_CreateLoginProfile.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateLoginProfile(ctx context.Context, params *CreateLoginProf addawsAwsquery_serdeOpCreateLoginProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_CreateOpenIDConnectProvider.go b/service/iam/api_op_CreateOpenIDConnectProvider.go index 320d84b3131..257fba47a9f 100644 --- a/service/iam/api_op_CreateOpenIDConnectProvider.go +++ b/service/iam/api_op_CreateOpenIDConnectProvider.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -42,9 +41,9 @@ func (c *Client) CreateOpenIDConnectProvider(ctx context.Context, params *Create addawsAwsquery_serdeOpCreateOpenIDConnectProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_CreatePolicy.go b/service/iam/api_op_CreatePolicy.go index 19802807987..f911ce64e40 100644 --- a/service/iam/api_op_CreatePolicy.go +++ b/service/iam/api_op_CreatePolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreatePolicy(ctx context.Context, params *CreatePolicyInput, op addawsAwsquery_serdeOpCreatePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_CreatePolicyVersion.go b/service/iam/api_op_CreatePolicyVersion.go index 6896dc4bee1..04adac6a35f 100644 --- a/service/iam/api_op_CreatePolicyVersion.go +++ b/service/iam/api_op_CreatePolicyVersion.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) CreatePolicyVersion(ctx context.Context, params *CreatePolicyVe addawsAwsquery_serdeOpCreatePolicyVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_CreateRole.go b/service/iam/api_op_CreateRole.go index 7ed67aef2c2..69c1f328fbe 100644 --- a/service/iam/api_op_CreateRole.go +++ b/service/iam/api_op_CreateRole.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateRole(ctx context.Context, params *CreateRoleInput, optFns addawsAwsquery_serdeOpCreateRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_CreateSAMLProvider.go b/service/iam/api_op_CreateSAMLProvider.go index e62ec75b272..8a689c48ba5 100644 --- a/service/iam/api_op_CreateSAMLProvider.go +++ b/service/iam/api_op_CreateSAMLProvider.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -40,9 +39,9 @@ func (c *Client) CreateSAMLProvider(ctx context.Context, params *CreateSAMLProvi addawsAwsquery_serdeOpCreateSAMLProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_CreateServiceLinkedRole.go b/service/iam/api_op_CreateServiceLinkedRole.go index 475105e2312..978f92b3774 100644 --- a/service/iam/api_op_CreateServiceLinkedRole.go +++ b/service/iam/api_op_CreateServiceLinkedRole.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) CreateServiceLinkedRole(ctx context.Context, params *CreateServ addawsAwsquery_serdeOpCreateServiceLinkedRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_CreateServiceSpecificCredential.go b/service/iam/api_op_CreateServiceSpecificCredential.go index f91184e4946..9ae7d0b1000 100644 --- a/service/iam/api_op_CreateServiceSpecificCredential.go +++ b/service/iam/api_op_CreateServiceSpecificCredential.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) CreateServiceSpecificCredential(ctx context.Context, params *Cr addawsAwsquery_serdeOpCreateServiceSpecificCredentialMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_CreateUser.go b/service/iam/api_op_CreateUser.go index 5589a0dad71..68c15d215eb 100644 --- a/service/iam/api_op_CreateUser.go +++ b/service/iam/api_op_CreateUser.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateUser(ctx context.Context, params *CreateUserInput, optFns addawsAwsquery_serdeOpCreateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_CreateVirtualMFADevice.go b/service/iam/api_op_CreateVirtualMFADevice.go index af67dd939bd..93db010bbb3 100644 --- a/service/iam/api_op_CreateVirtualMFADevice.go +++ b/service/iam/api_op_CreateVirtualMFADevice.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) CreateVirtualMFADevice(ctx context.Context, params *CreateVirtu addawsAwsquery_serdeOpCreateVirtualMFADeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeactivateMFADevice.go b/service/iam/api_op_DeactivateMFADevice.go index 2821a06d50a..3a492b990b6 100644 --- a/service/iam/api_op_DeactivateMFADevice.go +++ b/service/iam/api_op_DeactivateMFADevice.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeactivateMFADevice(ctx context.Context, params *DeactivateMFAD addawsAwsquery_serdeOpDeactivateMFADeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteAccessKey.go b/service/iam/api_op_DeleteAccessKey.go index 49ac40b6b2d..7d15857bcc6 100644 --- a/service/iam/api_op_DeleteAccessKey.go +++ b/service/iam/api_op_DeleteAccessKey.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteAccessKey(ctx context.Context, params *DeleteAccessKeyInp addawsAwsquery_serdeOpDeleteAccessKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteAccountAlias.go b/service/iam/api_op_DeleteAccountAlias.go index 859b68560d1..325257fae28 100644 --- a/service/iam/api_op_DeleteAccountAlias.go +++ b/service/iam/api_op_DeleteAccountAlias.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteAccountAlias(ctx context.Context, params *DeleteAccountAl addawsAwsquery_serdeOpDeleteAccountAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteAccountPasswordPolicy.go b/service/iam/api_op_DeleteAccountPasswordPolicy.go index 745900cae1e..2f46adcc469 100644 --- a/service/iam/api_op_DeleteAccountPasswordPolicy.go +++ b/service/iam/api_op_DeleteAccountPasswordPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteAccountPasswordPolicy(ctx context.Context, params *Delete addawsAwsquery_serdeOpDeleteAccountPasswordPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteGroup.go b/service/iam/api_op_DeleteGroup.go index 31f7a874e27..715424eff27 100644 --- a/service/iam/api_op_DeleteGroup.go +++ b/service/iam/api_op_DeleteGroup.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteGroup(ctx context.Context, params *DeleteGroupInput, optF addawsAwsquery_serdeOpDeleteGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteGroupPolicy.go b/service/iam/api_op_DeleteGroupPolicy.go index 4cbf67d11c6..43b5fbe2552 100644 --- a/service/iam/api_op_DeleteGroupPolicy.go +++ b/service/iam/api_op_DeleteGroupPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteGroupPolicy(ctx context.Context, params *DeleteGroupPolic addawsAwsquery_serdeOpDeleteGroupPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteInstanceProfile.go b/service/iam/api_op_DeleteInstanceProfile.go index f88898fe318..550e5162e70 100644 --- a/service/iam/api_op_DeleteInstanceProfile.go +++ b/service/iam/api_op_DeleteInstanceProfile.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeleteInstanceProfile(ctx context.Context, params *DeleteInstan addawsAwsquery_serdeOpDeleteInstanceProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteLoginProfile.go b/service/iam/api_op_DeleteLoginProfile.go index 298269fe566..7664783ee64 100644 --- a/service/iam/api_op_DeleteLoginProfile.go +++ b/service/iam/api_op_DeleteLoginProfile.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteLoginProfile(ctx context.Context, params *DeleteLoginProf addawsAwsquery_serdeOpDeleteLoginProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteOpenIDConnectProvider.go b/service/iam/api_op_DeleteOpenIDConnectProvider.go index 6fffa5bc2e9..e573f5bfeb7 100644 --- a/service/iam/api_op_DeleteOpenIDConnectProvider.go +++ b/service/iam/api_op_DeleteOpenIDConnectProvider.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteOpenIDConnectProvider(ctx context.Context, params *Delete addawsAwsquery_serdeOpDeleteOpenIDConnectProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeletePolicy.go b/service/iam/api_op_DeletePolicy.go index c768b0cb1a9..ca944d49595 100644 --- a/service/iam/api_op_DeletePolicy.go +++ b/service/iam/api_op_DeletePolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -45,9 +44,9 @@ func (c *Client) DeletePolicy(ctx context.Context, params *DeletePolicyInput, op addawsAwsquery_serdeOpDeletePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeletePolicyVersion.go b/service/iam/api_op_DeletePolicyVersion.go index 934b8e00379..cf01aa62b84 100644 --- a/service/iam/api_op_DeletePolicyVersion.go +++ b/service/iam/api_op_DeletePolicyVersion.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DeletePolicyVersion(ctx context.Context, params *DeletePolicyVe addawsAwsquery_serdeOpDeletePolicyVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteRole.go b/service/iam/api_op_DeleteRole.go index 99273baed2c..65628aa36d8 100644 --- a/service/iam/api_op_DeleteRole.go +++ b/service/iam/api_op_DeleteRole.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteRole(ctx context.Context, params *DeleteRoleInput, optFns addawsAwsquery_serdeOpDeleteRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteRolePermissionsBoundary.go b/service/iam/api_op_DeleteRolePermissionsBoundary.go index 9a4a43bdaa5..eff9547b2c8 100644 --- a/service/iam/api_op_DeleteRolePermissionsBoundary.go +++ b/service/iam/api_op_DeleteRolePermissionsBoundary.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteRolePermissionsBoundary(ctx context.Context, params *Dele addawsAwsquery_serdeOpDeleteRolePermissionsBoundaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteRolePolicy.go b/service/iam/api_op_DeleteRolePolicy.go index ff64059687c..ab87ad3e356 100644 --- a/service/iam/api_op_DeleteRolePolicy.go +++ b/service/iam/api_op_DeleteRolePolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteRolePolicy(ctx context.Context, params *DeleteRolePolicyI addawsAwsquery_serdeOpDeleteRolePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteSAMLProvider.go b/service/iam/api_op_DeleteSAMLProvider.go index a0b7d21e803..f456e09a7c4 100644 --- a/service/iam/api_op_DeleteSAMLProvider.go +++ b/service/iam/api_op_DeleteSAMLProvider.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteSAMLProvider(ctx context.Context, params *DeleteSAMLProvi addawsAwsquery_serdeOpDeleteSAMLProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteSSHPublicKey.go b/service/iam/api_op_DeleteSSHPublicKey.go index e0477e71abb..ab84c00fdc6 100644 --- a/service/iam/api_op_DeleteSSHPublicKey.go +++ b/service/iam/api_op_DeleteSSHPublicKey.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteSSHPublicKey(ctx context.Context, params *DeleteSSHPublic addawsAwsquery_serdeOpDeleteSSHPublicKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteServerCertificate.go b/service/iam/api_op_DeleteServerCertificate.go index 50f4aac0e5a..e1d9571df55 100644 --- a/service/iam/api_op_DeleteServerCertificate.go +++ b/service/iam/api_op_DeleteServerCertificate.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) DeleteServerCertificate(ctx context.Context, params *DeleteServ addawsAwsquery_serdeOpDeleteServerCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteServiceLinkedRole.go b/service/iam/api_op_DeleteServiceLinkedRole.go index 6fb469ce3a1..cc838a040c8 100644 --- a/service/iam/api_op_DeleteServiceLinkedRole.go +++ b/service/iam/api_op_DeleteServiceLinkedRole.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -39,9 +38,9 @@ func (c *Client) DeleteServiceLinkedRole(ctx context.Context, params *DeleteServ addawsAwsquery_serdeOpDeleteServiceLinkedRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteServiceSpecificCredential.go b/service/iam/api_op_DeleteServiceSpecificCredential.go index 9867473e957..6c132d8da45 100644 --- a/service/iam/api_op_DeleteServiceSpecificCredential.go +++ b/service/iam/api_op_DeleteServiceSpecificCredential.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteServiceSpecificCredential(ctx context.Context, params *De addawsAwsquery_serdeOpDeleteServiceSpecificCredentialMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteSigningCertificate.go b/service/iam/api_op_DeleteSigningCertificate.go index c242e01ebe0..f0ed34015dd 100644 --- a/service/iam/api_op_DeleteSigningCertificate.go +++ b/service/iam/api_op_DeleteSigningCertificate.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteSigningCertificate(ctx context.Context, params *DeleteSig addawsAwsquery_serdeOpDeleteSigningCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteUser.go b/service/iam/api_op_DeleteUser.go index d66a8f1f646..0da67215094 100644 --- a/service/iam/api_op_DeleteUser.go +++ b/service/iam/api_op_DeleteUser.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -51,9 +50,9 @@ func (c *Client) DeleteUser(ctx context.Context, params *DeleteUserInput, optFns addawsAwsquery_serdeOpDeleteUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteUserPermissionsBoundary.go b/service/iam/api_op_DeleteUserPermissionsBoundary.go index d06b4ec2570..07b0b118971 100644 --- a/service/iam/api_op_DeleteUserPermissionsBoundary.go +++ b/service/iam/api_op_DeleteUserPermissionsBoundary.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteUserPermissionsBoundary(ctx context.Context, params *Dele addawsAwsquery_serdeOpDeleteUserPermissionsBoundaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteUserPolicy.go b/service/iam/api_op_DeleteUserPolicy.go index 8e062716c62..2d6832f0d96 100644 --- a/service/iam/api_op_DeleteUserPolicy.go +++ b/service/iam/api_op_DeleteUserPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteUserPolicy(ctx context.Context, params *DeleteUserPolicyI addawsAwsquery_serdeOpDeleteUserPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DeleteVirtualMFADevice.go b/service/iam/api_op_DeleteVirtualMFADevice.go index 95588a5bd06..010280407af 100644 --- a/service/iam/api_op_DeleteVirtualMFADevice.go +++ b/service/iam/api_op_DeleteVirtualMFADevice.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteVirtualMFADevice(ctx context.Context, params *DeleteVirtu addawsAwsquery_serdeOpDeleteVirtualMFADeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DetachGroupPolicy.go b/service/iam/api_op_DetachGroupPolicy.go index ff80e35ca09..9b6a8ebb902 100644 --- a/service/iam/api_op_DetachGroupPolicy.go +++ b/service/iam/api_op_DetachGroupPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DetachGroupPolicy(ctx context.Context, params *DetachGroupPolic addawsAwsquery_serdeOpDetachGroupPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DetachRolePolicy.go b/service/iam/api_op_DetachRolePolicy.go index d4f09cc955c..4592d49e44b 100644 --- a/service/iam/api_op_DetachRolePolicy.go +++ b/service/iam/api_op_DetachRolePolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DetachRolePolicy(ctx context.Context, params *DetachRolePolicyI addawsAwsquery_serdeOpDetachRolePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_DetachUserPolicy.go b/service/iam/api_op_DetachUserPolicy.go index fb6d34a3aa4..d1cd67afe4d 100644 --- a/service/iam/api_op_DetachUserPolicy.go +++ b/service/iam/api_op_DetachUserPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DetachUserPolicy(ctx context.Context, params *DetachUserPolicyI addawsAwsquery_serdeOpDetachUserPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_EnableMFADevice.go b/service/iam/api_op_EnableMFADevice.go index 483004cecf5..1f400d60b78 100644 --- a/service/iam/api_op_EnableMFADevice.go +++ b/service/iam/api_op_EnableMFADevice.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) EnableMFADevice(ctx context.Context, params *EnableMFADeviceInp addawsAwsquery_serdeOpEnableMFADeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GenerateCredentialReport.go b/service/iam/api_op_GenerateCredentialReport.go index cc3cd43a53e..44dd75de551 100644 --- a/service/iam/api_op_GenerateCredentialReport.go +++ b/service/iam/api_op_GenerateCredentialReport.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GenerateCredentialReport(ctx context.Context, params *GenerateC addawsAwsquery_serdeOpGenerateCredentialReportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GenerateOrganizationsAccessReport.go b/service/iam/api_op_GenerateOrganizationsAccessReport.go index 14719bb8e33..957c5500241 100644 --- a/service/iam/api_op_GenerateOrganizationsAccessReport.go +++ b/service/iam/api_op_GenerateOrganizationsAccessReport.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -129,9 +128,9 @@ func (c *Client) GenerateOrganizationsAccessReport(ctx context.Context, params * addawsAwsquery_serdeOpGenerateOrganizationsAccessReportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GenerateServiceLastAccessedDetails.go b/service/iam/api_op_GenerateServiceLastAccessedDetails.go index 39e23d229c0..4ad3db25564 100644 --- a/service/iam/api_op_GenerateServiceLastAccessedDetails.go +++ b/service/iam/api_op_GenerateServiceLastAccessedDetails.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -69,9 +68,9 @@ func (c *Client) GenerateServiceLastAccessedDetails(ctx context.Context, params addawsAwsquery_serdeOpGenerateServiceLastAccessedDetailsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetAccessKeyLastUsed.go b/service/iam/api_op_GetAccessKeyLastUsed.go index 84d51490c24..b610ae0f13c 100644 --- a/service/iam/api_op_GetAccessKeyLastUsed.go +++ b/service/iam/api_op_GetAccessKeyLastUsed.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetAccessKeyLastUsed(ctx context.Context, params *GetAccessKeyL addawsAwsquery_serdeOpGetAccessKeyLastUsedMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetAccountAuthorizationDetails.go b/service/iam/api_op_GetAccountAuthorizationDetails.go index 44f410f19a5..2ab88b3970c 100644 --- a/service/iam/api_op_GetAccountAuthorizationDetails.go +++ b/service/iam/api_op_GetAccountAuthorizationDetails.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) GetAccountAuthorizationDetails(ctx context.Context, params *Get addawsAwsquery_serdeOpGetAccountAuthorizationDetailsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetAccountPasswordPolicy.go b/service/iam/api_op_GetAccountPasswordPolicy.go index df9c3bd7d7c..f38a7d8d847 100644 --- a/service/iam/api_op_GetAccountPasswordPolicy.go +++ b/service/iam/api_op_GetAccountPasswordPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetAccountPasswordPolicy(ctx context.Context, params *GetAccoun addawsAwsquery_serdeOpGetAccountPasswordPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetAccountSummary.go b/service/iam/api_op_GetAccountSummary.go index 1a72eb8412d..cee10b669da 100644 --- a/service/iam/api_op_GetAccountSummary.go +++ b/service/iam/api_op_GetAccountSummary.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) GetAccountSummary(ctx context.Context, params *GetAccountSummar addawsAwsquery_serdeOpGetAccountSummaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetContextKeysForCustomPolicy.go b/service/iam/api_op_GetContextKeysForCustomPolicy.go index c6d6391a76e..604b2b60d78 100644 --- a/service/iam/api_op_GetContextKeysForCustomPolicy.go +++ b/service/iam/api_op_GetContextKeysForCustomPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) GetContextKeysForCustomPolicy(ctx context.Context, params *GetC addawsAwsquery_serdeOpGetContextKeysForCustomPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetContextKeysForPrincipalPolicy.go b/service/iam/api_op_GetContextKeysForPrincipalPolicy.go index ff85fba0b65..056ee23dfdd 100644 --- a/service/iam/api_op_GetContextKeysForPrincipalPolicy.go +++ b/service/iam/api_op_GetContextKeysForPrincipalPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) GetContextKeysForPrincipalPolicy(ctx context.Context, params *G addawsAwsquery_serdeOpGetContextKeysForPrincipalPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetCredentialReport.go b/service/iam/api_op_GetCredentialReport.go index bce4d4dd3a6..e77e1e8b56d 100644 --- a/service/iam/api_op_GetCredentialReport.go +++ b/service/iam/api_op_GetCredentialReport.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetCredentialReport(ctx context.Context, params *GetCredentialR addawsAwsquery_serdeOpGetCredentialReportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetGroup.go b/service/iam/api_op_GetGroup.go index f1d77d8141b..045126c4c44 100644 --- a/service/iam/api_op_GetGroup.go +++ b/service/iam/api_op_GetGroup.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetGroup(ctx context.Context, params *GetGroupInput, optFns ... addawsAwsquery_serdeOpGetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetGroupPolicy.go b/service/iam/api_op_GetGroupPolicy.go index ac04aed0812..889d16b1039 100644 --- a/service/iam/api_op_GetGroupPolicy.go +++ b/service/iam/api_op_GetGroupPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) GetGroupPolicy(ctx context.Context, params *GetGroupPolicyInput addawsAwsquery_serdeOpGetGroupPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetInstanceProfile.go b/service/iam/api_op_GetInstanceProfile.go index a538569a216..f19a59b882f 100644 --- a/service/iam/api_op_GetInstanceProfile.go +++ b/service/iam/api_op_GetInstanceProfile.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetInstanceProfile(ctx context.Context, params *GetInstanceProf addawsAwsquery_serdeOpGetInstanceProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetLoginProfile.go b/service/iam/api_op_GetLoginProfile.go index 708132674a2..2c258255ef0 100644 --- a/service/iam/api_op_GetLoginProfile.go +++ b/service/iam/api_op_GetLoginProfile.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetLoginProfile(ctx context.Context, params *GetLoginProfileInp addawsAwsquery_serdeOpGetLoginProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetOpenIDConnectProvider.go b/service/iam/api_op_GetOpenIDConnectProvider.go index 674908c0774..abc9affede3 100644 --- a/service/iam/api_op_GetOpenIDConnectProvider.go +++ b/service/iam/api_op_GetOpenIDConnectProvider.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) GetOpenIDConnectProvider(ctx context.Context, params *GetOpenID addawsAwsquery_serdeOpGetOpenIDConnectProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetOrganizationsAccessReport.go b/service/iam/api_op_GetOrganizationsAccessReport.go index 6ce512c8104..2798c2cc72e 100644 --- a/service/iam/api_op_GetOrganizationsAccessReport.go +++ b/service/iam/api_op_GetOrganizationsAccessReport.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) GetOrganizationsAccessReport(ctx context.Context, params *GetOr addawsAwsquery_serdeOpGetOrganizationsAccessReportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetPolicy.go b/service/iam/api_op_GetPolicy.go index 67b5377a19d..6a6b2302749 100644 --- a/service/iam/api_op_GetPolicy.go +++ b/service/iam/api_op_GetPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) GetPolicy(ctx context.Context, params *GetPolicyInput, optFns . addawsAwsquery_serdeOpGetPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetPolicyVersion.go b/service/iam/api_op_GetPolicyVersion.go index 762e0d4772f..06d8aecc034 100644 --- a/service/iam/api_op_GetPolicyVersion.go +++ b/service/iam/api_op_GetPolicyVersion.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) GetPolicyVersion(ctx context.Context, params *GetPolicyVersionI addawsAwsquery_serdeOpGetPolicyVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetRole.go b/service/iam/api_op_GetRole.go index 6ae299af4aa..b9a55db7f89 100644 --- a/service/iam/api_op_GetRole.go +++ b/service/iam/api_op_GetRole.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) GetRole(ctx context.Context, params *GetRoleInput, optFns ...fu addawsAwsquery_serdeOpGetRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetRolePolicy.go b/service/iam/api_op_GetRolePolicy.go index cc27cedaa8f..add931577d9 100644 --- a/service/iam/api_op_GetRolePolicy.go +++ b/service/iam/api_op_GetRolePolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) GetRolePolicy(ctx context.Context, params *GetRolePolicyInput, addawsAwsquery_serdeOpGetRolePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetSAMLProvider.go b/service/iam/api_op_GetSAMLProvider.go index 08f121366e1..96839f48907 100644 --- a/service/iam/api_op_GetSAMLProvider.go +++ b/service/iam/api_op_GetSAMLProvider.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) GetSAMLProvider(ctx context.Context, params *GetSAMLProviderInp addawsAwsquery_serdeOpGetSAMLProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetSSHPublicKey.go b/service/iam/api_op_GetSSHPublicKey.go index 8a91a3804c2..ff5ac62bd34 100644 --- a/service/iam/api_op_GetSSHPublicKey.go +++ b/service/iam/api_op_GetSSHPublicKey.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetSSHPublicKey(ctx context.Context, params *GetSSHPublicKeyInp addawsAwsquery_serdeOpGetSSHPublicKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetServerCertificate.go b/service/iam/api_op_GetServerCertificate.go index af6e338cd38..97f9a85291d 100644 --- a/service/iam/api_op_GetServerCertificate.go +++ b/service/iam/api_op_GetServerCertificate.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetServerCertificate(ctx context.Context, params *GetServerCert addawsAwsquery_serdeOpGetServerCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetServiceLastAccessedDetails.go b/service/iam/api_op_GetServiceLastAccessedDetails.go index cd0b1b5c229..47b0e8cd0e7 100644 --- a/service/iam/api_op_GetServiceLastAccessedDetails.go +++ b/service/iam/api_op_GetServiceLastAccessedDetails.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -67,9 +66,9 @@ func (c *Client) GetServiceLastAccessedDetails(ctx context.Context, params *GetS addawsAwsquery_serdeOpGetServiceLastAccessedDetailsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetServiceLastAccessedDetailsWithEntities.go b/service/iam/api_op_GetServiceLastAccessedDetailsWithEntities.go index ffc0fde92c5..d037ba1e95e 100644 --- a/service/iam/api_op_GetServiceLastAccessedDetailsWithEntities.go +++ b/service/iam/api_op_GetServiceLastAccessedDetailsWithEntities.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) GetServiceLastAccessedDetailsWithEntities(ctx context.Context, addawsAwsquery_serdeOpGetServiceLastAccessedDetailsWithEntitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetServiceLinkedRoleDeletionStatus.go b/service/iam/api_op_GetServiceLinkedRoleDeletionStatus.go index b66edf0a839..1567518d6a4 100644 --- a/service/iam/api_op_GetServiceLinkedRoleDeletionStatus.go +++ b/service/iam/api_op_GetServiceLinkedRoleDeletionStatus.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetServiceLinkedRoleDeletionStatus(ctx context.Context, params addawsAwsquery_serdeOpGetServiceLinkedRoleDeletionStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetUser.go b/service/iam/api_op_GetUser.go index 56252ad08d2..3fcf375aca7 100644 --- a/service/iam/api_op_GetUser.go +++ b/service/iam/api_op_GetUser.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetUser(ctx context.Context, params *GetUserInput, optFns ...fu addawsAwsquery_serdeOpGetUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_GetUserPolicy.go b/service/iam/api_op_GetUserPolicy.go index 0b06e733149..808209e8c0c 100644 --- a/service/iam/api_op_GetUserPolicy.go +++ b/service/iam/api_op_GetUserPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) GetUserPolicy(ctx context.Context, params *GetUserPolicyInput, addawsAwsquery_serdeOpGetUserPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListAccessKeys.go b/service/iam/api_op_ListAccessKeys.go index 264d14093c4..7e400b42a4c 100644 --- a/service/iam/api_op_ListAccessKeys.go +++ b/service/iam/api_op_ListAccessKeys.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) ListAccessKeys(ctx context.Context, params *ListAccessKeysInput addawsAwsquery_serdeOpListAccessKeysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListAccountAliases.go b/service/iam/api_op_ListAccountAliases.go index 678ac6d682d..f9f19b12124 100644 --- a/service/iam/api_op_ListAccountAliases.go +++ b/service/iam/api_op_ListAccountAliases.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) ListAccountAliases(ctx context.Context, params *ListAccountAlia addawsAwsquery_serdeOpListAccountAliasesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListAttachedGroupPolicies.go b/service/iam/api_op_ListAttachedGroupPolicies.go index 3ba3812e886..2eef3ff1c93 100644 --- a/service/iam/api_op_ListAttachedGroupPolicies.go +++ b/service/iam/api_op_ListAttachedGroupPolicies.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) ListAttachedGroupPolicies(ctx context.Context, params *ListAtta addawsAwsquery_serdeOpListAttachedGroupPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListAttachedRolePolicies.go b/service/iam/api_op_ListAttachedRolePolicies.go index 69f05cb7cae..fa7236e7453 100644 --- a/service/iam/api_op_ListAttachedRolePolicies.go +++ b/service/iam/api_op_ListAttachedRolePolicies.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) ListAttachedRolePolicies(ctx context.Context, params *ListAttac addawsAwsquery_serdeOpListAttachedRolePoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListAttachedUserPolicies.go b/service/iam/api_op_ListAttachedUserPolicies.go index 709f88cb854..a8d9e401168 100644 --- a/service/iam/api_op_ListAttachedUserPolicies.go +++ b/service/iam/api_op_ListAttachedUserPolicies.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) ListAttachedUserPolicies(ctx context.Context, params *ListAttac addawsAwsquery_serdeOpListAttachedUserPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListEntitiesForPolicy.go b/service/iam/api_op_ListEntitiesForPolicy.go index 4ae25c65e0f..e0993f0be97 100644 --- a/service/iam/api_op_ListEntitiesForPolicy.go +++ b/service/iam/api_op_ListEntitiesForPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListEntitiesForPolicy(ctx context.Context, params *ListEntities addawsAwsquery_serdeOpListEntitiesForPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListGroupPolicies.go b/service/iam/api_op_ListGroupPolicies.go index 5795b3fc939..04ae670c410 100644 --- a/service/iam/api_op_ListGroupPolicies.go +++ b/service/iam/api_op_ListGroupPolicies.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) ListGroupPolicies(ctx context.Context, params *ListGroupPolicie addawsAwsquery_serdeOpListGroupPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListGroups.go b/service/iam/api_op_ListGroups.go index 1e8eefda6d1..af13258beea 100644 --- a/service/iam/api_op_ListGroups.go +++ b/service/iam/api_op_ListGroups.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListGroups(ctx context.Context, params *ListGroupsInput, optFns addawsAwsquery_serdeOpListGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListGroupsForUser.go b/service/iam/api_op_ListGroupsForUser.go index 47682ebc897..01afd671b73 100644 --- a/service/iam/api_op_ListGroupsForUser.go +++ b/service/iam/api_op_ListGroupsForUser.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListGroupsForUser(ctx context.Context, params *ListGroupsForUse addawsAwsquery_serdeOpListGroupsForUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListInstanceProfiles.go b/service/iam/api_op_ListInstanceProfiles.go index 9cdbf0e46de..3c3ec1355c1 100644 --- a/service/iam/api_op_ListInstanceProfiles.go +++ b/service/iam/api_op_ListInstanceProfiles.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListInstanceProfiles(ctx context.Context, params *ListInstanceP addawsAwsquery_serdeOpListInstanceProfilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListInstanceProfilesForRole.go b/service/iam/api_op_ListInstanceProfilesForRole.go index a833a35af47..c72fee2c7f0 100644 --- a/service/iam/api_op_ListInstanceProfilesForRole.go +++ b/service/iam/api_op_ListInstanceProfilesForRole.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListInstanceProfilesForRole(ctx context.Context, params *ListIn addawsAwsquery_serdeOpListInstanceProfilesForRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListMFADevices.go b/service/iam/api_op_ListMFADevices.go index 88ced1ebf9b..8f180bc2546 100644 --- a/service/iam/api_op_ListMFADevices.go +++ b/service/iam/api_op_ListMFADevices.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListMFADevices(ctx context.Context, params *ListMFADevicesInput addawsAwsquery_serdeOpListMFADevicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListOpenIDConnectProviders.go b/service/iam/api_op_ListOpenIDConnectProviders.go index f73b7ab0307..b3a0eb6f490 100644 --- a/service/iam/api_op_ListOpenIDConnectProviders.go +++ b/service/iam/api_op_ListOpenIDConnectProviders.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListOpenIDConnectProviders(ctx context.Context, params *ListOpe addawsAwsquery_serdeOpListOpenIDConnectProvidersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListPolicies.go b/service/iam/api_op_ListPolicies.go index 67556c685a0..c2be19ab475 100644 --- a/service/iam/api_op_ListPolicies.go +++ b/service/iam/api_op_ListPolicies.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) ListPolicies(ctx context.Context, params *ListPoliciesInput, op addawsAwsquery_serdeOpListPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListPoliciesGrantingServiceAccess.go b/service/iam/api_op_ListPoliciesGrantingServiceAccess.go index 0bf15efda52..5fcffc9a78d 100644 --- a/service/iam/api_op_ListPoliciesGrantingServiceAccess.go +++ b/service/iam/api_op_ListPoliciesGrantingServiceAccess.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -56,9 +55,9 @@ func (c *Client) ListPoliciesGrantingServiceAccess(ctx context.Context, params * addawsAwsquery_serdeOpListPoliciesGrantingServiceAccessMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListPolicyVersions.go b/service/iam/api_op_ListPolicyVersions.go index 422cce43989..ceb9c245fd5 100644 --- a/service/iam/api_op_ListPolicyVersions.go +++ b/service/iam/api_op_ListPolicyVersions.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListPolicyVersions(ctx context.Context, params *ListPolicyVersi addawsAwsquery_serdeOpListPolicyVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListRolePolicies.go b/service/iam/api_op_ListRolePolicies.go index e7d64ed288f..fceb1935868 100644 --- a/service/iam/api_op_ListRolePolicies.go +++ b/service/iam/api_op_ListRolePolicies.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) ListRolePolicies(ctx context.Context, params *ListRolePoliciesI addawsAwsquery_serdeOpListRolePoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListRoleTags.go b/service/iam/api_op_ListRoleTags.go index f8d4e76727b..0ab121bd2af 100644 --- a/service/iam/api_op_ListRoleTags.go +++ b/service/iam/api_op_ListRoleTags.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListRoleTags(ctx context.Context, params *ListRoleTagsInput, op addawsAwsquery_serdeOpListRoleTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListRoles.go b/service/iam/api_op_ListRoles.go index 991cb1983d2..fe2cfab773b 100644 --- a/service/iam/api_op_ListRoles.go +++ b/service/iam/api_op_ListRoles.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListRoles(ctx context.Context, params *ListRolesInput, optFns . addawsAwsquery_serdeOpListRolesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListSAMLProviders.go b/service/iam/api_op_ListSAMLProviders.go index db3a91e5ef1..b015d19d1d2 100644 --- a/service/iam/api_op_ListSAMLProviders.go +++ b/service/iam/api_op_ListSAMLProviders.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListSAMLProviders(ctx context.Context, params *ListSAMLProvider addawsAwsquery_serdeOpListSAMLProvidersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListSSHPublicKeys.go b/service/iam/api_op_ListSSHPublicKeys.go index 643a311b64b..a95d2916185 100644 --- a/service/iam/api_op_ListSSHPublicKeys.go +++ b/service/iam/api_op_ListSSHPublicKeys.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) ListSSHPublicKeys(ctx context.Context, params *ListSSHPublicKey addawsAwsquery_serdeOpListSSHPublicKeysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListServerCertificates.go b/service/iam/api_op_ListServerCertificates.go index cba28a3aa45..cabe1498e06 100644 --- a/service/iam/api_op_ListServerCertificates.go +++ b/service/iam/api_op_ListServerCertificates.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListServerCertificates(ctx context.Context, params *ListServerC addawsAwsquery_serdeOpListServerCertificatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListServiceSpecificCredentials.go b/service/iam/api_op_ListServiceSpecificCredentials.go index eb42a67f7a1..d04c4a216bb 100644 --- a/service/iam/api_op_ListServiceSpecificCredentials.go +++ b/service/iam/api_op_ListServiceSpecificCredentials.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListServiceSpecificCredentials(ctx context.Context, params *Lis addawsAwsquery_serdeOpListServiceSpecificCredentialsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListSigningCertificates.go b/service/iam/api_op_ListSigningCertificates.go index 25b6072b8af..72083eadd0f 100644 --- a/service/iam/api_op_ListSigningCertificates.go +++ b/service/iam/api_op_ListSigningCertificates.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) ListSigningCertificates(ctx context.Context, params *ListSignin addawsAwsquery_serdeOpListSigningCertificatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListUserPolicies.go b/service/iam/api_op_ListUserPolicies.go index 06ded7c932a..2ee86517974 100644 --- a/service/iam/api_op_ListUserPolicies.go +++ b/service/iam/api_op_ListUserPolicies.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) ListUserPolicies(ctx context.Context, params *ListUserPoliciesI addawsAwsquery_serdeOpListUserPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListUserTags.go b/service/iam/api_op_ListUserTags.go index ca5db55ff43..4104f4ba61d 100644 --- a/service/iam/api_op_ListUserTags.go +++ b/service/iam/api_op_ListUserTags.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListUserTags(ctx context.Context, params *ListUserTagsInput, op addawsAwsquery_serdeOpListUserTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListUsers.go b/service/iam/api_op_ListUsers.go index 036792e71bf..120879a30a2 100644 --- a/service/iam/api_op_ListUsers.go +++ b/service/iam/api_op_ListUsers.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListUsers(ctx context.Context, params *ListUsersInput, optFns . addawsAwsquery_serdeOpListUsersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ListVirtualMFADevices.go b/service/iam/api_op_ListVirtualMFADevices.go index 771aa13a5ff..f0ff71fc94e 100644 --- a/service/iam/api_op_ListVirtualMFADevices.go +++ b/service/iam/api_op_ListVirtualMFADevices.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListVirtualMFADevices(ctx context.Context, params *ListVirtualM addawsAwsquery_serdeOpListVirtualMFADevicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_PutGroupPolicy.go b/service/iam/api_op_PutGroupPolicy.go index c03ee99444e..a145d1d30fc 100644 --- a/service/iam/api_op_PutGroupPolicy.go +++ b/service/iam/api_op_PutGroupPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) PutGroupPolicy(ctx context.Context, params *PutGroupPolicyInput addawsAwsquery_serdeOpPutGroupPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_PutRolePermissionsBoundary.go b/service/iam/api_op_PutRolePermissionsBoundary.go index fa35aaaa185..85453aac4c2 100644 --- a/service/iam/api_op_PutRolePermissionsBoundary.go +++ b/service/iam/api_op_PutRolePermissionsBoundary.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) PutRolePermissionsBoundary(ctx context.Context, params *PutRole addawsAwsquery_serdeOpPutRolePermissionsBoundaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_PutRolePolicy.go b/service/iam/api_op_PutRolePolicy.go index a953a444099..8a7707748fc 100644 --- a/service/iam/api_op_PutRolePolicy.go +++ b/service/iam/api_op_PutRolePolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -40,9 +39,9 @@ func (c *Client) PutRolePolicy(ctx context.Context, params *PutRolePolicyInput, addawsAwsquery_serdeOpPutRolePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_PutUserPermissionsBoundary.go b/service/iam/api_op_PutUserPermissionsBoundary.go index cf502da2b32..6952a013440 100644 --- a/service/iam/api_op_PutUserPermissionsBoundary.go +++ b/service/iam/api_op_PutUserPermissionsBoundary.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) PutUserPermissionsBoundary(ctx context.Context, params *PutUser addawsAwsquery_serdeOpPutUserPermissionsBoundaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_PutUserPolicy.go b/service/iam/api_op_PutUserPolicy.go index f0e8b149483..d92c3ad9858 100644 --- a/service/iam/api_op_PutUserPolicy.go +++ b/service/iam/api_op_PutUserPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) PutUserPolicy(ctx context.Context, params *PutUserPolicyInput, addawsAwsquery_serdeOpPutUserPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_RemoveClientIDFromOpenIDConnectProvider.go b/service/iam/api_op_RemoveClientIDFromOpenIDConnectProvider.go index 7a1539b6a05..f3b151410c8 100644 --- a/service/iam/api_op_RemoveClientIDFromOpenIDConnectProvider.go +++ b/service/iam/api_op_RemoveClientIDFromOpenIDConnectProvider.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) RemoveClientIDFromOpenIDConnectProvider(ctx context.Context, pa addawsAwsquery_serdeOpRemoveClientIDFromOpenIDConnectProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_RemoveRoleFromInstanceProfile.go b/service/iam/api_op_RemoveRoleFromInstanceProfile.go index 768ab6a26e8..c62eafd40e2 100644 --- a/service/iam/api_op_RemoveRoleFromInstanceProfile.go +++ b/service/iam/api_op_RemoveRoleFromInstanceProfile.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) RemoveRoleFromInstanceProfile(ctx context.Context, params *Remo addawsAwsquery_serdeOpRemoveRoleFromInstanceProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_RemoveUserFromGroup.go b/service/iam/api_op_RemoveUserFromGroup.go index 0f5554d1152..3e6e19b392c 100644 --- a/service/iam/api_op_RemoveUserFromGroup.go +++ b/service/iam/api_op_RemoveUserFromGroup.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RemoveUserFromGroup(ctx context.Context, params *RemoveUserFrom addawsAwsquery_serdeOpRemoveUserFromGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ResetServiceSpecificCredential.go b/service/iam/api_op_ResetServiceSpecificCredential.go index 2bc914a4bc3..e3d4c9f120e 100644 --- a/service/iam/api_op_ResetServiceSpecificCredential.go +++ b/service/iam/api_op_ResetServiceSpecificCredential.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ResetServiceSpecificCredential(ctx context.Context, params *Res addawsAwsquery_serdeOpResetServiceSpecificCredentialMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_ResyncMFADevice.go b/service/iam/api_op_ResyncMFADevice.go index af4ec905e68..60d58ff80ad 100644 --- a/service/iam/api_op_ResyncMFADevice.go +++ b/service/iam/api_op_ResyncMFADevice.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) ResyncMFADevice(ctx context.Context, params *ResyncMFADeviceInp addawsAwsquery_serdeOpResyncMFADeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_SetDefaultPolicyVersion.go b/service/iam/api_op_SetDefaultPolicyVersion.go index 4103192c694..1bd3f568755 100644 --- a/service/iam/api_op_SetDefaultPolicyVersion.go +++ b/service/iam/api_op_SetDefaultPolicyVersion.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) SetDefaultPolicyVersion(ctx context.Context, params *SetDefault addawsAwsquery_serdeOpSetDefaultPolicyVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_SetSecurityTokenServicePreferences.go b/service/iam/api_op_SetSecurityTokenServicePreferences.go index 152f8e45202..27edb725ba0 100644 --- a/service/iam/api_op_SetSecurityTokenServicePreferences.go +++ b/service/iam/api_op_SetSecurityTokenServicePreferences.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) SetSecurityTokenServicePreferences(ctx context.Context, params addawsAwsquery_serdeOpSetSecurityTokenServicePreferencesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_SimulateCustomPolicy.go b/service/iam/api_op_SimulateCustomPolicy.go index bc7db9ff9e6..8af0bec5d15 100644 --- a/service/iam/api_op_SimulateCustomPolicy.go +++ b/service/iam/api_op_SimulateCustomPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) SimulateCustomPolicy(ctx context.Context, params *SimulateCusto addawsAwsquery_serdeOpSimulateCustomPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_SimulatePrincipalPolicy.go b/service/iam/api_op_SimulatePrincipalPolicy.go index e20a0cb6e3f..dce0adb4989 100644 --- a/service/iam/api_op_SimulatePrincipalPolicy.go +++ b/service/iam/api_op_SimulatePrincipalPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) SimulatePrincipalPolicy(ctx context.Context, params *SimulatePr addawsAwsquery_serdeOpSimulatePrincipalPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_TagRole.go b/service/iam/api_op_TagRole.go index d368495ef9e..670d8f242b2 100644 --- a/service/iam/api_op_TagRole.go +++ b/service/iam/api_op_TagRole.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -58,9 +57,9 @@ func (c *Client) TagRole(ctx context.Context, params *TagRoleInput, optFns ...fu addawsAwsquery_serdeOpTagRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_TagUser.go b/service/iam/api_op_TagUser.go index 72b733f3b86..8842d8af7c9 100644 --- a/service/iam/api_op_TagUser.go +++ b/service/iam/api_op_TagUser.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) TagUser(ctx context.Context, params *TagUserInput, optFns ...fu addawsAwsquery_serdeOpTagUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UntagRole.go b/service/iam/api_op_UntagRole.go index cbf6517c97d..edd57cf7cf4 100644 --- a/service/iam/api_op_UntagRole.go +++ b/service/iam/api_op_UntagRole.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) UntagRole(ctx context.Context, params *UntagRoleInput, optFns . addawsAwsquery_serdeOpUntagRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UntagUser.go b/service/iam/api_op_UntagUser.go index e56ab634a0b..94c83448b51 100644 --- a/service/iam/api_op_UntagUser.go +++ b/service/iam/api_op_UntagUser.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) UntagUser(ctx context.Context, params *UntagUserInput, optFns . addawsAwsquery_serdeOpUntagUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UpdateAccessKey.go b/service/iam/api_op_UpdateAccessKey.go index ad53eb0118d..6e54770d606 100644 --- a/service/iam/api_op_UpdateAccessKey.go +++ b/service/iam/api_op_UpdateAccessKey.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) UpdateAccessKey(ctx context.Context, params *UpdateAccessKeyInp addawsAwsquery_serdeOpUpdateAccessKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UpdateAccountPasswordPolicy.go b/service/iam/api_op_UpdateAccountPasswordPolicy.go index 790ad844a5c..f38362b531a 100644 --- a/service/iam/api_op_UpdateAccountPasswordPolicy.go +++ b/service/iam/api_op_UpdateAccountPasswordPolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) UpdateAccountPasswordPolicy(ctx context.Context, params *Update addawsAwsquery_serdeOpUpdateAccountPasswordPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UpdateAssumeRolePolicy.go b/service/iam/api_op_UpdateAssumeRolePolicy.go index af8c8e3440e..12f116575f4 100644 --- a/service/iam/api_op_UpdateAssumeRolePolicy.go +++ b/service/iam/api_op_UpdateAssumeRolePolicy.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) UpdateAssumeRolePolicy(ctx context.Context, params *UpdateAssum addawsAwsquery_serdeOpUpdateAssumeRolePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UpdateGroup.go b/service/iam/api_op_UpdateGroup.go index 9fa87d6803e..a20191c47b3 100644 --- a/service/iam/api_op_UpdateGroup.go +++ b/service/iam/api_op_UpdateGroup.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) UpdateGroup(ctx context.Context, params *UpdateGroupInput, optF addawsAwsquery_serdeOpUpdateGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UpdateLoginProfile.go b/service/iam/api_op_UpdateLoginProfile.go index a4f79a722ab..629c6e95faf 100644 --- a/service/iam/api_op_UpdateLoginProfile.go +++ b/service/iam/api_op_UpdateLoginProfile.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) UpdateLoginProfile(ctx context.Context, params *UpdateLoginProf addawsAwsquery_serdeOpUpdateLoginProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UpdateOpenIDConnectProviderThumbprint.go b/service/iam/api_op_UpdateOpenIDConnectProviderThumbprint.go index db4b2176dd0..67893f107d7 100644 --- a/service/iam/api_op_UpdateOpenIDConnectProviderThumbprint.go +++ b/service/iam/api_op_UpdateOpenIDConnectProviderThumbprint.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) UpdateOpenIDConnectProviderThumbprint(ctx context.Context, para addawsAwsquery_serdeOpUpdateOpenIDConnectProviderThumbprintMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UpdateRole.go b/service/iam/api_op_UpdateRole.go index df5366f0005..bb334504b6a 100644 --- a/service/iam/api_op_UpdateRole.go +++ b/service/iam/api_op_UpdateRole.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateRole(ctx context.Context, params *UpdateRoleInput, optFns addawsAwsquery_serdeOpUpdateRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UpdateRoleDescription.go b/service/iam/api_op_UpdateRoleDescription.go index 170de9ad91a..b9ea573f3b1 100644 --- a/service/iam/api_op_UpdateRoleDescription.go +++ b/service/iam/api_op_UpdateRoleDescription.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateRoleDescription(ctx context.Context, params *UpdateRoleDe addawsAwsquery_serdeOpUpdateRoleDescriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UpdateSAMLProvider.go b/service/iam/api_op_UpdateSAMLProvider.go index 62c5bb2ab67..b4c6aa2a6ad 100644 --- a/service/iam/api_op_UpdateSAMLProvider.go +++ b/service/iam/api_op_UpdateSAMLProvider.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) UpdateSAMLProvider(ctx context.Context, params *UpdateSAMLProvi addawsAwsquery_serdeOpUpdateSAMLProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UpdateSSHPublicKey.go b/service/iam/api_op_UpdateSSHPublicKey.go index be546dd2b3a..8dbbb755961 100644 --- a/service/iam/api_op_UpdateSSHPublicKey.go +++ b/service/iam/api_op_UpdateSSHPublicKey.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) UpdateSSHPublicKey(ctx context.Context, params *UpdateSSHPublic addawsAwsquery_serdeOpUpdateSSHPublicKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UpdateServerCertificate.go b/service/iam/api_op_UpdateServerCertificate.go index 44ae2e5e45d..e378d1c8ed5 100644 --- a/service/iam/api_op_UpdateServerCertificate.go +++ b/service/iam/api_op_UpdateServerCertificate.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -39,9 +38,9 @@ func (c *Client) UpdateServerCertificate(ctx context.Context, params *UpdateServ addawsAwsquery_serdeOpUpdateServerCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UpdateServiceSpecificCredential.go b/service/iam/api_op_UpdateServiceSpecificCredential.go index fdf884efea9..70803d1f5c7 100644 --- a/service/iam/api_op_UpdateServiceSpecificCredential.go +++ b/service/iam/api_op_UpdateServiceSpecificCredential.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateServiceSpecificCredential(ctx context.Context, params *Up addawsAwsquery_serdeOpUpdateServiceSpecificCredentialMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UpdateSigningCertificate.go b/service/iam/api_op_UpdateSigningCertificate.go index 7fb8a677d0e..11de7fe7d15 100644 --- a/service/iam/api_op_UpdateSigningCertificate.go +++ b/service/iam/api_op_UpdateSigningCertificate.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) UpdateSigningCertificate(ctx context.Context, params *UpdateSig addawsAwsquery_serdeOpUpdateSigningCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UpdateUser.go b/service/iam/api_op_UpdateUser.go index e718f00296a..2591067f94f 100644 --- a/service/iam/api_op_UpdateUser.go +++ b/service/iam/api_op_UpdateUser.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) UpdateUser(ctx context.Context, params *UpdateUserInput, optFns addawsAwsquery_serdeOpUpdateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UploadSSHPublicKey.go b/service/iam/api_op_UploadSSHPublicKey.go index 92e57d708ef..de58e1d3606 100644 --- a/service/iam/api_op_UploadSSHPublicKey.go +++ b/service/iam/api_op_UploadSSHPublicKey.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) UploadSSHPublicKey(ctx context.Context, params *UploadSSHPublic addawsAwsquery_serdeOpUploadSSHPublicKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UploadServerCertificate.go b/service/iam/api_op_UploadServerCertificate.go index 20815668746..7e89777f97a 100644 --- a/service/iam/api_op_UploadServerCertificate.go +++ b/service/iam/api_op_UploadServerCertificate.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) UploadServerCertificate(ctx context.Context, params *UploadServ addawsAwsquery_serdeOpUploadServerCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/api_op_UploadSigningCertificate.go b/service/iam/api_op_UploadSigningCertificate.go index fbe10568717..cd049112ac5 100644 --- a/service/iam/api_op_UploadSigningCertificate.go +++ b/service/iam/api_op_UploadSigningCertificate.go @@ -5,7 +5,6 @@ package iam import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iam/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) UploadSigningCertificate(ctx context.Context, params *UploadSig addawsAwsquery_serdeOpUploadSigningCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iam/endpoints.go b/service/iam/endpoints.go index eb691034184..93bbc3d4f50 100644 --- a/service/iam/endpoints.go +++ b/service/iam/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/imagebuilder/api_client.go b/service/imagebuilder/api_client.go index 77b0814af6f..93722c65f34 100644 --- a/service/imagebuilder/api_client.go +++ b/service/imagebuilder/api_client.go @@ -88,34 +88,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -188,6 +160,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/imagebuilder/api_op_CancelImageCreation.go b/service/imagebuilder/api_op_CancelImageCreation.go index 21800c06159..1ab36988d0f 100644 --- a/service/imagebuilder/api_op_CancelImageCreation.go +++ b/service/imagebuilder/api_op_CancelImageCreation.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CancelImageCreation(ctx context.Context, params *CancelImageCre addawsRestjson1_serdeOpCancelImageCreationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_CreateComponent.go b/service/imagebuilder/api_op_CreateComponent.go index cadbb548b30..f4c1a16f620 100644 --- a/service/imagebuilder/api_op_CreateComponent.go +++ b/service/imagebuilder/api_op_CreateComponent.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateComponent(ctx context.Context, params *CreateComponentInp addawsRestjson1_serdeOpCreateComponentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_CreateDistributionConfiguration.go b/service/imagebuilder/api_op_CreateDistributionConfiguration.go index b815f7099e4..75d11bb689f 100644 --- a/service/imagebuilder/api_op_CreateDistributionConfiguration.go +++ b/service/imagebuilder/api_op_CreateDistributionConfiguration.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateDistributionConfiguration(ctx context.Context, params *Cr addawsRestjson1_serdeOpCreateDistributionConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_CreateImage.go b/service/imagebuilder/api_op_CreateImage.go index 644b09ac523..05c0e5d9492 100644 --- a/service/imagebuilder/api_op_CreateImage.go +++ b/service/imagebuilder/api_op_CreateImage.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateImage(ctx context.Context, params *CreateImageInput, optF addawsRestjson1_serdeOpCreateImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_CreateImagePipeline.go b/service/imagebuilder/api_op_CreateImagePipeline.go index e36e5b7c544..a8d5c8a5e22 100644 --- a/service/imagebuilder/api_op_CreateImagePipeline.go +++ b/service/imagebuilder/api_op_CreateImagePipeline.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateImagePipeline(ctx context.Context, params *CreateImagePip addawsRestjson1_serdeOpCreateImagePipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_CreateImageRecipe.go b/service/imagebuilder/api_op_CreateImageRecipe.go index eaa776c2f1a..68a1091c409 100644 --- a/service/imagebuilder/api_op_CreateImageRecipe.go +++ b/service/imagebuilder/api_op_CreateImageRecipe.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateImageRecipe(ctx context.Context, params *CreateImageRecip addawsRestjson1_serdeOpCreateImageRecipeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_CreateInfrastructureConfiguration.go b/service/imagebuilder/api_op_CreateInfrastructureConfiguration.go index cf8532b738a..d40f586c279 100644 --- a/service/imagebuilder/api_op_CreateInfrastructureConfiguration.go +++ b/service/imagebuilder/api_op_CreateInfrastructureConfiguration.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateInfrastructureConfiguration(ctx context.Context, params * addawsRestjson1_serdeOpCreateInfrastructureConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_DeleteComponent.go b/service/imagebuilder/api_op_DeleteComponent.go index c30651dd29a..8c7af974eab 100644 --- a/service/imagebuilder/api_op_DeleteComponent.go +++ b/service/imagebuilder/api_op_DeleteComponent.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteComponent(ctx context.Context, params *DeleteComponentInp addawsRestjson1_serdeOpDeleteComponentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_DeleteDistributionConfiguration.go b/service/imagebuilder/api_op_DeleteDistributionConfiguration.go index ea1e3818134..7d536215e0c 100644 --- a/service/imagebuilder/api_op_DeleteDistributionConfiguration.go +++ b/service/imagebuilder/api_op_DeleteDistributionConfiguration.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDistributionConfiguration(ctx context.Context, params *De addawsRestjson1_serdeOpDeleteDistributionConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_DeleteImage.go b/service/imagebuilder/api_op_DeleteImage.go index f3f8cbdaa0d..c8ce74dacd1 100644 --- a/service/imagebuilder/api_op_DeleteImage.go +++ b/service/imagebuilder/api_op_DeleteImage.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteImage(ctx context.Context, params *DeleteImageInput, optF addawsRestjson1_serdeOpDeleteImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_DeleteImagePipeline.go b/service/imagebuilder/api_op_DeleteImagePipeline.go index 3f2bd71048d..7a9b6a6f993 100644 --- a/service/imagebuilder/api_op_DeleteImagePipeline.go +++ b/service/imagebuilder/api_op_DeleteImagePipeline.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteImagePipeline(ctx context.Context, params *DeleteImagePip addawsRestjson1_serdeOpDeleteImagePipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_DeleteImageRecipe.go b/service/imagebuilder/api_op_DeleteImageRecipe.go index 0b75b50c8a7..0a6d4b34c67 100644 --- a/service/imagebuilder/api_op_DeleteImageRecipe.go +++ b/service/imagebuilder/api_op_DeleteImageRecipe.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteImageRecipe(ctx context.Context, params *DeleteImageRecip addawsRestjson1_serdeOpDeleteImageRecipeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_DeleteInfrastructureConfiguration.go b/service/imagebuilder/api_op_DeleteInfrastructureConfiguration.go index 91082a44a43..a02b9f55784 100644 --- a/service/imagebuilder/api_op_DeleteInfrastructureConfiguration.go +++ b/service/imagebuilder/api_op_DeleteInfrastructureConfiguration.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteInfrastructureConfiguration(ctx context.Context, params * addawsRestjson1_serdeOpDeleteInfrastructureConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_GetComponent.go b/service/imagebuilder/api_op_GetComponent.go index a142e4f79d5..8976f3ddc79 100644 --- a/service/imagebuilder/api_op_GetComponent.go +++ b/service/imagebuilder/api_op_GetComponent.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetComponent(ctx context.Context, params *GetComponentInput, op addawsRestjson1_serdeOpGetComponentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_GetComponentPolicy.go b/service/imagebuilder/api_op_GetComponentPolicy.go index a55476a3e85..477338133d3 100644 --- a/service/imagebuilder/api_op_GetComponentPolicy.go +++ b/service/imagebuilder/api_op_GetComponentPolicy.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetComponentPolicy(ctx context.Context, params *GetComponentPol addawsRestjson1_serdeOpGetComponentPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_GetDistributionConfiguration.go b/service/imagebuilder/api_op_GetDistributionConfiguration.go index 1a0d4048488..f22cab14428 100644 --- a/service/imagebuilder/api_op_GetDistributionConfiguration.go +++ b/service/imagebuilder/api_op_GetDistributionConfiguration.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDistributionConfiguration(ctx context.Context, params *GetDi addawsRestjson1_serdeOpGetDistributionConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_GetImage.go b/service/imagebuilder/api_op_GetImage.go index 04a7334b1e8..a92c0403806 100644 --- a/service/imagebuilder/api_op_GetImage.go +++ b/service/imagebuilder/api_op_GetImage.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetImage(ctx context.Context, params *GetImageInput, optFns ... addawsRestjson1_serdeOpGetImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_GetImagePipeline.go b/service/imagebuilder/api_op_GetImagePipeline.go index ea01deef6a2..5b9f75496dd 100644 --- a/service/imagebuilder/api_op_GetImagePipeline.go +++ b/service/imagebuilder/api_op_GetImagePipeline.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetImagePipeline(ctx context.Context, params *GetImagePipelineI addawsRestjson1_serdeOpGetImagePipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_GetImagePolicy.go b/service/imagebuilder/api_op_GetImagePolicy.go index 8a91f095c8c..c344d0cb942 100644 --- a/service/imagebuilder/api_op_GetImagePolicy.go +++ b/service/imagebuilder/api_op_GetImagePolicy.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetImagePolicy(ctx context.Context, params *GetImagePolicyInput addawsRestjson1_serdeOpGetImagePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_GetImageRecipe.go b/service/imagebuilder/api_op_GetImageRecipe.go index c0c4c790e4a..3054933311b 100644 --- a/service/imagebuilder/api_op_GetImageRecipe.go +++ b/service/imagebuilder/api_op_GetImageRecipe.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetImageRecipe(ctx context.Context, params *GetImageRecipeInput addawsRestjson1_serdeOpGetImageRecipeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_GetImageRecipePolicy.go b/service/imagebuilder/api_op_GetImageRecipePolicy.go index 4a51d6c88e2..021ba86275f 100644 --- a/service/imagebuilder/api_op_GetImageRecipePolicy.go +++ b/service/imagebuilder/api_op_GetImageRecipePolicy.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetImageRecipePolicy(ctx context.Context, params *GetImageRecip addawsRestjson1_serdeOpGetImageRecipePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_GetInfrastructureConfiguration.go b/service/imagebuilder/api_op_GetInfrastructureConfiguration.go index 74b092a0f0a..db160b103ca 100644 --- a/service/imagebuilder/api_op_GetInfrastructureConfiguration.go +++ b/service/imagebuilder/api_op_GetInfrastructureConfiguration.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetInfrastructureConfiguration(ctx context.Context, params *Get addawsRestjson1_serdeOpGetInfrastructureConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_ImportComponent.go b/service/imagebuilder/api_op_ImportComponent.go index 5f17bb9a23e..2e74c11bee4 100644 --- a/service/imagebuilder/api_op_ImportComponent.go +++ b/service/imagebuilder/api_op_ImportComponent.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ImportComponent(ctx context.Context, params *ImportComponentInp addawsRestjson1_serdeOpImportComponentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_ListComponentBuildVersions.go b/service/imagebuilder/api_op_ListComponentBuildVersions.go index df873efe580..efb43069ed4 100644 --- a/service/imagebuilder/api_op_ListComponentBuildVersions.go +++ b/service/imagebuilder/api_op_ListComponentBuildVersions.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListComponentBuildVersions(ctx context.Context, params *ListCom addawsRestjson1_serdeOpListComponentBuildVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_ListComponents.go b/service/imagebuilder/api_op_ListComponents.go index 09295bc30eb..59c89f637f0 100644 --- a/service/imagebuilder/api_op_ListComponents.go +++ b/service/imagebuilder/api_op_ListComponents.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListComponents(ctx context.Context, params *ListComponentsInput addawsRestjson1_serdeOpListComponentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_ListDistributionConfigurations.go b/service/imagebuilder/api_op_ListDistributionConfigurations.go index cf301ca8443..2c6d503bc6e 100644 --- a/service/imagebuilder/api_op_ListDistributionConfigurations.go +++ b/service/imagebuilder/api_op_ListDistributionConfigurations.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDistributionConfigurations(ctx context.Context, params *Lis addawsRestjson1_serdeOpListDistributionConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_ListImageBuildVersions.go b/service/imagebuilder/api_op_ListImageBuildVersions.go index c3eaea9fc69..dd7cbf174cb 100644 --- a/service/imagebuilder/api_op_ListImageBuildVersions.go +++ b/service/imagebuilder/api_op_ListImageBuildVersions.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListImageBuildVersions(ctx context.Context, params *ListImageBu addawsRestjson1_serdeOpListImageBuildVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_ListImagePipelineImages.go b/service/imagebuilder/api_op_ListImagePipelineImages.go index 469b564e649..bbf14dc07e5 100644 --- a/service/imagebuilder/api_op_ListImagePipelineImages.go +++ b/service/imagebuilder/api_op_ListImagePipelineImages.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListImagePipelineImages(ctx context.Context, params *ListImageP addawsRestjson1_serdeOpListImagePipelineImagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_ListImagePipelines.go b/service/imagebuilder/api_op_ListImagePipelines.go index 6344506ed37..5c0fca24951 100644 --- a/service/imagebuilder/api_op_ListImagePipelines.go +++ b/service/imagebuilder/api_op_ListImagePipelines.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListImagePipelines(ctx context.Context, params *ListImagePipeli addawsRestjson1_serdeOpListImagePipelinesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_ListImageRecipes.go b/service/imagebuilder/api_op_ListImageRecipes.go index 4ef37f05c68..5a44d9085b1 100644 --- a/service/imagebuilder/api_op_ListImageRecipes.go +++ b/service/imagebuilder/api_op_ListImageRecipes.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListImageRecipes(ctx context.Context, params *ListImageRecipesI addawsRestjson1_serdeOpListImageRecipesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_ListImages.go b/service/imagebuilder/api_op_ListImages.go index d40d3bca94d..5d296454f8b 100644 --- a/service/imagebuilder/api_op_ListImages.go +++ b/service/imagebuilder/api_op_ListImages.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListImages(ctx context.Context, params *ListImagesInput, optFns addawsRestjson1_serdeOpListImagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_ListInfrastructureConfigurations.go b/service/imagebuilder/api_op_ListInfrastructureConfigurations.go index 4d3a6c7f1a9..ab76502788c 100644 --- a/service/imagebuilder/api_op_ListInfrastructureConfigurations.go +++ b/service/imagebuilder/api_op_ListInfrastructureConfigurations.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListInfrastructureConfigurations(ctx context.Context, params *L addawsRestjson1_serdeOpListInfrastructureConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_ListTagsForResource.go b/service/imagebuilder/api_op_ListTagsForResource.go index 8cf30beb27a..74fa9166537 100644 --- a/service/imagebuilder/api_op_ListTagsForResource.go +++ b/service/imagebuilder/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_PutComponentPolicy.go b/service/imagebuilder/api_op_PutComponentPolicy.go index d6081360ee3..66810f63197 100644 --- a/service/imagebuilder/api_op_PutComponentPolicy.go +++ b/service/imagebuilder/api_op_PutComponentPolicy.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) PutComponentPolicy(ctx context.Context, params *PutComponentPol addawsRestjson1_serdeOpPutComponentPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_PutImagePolicy.go b/service/imagebuilder/api_op_PutImagePolicy.go index fe4b9315dce..4148195cb3a 100644 --- a/service/imagebuilder/api_op_PutImagePolicy.go +++ b/service/imagebuilder/api_op_PutImagePolicy.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) PutImagePolicy(ctx context.Context, params *PutImagePolicyInput addawsRestjson1_serdeOpPutImagePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_PutImageRecipePolicy.go b/service/imagebuilder/api_op_PutImageRecipePolicy.go index d7d225e326e..8de9f2137eb 100644 --- a/service/imagebuilder/api_op_PutImageRecipePolicy.go +++ b/service/imagebuilder/api_op_PutImageRecipePolicy.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) PutImageRecipePolicy(ctx context.Context, params *PutImageRecip addawsRestjson1_serdeOpPutImageRecipePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_StartImagePipelineExecution.go b/service/imagebuilder/api_op_StartImagePipelineExecution.go index 2a3c6296779..65acfb6fc12 100644 --- a/service/imagebuilder/api_op_StartImagePipelineExecution.go +++ b/service/imagebuilder/api_op_StartImagePipelineExecution.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) StartImagePipelineExecution(ctx context.Context, params *StartI addawsRestjson1_serdeOpStartImagePipelineExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_TagResource.go b/service/imagebuilder/api_op_TagResource.go index be75d2d19a1..4a551234000 100644 --- a/service/imagebuilder/api_op_TagResource.go +++ b/service/imagebuilder/api_op_TagResource.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_UntagResource.go b/service/imagebuilder/api_op_UntagResource.go index 0b4ab8bd939..1c912741662 100644 --- a/service/imagebuilder/api_op_UntagResource.go +++ b/service/imagebuilder/api_op_UntagResource.go @@ -5,7 +5,6 @@ package imagebuilder import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_UpdateDistributionConfiguration.go b/service/imagebuilder/api_op_UpdateDistributionConfiguration.go index 362d8c4412f..9aadc59cfb0 100644 --- a/service/imagebuilder/api_op_UpdateDistributionConfiguration.go +++ b/service/imagebuilder/api_op_UpdateDistributionConfiguration.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateDistributionConfiguration(ctx context.Context, params *Up addawsRestjson1_serdeOpUpdateDistributionConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_UpdateImagePipeline.go b/service/imagebuilder/api_op_UpdateImagePipeline.go index 7bc00ff7ef0..31e94cd2b45 100644 --- a/service/imagebuilder/api_op_UpdateImagePipeline.go +++ b/service/imagebuilder/api_op_UpdateImagePipeline.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateImagePipeline(ctx context.Context, params *UpdateImagePip addawsRestjson1_serdeOpUpdateImagePipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/api_op_UpdateInfrastructureConfiguration.go b/service/imagebuilder/api_op_UpdateInfrastructureConfiguration.go index 75c8d644f07..ed59b2e9cdb 100644 --- a/service/imagebuilder/api_op_UpdateInfrastructureConfiguration.go +++ b/service/imagebuilder/api_op_UpdateInfrastructureConfiguration.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/imagebuilder/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateInfrastructureConfiguration(ctx context.Context, params * addawsRestjson1_serdeOpUpdateInfrastructureConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/imagebuilder/endpoints.go b/service/imagebuilder/endpoints.go index 6fbff19d3dd..f9648f6359a 100644 --- a/service/imagebuilder/endpoints.go +++ b/service/imagebuilder/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/inspector/api_client.go b/service/inspector/api_client.go index 68e1305d991..913d57ad03d 100644 --- a/service/inspector/api_client.go +++ b/service/inspector/api_client.go @@ -80,30 +80,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -169,6 +145,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/inspector/api_op_AddAttributesToFindings.go b/service/inspector/api_op_AddAttributesToFindings.go index 3a92180924c..142a53621b0 100644 --- a/service/inspector/api_op_AddAttributesToFindings.go +++ b/service/inspector/api_op_AddAttributesToFindings.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AddAttributesToFindings(ctx context.Context, params *AddAttribu addawsAwsjson11_serdeOpAddAttributesToFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_CreateAssessmentTarget.go b/service/inspector/api_op_CreateAssessmentTarget.go index 586e9ddb24e..8dca1f95cb0 100644 --- a/service/inspector/api_op_CreateAssessmentTarget.go +++ b/service/inspector/api_op_CreateAssessmentTarget.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) CreateAssessmentTarget(ctx context.Context, params *CreateAsses addawsAwsjson11_serdeOpCreateAssessmentTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_CreateAssessmentTemplate.go b/service/inspector/api_op_CreateAssessmentTemplate.go index 4aa7b6b1189..11cac9cd00f 100644 --- a/service/inspector/api_op_CreateAssessmentTemplate.go +++ b/service/inspector/api_op_CreateAssessmentTemplate.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateAssessmentTemplate(ctx context.Context, params *CreateAss addawsAwsjson11_serdeOpCreateAssessmentTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_CreateExclusionsPreview.go b/service/inspector/api_op_CreateExclusionsPreview.go index 81ac38466b6..d7ce5b72355 100644 --- a/service/inspector/api_op_CreateExclusionsPreview.go +++ b/service/inspector/api_op_CreateExclusionsPreview.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CreateExclusionsPreview(ctx context.Context, params *CreateExcl addawsAwsjson11_serdeOpCreateExclusionsPreviewMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_CreateResourceGroup.go b/service/inspector/api_op_CreateResourceGroup.go index 9f3ab807fba..f2adab07704 100644 --- a/service/inspector/api_op_CreateResourceGroup.go +++ b/service/inspector/api_op_CreateResourceGroup.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateResourceGroup(ctx context.Context, params *CreateResource addawsAwsjson11_serdeOpCreateResourceGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_DeleteAssessmentRun.go b/service/inspector/api_op_DeleteAssessmentRun.go index 885d226642c..f8c0ff680f6 100644 --- a/service/inspector/api_op_DeleteAssessmentRun.go +++ b/service/inspector/api_op_DeleteAssessmentRun.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteAssessmentRun(ctx context.Context, params *DeleteAssessme addawsAwsjson11_serdeOpDeleteAssessmentRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_DeleteAssessmentTarget.go b/service/inspector/api_op_DeleteAssessmentTarget.go index 1ab9ba01899..8089597ea95 100644 --- a/service/inspector/api_op_DeleteAssessmentTarget.go +++ b/service/inspector/api_op_DeleteAssessmentTarget.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteAssessmentTarget(ctx context.Context, params *DeleteAsses addawsAwsjson11_serdeOpDeleteAssessmentTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_DeleteAssessmentTemplate.go b/service/inspector/api_op_DeleteAssessmentTemplate.go index 1748156e2fb..9aa7243a07a 100644 --- a/service/inspector/api_op_DeleteAssessmentTemplate.go +++ b/service/inspector/api_op_DeleteAssessmentTemplate.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteAssessmentTemplate(ctx context.Context, params *DeleteAss addawsAwsjson11_serdeOpDeleteAssessmentTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_DescribeAssessmentRuns.go b/service/inspector/api_op_DescribeAssessmentRuns.go index 37e120528a9..683a0ac1419 100644 --- a/service/inspector/api_op_DescribeAssessmentRuns.go +++ b/service/inspector/api_op_DescribeAssessmentRuns.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAssessmentRuns(ctx context.Context, params *DescribeAss addawsAwsjson11_serdeOpDescribeAssessmentRunsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_DescribeAssessmentTargets.go b/service/inspector/api_op_DescribeAssessmentTargets.go index b2146fcf0e0..5e36089d25a 100644 --- a/service/inspector/api_op_DescribeAssessmentTargets.go +++ b/service/inspector/api_op_DescribeAssessmentTargets.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAssessmentTargets(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeAssessmentTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_DescribeAssessmentTemplates.go b/service/inspector/api_op_DescribeAssessmentTemplates.go index e7ec630cfa2..16f546a8e15 100644 --- a/service/inspector/api_op_DescribeAssessmentTemplates.go +++ b/service/inspector/api_op_DescribeAssessmentTemplates.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAssessmentTemplates(ctx context.Context, params *Descri addawsAwsjson11_serdeOpDescribeAssessmentTemplatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_DescribeCrossAccountAccessRole.go b/service/inspector/api_op_DescribeCrossAccountAccessRole.go index 3a518439130..ed4c3a025b1 100644 --- a/service/inspector/api_op_DescribeCrossAccountAccessRole.go +++ b/service/inspector/api_op_DescribeCrossAccountAccessRole.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DescribeCrossAccountAccessRole(ctx context.Context, params *Des addawsAwsjson11_serdeOpDescribeCrossAccountAccessRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_DescribeExclusions.go b/service/inspector/api_op_DescribeExclusions.go index 26305dd3d8f..0e1afc8a923 100644 --- a/service/inspector/api_op_DescribeExclusions.go +++ b/service/inspector/api_op_DescribeExclusions.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeExclusions(ctx context.Context, params *DescribeExclusi addawsAwsjson11_serdeOpDescribeExclusionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_DescribeFindings.go b/service/inspector/api_op_DescribeFindings.go index decfe7f3dcf..a6a13d8fe16 100644 --- a/service/inspector/api_op_DescribeFindings.go +++ b/service/inspector/api_op_DescribeFindings.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeFindings(ctx context.Context, params *DescribeFindingsI addawsAwsjson11_serdeOpDescribeFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_DescribeResourceGroups.go b/service/inspector/api_op_DescribeResourceGroups.go index 7fbb722a5db..e1c0ecb0b6f 100644 --- a/service/inspector/api_op_DescribeResourceGroups.go +++ b/service/inspector/api_op_DescribeResourceGroups.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeResourceGroups(ctx context.Context, params *DescribeRes addawsAwsjson11_serdeOpDescribeResourceGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_DescribeRulesPackages.go b/service/inspector/api_op_DescribeRulesPackages.go index 7b98ec83c91..9a210279565 100644 --- a/service/inspector/api_op_DescribeRulesPackages.go +++ b/service/inspector/api_op_DescribeRulesPackages.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeRulesPackages(ctx context.Context, params *DescribeRule addawsAwsjson11_serdeOpDescribeRulesPackagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_GetAssessmentReport.go b/service/inspector/api_op_GetAssessmentReport.go index ac0932463ae..56b9ad775c9 100644 --- a/service/inspector/api_op_GetAssessmentReport.go +++ b/service/inspector/api_op_GetAssessmentReport.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetAssessmentReport(ctx context.Context, params *GetAssessmentR addawsAwsjson11_serdeOpGetAssessmentReportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_GetExclusionsPreview.go b/service/inspector/api_op_GetExclusionsPreview.go index 6668e1b952d..1e90ae6dc3d 100644 --- a/service/inspector/api_op_GetExclusionsPreview.go +++ b/service/inspector/api_op_GetExclusionsPreview.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetExclusionsPreview(ctx context.Context, params *GetExclusions addawsAwsjson11_serdeOpGetExclusionsPreviewMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_GetTelemetryMetadata.go b/service/inspector/api_op_GetTelemetryMetadata.go index e0b98a8957d..47abaa6e6e0 100644 --- a/service/inspector/api_op_GetTelemetryMetadata.go +++ b/service/inspector/api_op_GetTelemetryMetadata.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetTelemetryMetadata(ctx context.Context, params *GetTelemetryM addawsAwsjson11_serdeOpGetTelemetryMetadataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_ListAssessmentRunAgents.go b/service/inspector/api_op_ListAssessmentRunAgents.go index 45a13c96b87..4df809a7299 100644 --- a/service/inspector/api_op_ListAssessmentRunAgents.go +++ b/service/inspector/api_op_ListAssessmentRunAgents.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListAssessmentRunAgents(ctx context.Context, params *ListAssess addawsAwsjson11_serdeOpListAssessmentRunAgentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_ListAssessmentRuns.go b/service/inspector/api_op_ListAssessmentRuns.go index 2e00a2adbe2..aedfadd2a67 100644 --- a/service/inspector/api_op_ListAssessmentRuns.go +++ b/service/inspector/api_op_ListAssessmentRuns.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListAssessmentRuns(ctx context.Context, params *ListAssessmentR addawsAwsjson11_serdeOpListAssessmentRunsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_ListAssessmentTargets.go b/service/inspector/api_op_ListAssessmentTargets.go index 356178b9785..44a13cb5c07 100644 --- a/service/inspector/api_op_ListAssessmentTargets.go +++ b/service/inspector/api_op_ListAssessmentTargets.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListAssessmentTargets(ctx context.Context, params *ListAssessme addawsAwsjson11_serdeOpListAssessmentTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_ListAssessmentTemplates.go b/service/inspector/api_op_ListAssessmentTemplates.go index 2f2b1caf8fc..1c9c9bf3206 100644 --- a/service/inspector/api_op_ListAssessmentTemplates.go +++ b/service/inspector/api_op_ListAssessmentTemplates.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListAssessmentTemplates(ctx context.Context, params *ListAssess addawsAwsjson11_serdeOpListAssessmentTemplatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_ListEventSubscriptions.go b/service/inspector/api_op_ListEventSubscriptions.go index 271d96728dd..d3c3190ee41 100644 --- a/service/inspector/api_op_ListEventSubscriptions.go +++ b/service/inspector/api_op_ListEventSubscriptions.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListEventSubscriptions(ctx context.Context, params *ListEventSu addawsAwsjson11_serdeOpListEventSubscriptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_ListExclusions.go b/service/inspector/api_op_ListExclusions.go index 87e62491efe..d0e8a53cb2e 100644 --- a/service/inspector/api_op_ListExclusions.go +++ b/service/inspector/api_op_ListExclusions.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListExclusions(ctx context.Context, params *ListExclusionsInput addawsAwsjson11_serdeOpListExclusionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_ListFindings.go b/service/inspector/api_op_ListFindings.go index e455bc702e9..6f9bee57e22 100644 --- a/service/inspector/api_op_ListFindings.go +++ b/service/inspector/api_op_ListFindings.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListFindings(ctx context.Context, params *ListFindingsInput, op addawsAwsjson11_serdeOpListFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_ListRulesPackages.go b/service/inspector/api_op_ListRulesPackages.go index 0912ac59241..dcc7f7e6b14 100644 --- a/service/inspector/api_op_ListRulesPackages.go +++ b/service/inspector/api_op_ListRulesPackages.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListRulesPackages(ctx context.Context, params *ListRulesPackage addawsAwsjson11_serdeOpListRulesPackagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_ListTagsForResource.go b/service/inspector/api_op_ListTagsForResource.go index 2bcf6653719..e06d10478b0 100644 --- a/service/inspector/api_op_ListTagsForResource.go +++ b/service/inspector/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_PreviewAgents.go b/service/inspector/api_op_PreviewAgents.go index 4d8787b697b..6de6688bc5d 100644 --- a/service/inspector/api_op_PreviewAgents.go +++ b/service/inspector/api_op_PreviewAgents.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PreviewAgents(ctx context.Context, params *PreviewAgentsInput, addawsAwsjson11_serdeOpPreviewAgentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_RegisterCrossAccountAccessRole.go b/service/inspector/api_op_RegisterCrossAccountAccessRole.go index f7ef4ed2940..e0b2963498d 100644 --- a/service/inspector/api_op_RegisterCrossAccountAccessRole.go +++ b/service/inspector/api_op_RegisterCrossAccountAccessRole.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) RegisterCrossAccountAccessRole(ctx context.Context, params *Reg addawsAwsjson11_serdeOpRegisterCrossAccountAccessRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_RemoveAttributesFromFindings.go b/service/inspector/api_op_RemoveAttributesFromFindings.go index a6e1076f3f1..fe5cc63e82f 100644 --- a/service/inspector/api_op_RemoveAttributesFromFindings.go +++ b/service/inspector/api_op_RemoveAttributesFromFindings.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) RemoveAttributesFromFindings(ctx context.Context, params *Remov addawsAwsjson11_serdeOpRemoveAttributesFromFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_SetTagsForResource.go b/service/inspector/api_op_SetTagsForResource.go index d016ff82e34..eafe04f205a 100644 --- a/service/inspector/api_op_SetTagsForResource.go +++ b/service/inspector/api_op_SetTagsForResource.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) SetTagsForResource(ctx context.Context, params *SetTagsForResou addawsAwsjson11_serdeOpSetTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_StartAssessmentRun.go b/service/inspector/api_op_StartAssessmentRun.go index 6cdbd83e4e4..9b5dada2618 100644 --- a/service/inspector/api_op_StartAssessmentRun.go +++ b/service/inspector/api_op_StartAssessmentRun.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) StartAssessmentRun(ctx context.Context, params *StartAssessment addawsAwsjson11_serdeOpStartAssessmentRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_StopAssessmentRun.go b/service/inspector/api_op_StopAssessmentRun.go index afd5346cb21..a234786d21f 100644 --- a/service/inspector/api_op_StopAssessmentRun.go +++ b/service/inspector/api_op_StopAssessmentRun.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StopAssessmentRun(ctx context.Context, params *StopAssessmentRu addawsAwsjson11_serdeOpStopAssessmentRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_SubscribeToEvent.go b/service/inspector/api_op_SubscribeToEvent.go index eff5e6cbe25..d127e552600 100644 --- a/service/inspector/api_op_SubscribeToEvent.go +++ b/service/inspector/api_op_SubscribeToEvent.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) SubscribeToEvent(ctx context.Context, params *SubscribeToEventI addawsAwsjson11_serdeOpSubscribeToEventMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_UnsubscribeFromEvent.go b/service/inspector/api_op_UnsubscribeFromEvent.go index 56f14da0bce..842e813ff37 100644 --- a/service/inspector/api_op_UnsubscribeFromEvent.go +++ b/service/inspector/api_op_UnsubscribeFromEvent.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/inspector/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UnsubscribeFromEvent(ctx context.Context, params *UnsubscribeFr addawsAwsjson11_serdeOpUnsubscribeFromEventMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/api_op_UpdateAssessmentTarget.go b/service/inspector/api_op_UpdateAssessmentTarget.go index 3f8396a901d..b45e8e3203f 100644 --- a/service/inspector/api_op_UpdateAssessmentTarget.go +++ b/service/inspector/api_op_UpdateAssessmentTarget.go @@ -5,7 +5,6 @@ package inspector import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) UpdateAssessmentTarget(ctx context.Context, params *UpdateAsses addawsAwsjson11_serdeOpUpdateAssessmentTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/inspector/endpoints.go b/service/inspector/endpoints.go index 3e451152b01..dbf66d9edd4 100644 --- a/service/inspector/endpoints.go +++ b/service/inspector/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/iot/api_client.go b/service/iot/api_client.go index ad29ff8f3c4..f472511495f 100644 --- a/service/iot/api_client.go +++ b/service/iot/api_client.go @@ -102,34 +102,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -202,6 +174,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/iot/api_op_AcceptCertificateTransfer.go b/service/iot/api_op_AcceptCertificateTransfer.go index c3bf3523f2a..b182d01a661 100644 --- a/service/iot/api_op_AcceptCertificateTransfer.go +++ b/service/iot/api_op_AcceptCertificateTransfer.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) AcceptCertificateTransfer(ctx context.Context, params *AcceptCe addawsRestjson1_serdeOpAcceptCertificateTransferMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_AddThingToBillingGroup.go b/service/iot/api_op_AddThingToBillingGroup.go index f65307023d6..9bfa9737daa 100644 --- a/service/iot/api_op_AddThingToBillingGroup.go +++ b/service/iot/api_op_AddThingToBillingGroup.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AddThingToBillingGroup(ctx context.Context, params *AddThingToB addawsRestjson1_serdeOpAddThingToBillingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_AddThingToThingGroup.go b/service/iot/api_op_AddThingToThingGroup.go index 696ce192771..eaa40d21e1b 100644 --- a/service/iot/api_op_AddThingToThingGroup.go +++ b/service/iot/api_op_AddThingToThingGroup.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AddThingToThingGroup(ctx context.Context, params *AddThingToThi addawsRestjson1_serdeOpAddThingToThingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_AssociateTargetsWithJob.go b/service/iot/api_op_AssociateTargetsWithJob.go index 7242bf1d1d0..2d278b7a3b4 100644 --- a/service/iot/api_op_AssociateTargetsWithJob.go +++ b/service/iot/api_op_AssociateTargetsWithJob.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) AssociateTargetsWithJob(ctx context.Context, params *AssociateT addawsRestjson1_serdeOpAssociateTargetsWithJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_AttachPolicy.go b/service/iot/api_op_AttachPolicy.go index 923f003783d..7dc29c50626 100644 --- a/service/iot/api_op_AttachPolicy.go +++ b/service/iot/api_op_AttachPolicy.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AttachPolicy(ctx context.Context, params *AttachPolicyInput, op addawsRestjson1_serdeOpAttachPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_AttachPrincipalPolicy.go b/service/iot/api_op_AttachPrincipalPolicy.go index 7d1ee63a724..0aed3f05179 100644 --- a/service/iot/api_op_AttachPrincipalPolicy.go +++ b/service/iot/api_op_AttachPrincipalPolicy.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AttachPrincipalPolicy(ctx context.Context, params *AttachPrinci addawsRestjson1_serdeOpAttachPrincipalPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_AttachSecurityProfile.go b/service/iot/api_op_AttachSecurityProfile.go index b6b8aaaa6cd..6ca3f3dfaab 100644 --- a/service/iot/api_op_AttachSecurityProfile.go +++ b/service/iot/api_op_AttachSecurityProfile.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) AttachSecurityProfile(ctx context.Context, params *AttachSecuri addawsRestjson1_serdeOpAttachSecurityProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_AttachThingPrincipal.go b/service/iot/api_op_AttachThingPrincipal.go index 5d709cfb6c0..8b55bc326c5 100644 --- a/service/iot/api_op_AttachThingPrincipal.go +++ b/service/iot/api_op_AttachThingPrincipal.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) AttachThingPrincipal(ctx context.Context, params *AttachThingPr addawsRestjson1_serdeOpAttachThingPrincipalMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CancelAuditMitigationActionsTask.go b/service/iot/api_op_CancelAuditMitigationActionsTask.go index dbd094df71d..cef07f7e3e4 100644 --- a/service/iot/api_op_CancelAuditMitigationActionsTask.go +++ b/service/iot/api_op_CancelAuditMitigationActionsTask.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CancelAuditMitigationActionsTask(ctx context.Context, params *C addawsRestjson1_serdeOpCancelAuditMitigationActionsTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CancelAuditTask.go b/service/iot/api_op_CancelAuditTask.go index eea92efd162..0e67abb88ba 100644 --- a/service/iot/api_op_CancelAuditTask.go +++ b/service/iot/api_op_CancelAuditTask.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CancelAuditTask(ctx context.Context, params *CancelAuditTaskInp addawsRestjson1_serdeOpCancelAuditTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CancelCertificateTransfer.go b/service/iot/api_op_CancelCertificateTransfer.go index 220f31c35ca..17d06024c80 100644 --- a/service/iot/api_op_CancelCertificateTransfer.go +++ b/service/iot/api_op_CancelCertificateTransfer.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) CancelCertificateTransfer(ctx context.Context, params *CancelCe addawsRestjson1_serdeOpCancelCertificateTransferMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CancelJob.go b/service/iot/api_op_CancelJob.go index cbedd3e8360..7357790d216 100644 --- a/service/iot/api_op_CancelJob.go +++ b/service/iot/api_op_CancelJob.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CancelJob(ctx context.Context, params *CancelJobInput, optFns . addawsRestjson1_serdeOpCancelJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CancelJobExecution.go b/service/iot/api_op_CancelJobExecution.go index 7582a9ca541..24e7c1ec183 100644 --- a/service/iot/api_op_CancelJobExecution.go +++ b/service/iot/api_op_CancelJobExecution.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CancelJobExecution(ctx context.Context, params *CancelJobExecut addawsRestjson1_serdeOpCancelJobExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ClearDefaultAuthorizer.go b/service/iot/api_op_ClearDefaultAuthorizer.go index 95227be98dc..577f06f6738 100644 --- a/service/iot/api_op_ClearDefaultAuthorizer.go +++ b/service/iot/api_op_ClearDefaultAuthorizer.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ClearDefaultAuthorizer(ctx context.Context, params *ClearDefaul addawsRestjson1_serdeOpClearDefaultAuthorizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ConfirmTopicRuleDestination.go b/service/iot/api_op_ConfirmTopicRuleDestination.go index 8d3b03fe91f..49ea7327760 100644 --- a/service/iot/api_op_ConfirmTopicRuleDestination.go +++ b/service/iot/api_op_ConfirmTopicRuleDestination.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) ConfirmTopicRuleDestination(ctx context.Context, params *Confir addawsRestjson1_serdeOpConfirmTopicRuleDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateAuthorizer.go b/service/iot/api_op_CreateAuthorizer.go index 8e60c5eb5b1..52cd1c9995e 100644 --- a/service/iot/api_op_CreateAuthorizer.go +++ b/service/iot/api_op_CreateAuthorizer.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateAuthorizer(ctx context.Context, params *CreateAuthorizerI addawsRestjson1_serdeOpCreateAuthorizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateBillingGroup.go b/service/iot/api_op_CreateBillingGroup.go index 7b3058baeb4..a85a0b23659 100644 --- a/service/iot/api_op_CreateBillingGroup.go +++ b/service/iot/api_op_CreateBillingGroup.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateBillingGroup(ctx context.Context, params *CreateBillingGr addawsRestjson1_serdeOpCreateBillingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateCertificateFromCsr.go b/service/iot/api_op_CreateCertificateFromCsr.go index de96523e928..356e3cd106a 100644 --- a/service/iot/api_op_CreateCertificateFromCsr.go +++ b/service/iot/api_op_CreateCertificateFromCsr.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -46,9 +45,9 @@ func (c *Client) CreateCertificateFromCsr(ctx context.Context, params *CreateCer addawsRestjson1_serdeOpCreateCertificateFromCsrMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateDimension.go b/service/iot/api_op_CreateDimension.go index cf3922b85f6..8c593153094 100644 --- a/service/iot/api_op_CreateDimension.go +++ b/service/iot/api_op_CreateDimension.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateDimension(ctx context.Context, params *CreateDimensionInp addawsRestjson1_serdeOpCreateDimensionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateDomainConfiguration.go b/service/iot/api_op_CreateDomainConfiguration.go index 3d2ce734616..0e4cec8e6c8 100644 --- a/service/iot/api_op_CreateDomainConfiguration.go +++ b/service/iot/api_op_CreateDomainConfiguration.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateDomainConfiguration(ctx context.Context, params *CreateDo addawsRestjson1_serdeOpCreateDomainConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateDynamicThingGroup.go b/service/iot/api_op_CreateDynamicThingGroup.go index ae35e073b50..ebdf4c19936 100644 --- a/service/iot/api_op_CreateDynamicThingGroup.go +++ b/service/iot/api_op_CreateDynamicThingGroup.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDynamicThingGroup(ctx context.Context, params *CreateDyna addawsRestjson1_serdeOpCreateDynamicThingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateJob.go b/service/iot/api_op_CreateJob.go index af3f0b12978..48d49ac5103 100644 --- a/service/iot/api_op_CreateJob.go +++ b/service/iot/api_op_CreateJob.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateJob(ctx context.Context, params *CreateJobInput, optFns . addawsRestjson1_serdeOpCreateJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateKeysAndCertificate.go b/service/iot/api_op_CreateKeysAndCertificate.go index 62717044452..26f05ab1af8 100644 --- a/service/iot/api_op_CreateKeysAndCertificate.go +++ b/service/iot/api_op_CreateKeysAndCertificate.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateKeysAndCertificate(ctx context.Context, params *CreateKey addawsRestjson1_serdeOpCreateKeysAndCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateMitigationAction.go b/service/iot/api_op_CreateMitigationAction.go index e707f81b396..37f6e314ce9 100644 --- a/service/iot/api_op_CreateMitigationAction.go +++ b/service/iot/api_op_CreateMitigationAction.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateMitigationAction(ctx context.Context, params *CreateMitig addawsRestjson1_serdeOpCreateMitigationActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateOTAUpdate.go b/service/iot/api_op_CreateOTAUpdate.go index 59e0d5a4e72..b626006be69 100644 --- a/service/iot/api_op_CreateOTAUpdate.go +++ b/service/iot/api_op_CreateOTAUpdate.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateOTAUpdate(ctx context.Context, params *CreateOTAUpdateInp addawsRestjson1_serdeOpCreateOTAUpdateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreatePolicy.go b/service/iot/api_op_CreatePolicy.go index 8b86eb535b4..0f3e71e64cb 100644 --- a/service/iot/api_op_CreatePolicy.go +++ b/service/iot/api_op_CreatePolicy.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreatePolicy(ctx context.Context, params *CreatePolicyInput, op addawsRestjson1_serdeOpCreatePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreatePolicyVersion.go b/service/iot/api_op_CreatePolicyVersion.go index ae02215d4fb..70cb1d7c52b 100644 --- a/service/iot/api_op_CreatePolicyVersion.go +++ b/service/iot/api_op_CreatePolicyVersion.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) CreatePolicyVersion(ctx context.Context, params *CreatePolicyVe addawsRestjson1_serdeOpCreatePolicyVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateProvisioningClaim.go b/service/iot/api_op_CreateProvisioningClaim.go index 36c8c0aff83..7bacd346a47 100644 --- a/service/iot/api_op_CreateProvisioningClaim.go +++ b/service/iot/api_op_CreateProvisioningClaim.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateProvisioningClaim(ctx context.Context, params *CreateProv addawsRestjson1_serdeOpCreateProvisioningClaimMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateProvisioningTemplate.go b/service/iot/api_op_CreateProvisioningTemplate.go index 1e624de8950..940227bc884 100644 --- a/service/iot/api_op_CreateProvisioningTemplate.go +++ b/service/iot/api_op_CreateProvisioningTemplate.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateProvisioningTemplate(ctx context.Context, params *CreateP addawsRestjson1_serdeOpCreateProvisioningTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateProvisioningTemplateVersion.go b/service/iot/api_op_CreateProvisioningTemplateVersion.go index 74ef7cf2807..e45be80624e 100644 --- a/service/iot/api_op_CreateProvisioningTemplateVersion.go +++ b/service/iot/api_op_CreateProvisioningTemplateVersion.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateProvisioningTemplateVersion(ctx context.Context, params * addawsRestjson1_serdeOpCreateProvisioningTemplateVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateRoleAlias.go b/service/iot/api_op_CreateRoleAlias.go index def55277ba4..caa061bed75 100644 --- a/service/iot/api_op_CreateRoleAlias.go +++ b/service/iot/api_op_CreateRoleAlias.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateRoleAlias(ctx context.Context, params *CreateRoleAliasInp addawsRestjson1_serdeOpCreateRoleAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateScheduledAudit.go b/service/iot/api_op_CreateScheduledAudit.go index 948a9ad78cd..6d041e8f4a8 100644 --- a/service/iot/api_op_CreateScheduledAudit.go +++ b/service/iot/api_op_CreateScheduledAudit.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateScheduledAudit(ctx context.Context, params *CreateSchedul addawsRestjson1_serdeOpCreateScheduledAuditMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateSecurityProfile.go b/service/iot/api_op_CreateSecurityProfile.go index 31cd7f72a5b..0f9ceddfbfb 100644 --- a/service/iot/api_op_CreateSecurityProfile.go +++ b/service/iot/api_op_CreateSecurityProfile.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateSecurityProfile(ctx context.Context, params *CreateSecuri addawsRestjson1_serdeOpCreateSecurityProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateStream.go b/service/iot/api_op_CreateStream.go index c9e5257854a..6d34b037eff 100644 --- a/service/iot/api_op_CreateStream.go +++ b/service/iot/api_op_CreateStream.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateStream(ctx context.Context, params *CreateStreamInput, op addawsRestjson1_serdeOpCreateStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateThing.go b/service/iot/api_op_CreateThing.go index 543e2f6d6ba..2c4e3fbea43 100644 --- a/service/iot/api_op_CreateThing.go +++ b/service/iot/api_op_CreateThing.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateThing(ctx context.Context, params *CreateThingInput, optF addawsRestjson1_serdeOpCreateThingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateThingGroup.go b/service/iot/api_op_CreateThingGroup.go index 9cc76b5e0c6..3941b589df7 100644 --- a/service/iot/api_op_CreateThingGroup.go +++ b/service/iot/api_op_CreateThingGroup.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateThingGroup(ctx context.Context, params *CreateThingGroupI addawsRestjson1_serdeOpCreateThingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateThingType.go b/service/iot/api_op_CreateThingType.go index 23e40d7fa41..b251b2721a0 100644 --- a/service/iot/api_op_CreateThingType.go +++ b/service/iot/api_op_CreateThingType.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateThingType(ctx context.Context, params *CreateThingTypeInp addawsRestjson1_serdeOpCreateThingTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateTopicRule.go b/service/iot/api_op_CreateTopicRule.go index 0760ce6f7b0..c5557a2561c 100644 --- a/service/iot/api_op_CreateTopicRule.go +++ b/service/iot/api_op_CreateTopicRule.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateTopicRule(ctx context.Context, params *CreateTopicRuleInp addawsRestjson1_serdeOpCreateTopicRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_CreateTopicRuleDestination.go b/service/iot/api_op_CreateTopicRuleDestination.go index 3921037014a..7d72292af40 100644 --- a/service/iot/api_op_CreateTopicRuleDestination.go +++ b/service/iot/api_op_CreateTopicRuleDestination.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateTopicRuleDestination(ctx context.Context, params *CreateT addawsRestjson1_serdeOpCreateTopicRuleDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteAccountAuditConfiguration.go b/service/iot/api_op_DeleteAccountAuditConfiguration.go index 70fea32e572..4e3ce768ca4 100644 --- a/service/iot/api_op_DeleteAccountAuditConfiguration.go +++ b/service/iot/api_op_DeleteAccountAuditConfiguration.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteAccountAuditConfiguration(ctx context.Context, params *De addawsRestjson1_serdeOpDeleteAccountAuditConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteAuthorizer.go b/service/iot/api_op_DeleteAuthorizer.go index 587abbdbcf8..5e638bcdb5a 100644 --- a/service/iot/api_op_DeleteAuthorizer.go +++ b/service/iot/api_op_DeleteAuthorizer.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteAuthorizer(ctx context.Context, params *DeleteAuthorizerI addawsRestjson1_serdeOpDeleteAuthorizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteBillingGroup.go b/service/iot/api_op_DeleteBillingGroup.go index 5d3929fafeb..b1c9eeaf9b4 100644 --- a/service/iot/api_op_DeleteBillingGroup.go +++ b/service/iot/api_op_DeleteBillingGroup.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteBillingGroup(ctx context.Context, params *DeleteBillingGr addawsRestjson1_serdeOpDeleteBillingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteCACertificate.go b/service/iot/api_op_DeleteCACertificate.go index 6b471a35060..45083c61a94 100644 --- a/service/iot/api_op_DeleteCACertificate.go +++ b/service/iot/api_op_DeleteCACertificate.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteCACertificate(ctx context.Context, params *DeleteCACertif addawsRestjson1_serdeOpDeleteCACertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteCertificate.go b/service/iot/api_op_DeleteCertificate.go index 82fb5f413a9..0b264d2e312 100644 --- a/service/iot/api_op_DeleteCertificate.go +++ b/service/iot/api_op_DeleteCertificate.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteCertificate(ctx context.Context, params *DeleteCertificat addawsRestjson1_serdeOpDeleteCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteDimension.go b/service/iot/api_op_DeleteDimension.go index 4d9de27e7e1..fcd1d5b53a2 100644 --- a/service/iot/api_op_DeleteDimension.go +++ b/service/iot/api_op_DeleteDimension.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDimension(ctx context.Context, params *DeleteDimensionInp addawsRestjson1_serdeOpDeleteDimensionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteDomainConfiguration.go b/service/iot/api_op_DeleteDomainConfiguration.go index 56169936186..227ff72975a 100644 --- a/service/iot/api_op_DeleteDomainConfiguration.go +++ b/service/iot/api_op_DeleteDomainConfiguration.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDomainConfiguration(ctx context.Context, params *DeleteDo addawsRestjson1_serdeOpDeleteDomainConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteDynamicThingGroup.go b/service/iot/api_op_DeleteDynamicThingGroup.go index bcb8e82acd5..015bec7c49b 100644 --- a/service/iot/api_op_DeleteDynamicThingGroup.go +++ b/service/iot/api_op_DeleteDynamicThingGroup.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDynamicThingGroup(ctx context.Context, params *DeleteDyna addawsRestjson1_serdeOpDeleteDynamicThingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteJob.go b/service/iot/api_op_DeleteJob.go index da5f2959fe3..23626281322 100644 --- a/service/iot/api_op_DeleteJob.go +++ b/service/iot/api_op_DeleteJob.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeleteJob(ctx context.Context, params *DeleteJobInput, optFns . addawsRestjson1_serdeOpDeleteJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteJobExecution.go b/service/iot/api_op_DeleteJobExecution.go index 63000b6b046..8868806e619 100644 --- a/service/iot/api_op_DeleteJobExecution.go +++ b/service/iot/api_op_DeleteJobExecution.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteJobExecution(ctx context.Context, params *DeleteJobExecut addawsRestjson1_serdeOpDeleteJobExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteMitigationAction.go b/service/iot/api_op_DeleteMitigationAction.go index ead847783b0..b80d4ed2fe4 100644 --- a/service/iot/api_op_DeleteMitigationAction.go +++ b/service/iot/api_op_DeleteMitigationAction.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteMitigationAction(ctx context.Context, params *DeleteMitig addawsRestjson1_serdeOpDeleteMitigationActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteOTAUpdate.go b/service/iot/api_op_DeleteOTAUpdate.go index e4479aab624..678f6c3be86 100644 --- a/service/iot/api_op_DeleteOTAUpdate.go +++ b/service/iot/api_op_DeleteOTAUpdate.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteOTAUpdate(ctx context.Context, params *DeleteOTAUpdateInp addawsRestjson1_serdeOpDeleteOTAUpdateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeletePolicy.go b/service/iot/api_op_DeletePolicy.go index d11a34dfdc9..928b99ff06e 100644 --- a/service/iot/api_op_DeletePolicy.go +++ b/service/iot/api_op_DeletePolicy.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeletePolicy(ctx context.Context, params *DeletePolicyInput, op addawsRestjson1_serdeOpDeletePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeletePolicyVersion.go b/service/iot/api_op_DeletePolicyVersion.go index 2dc3b24bfd0..940e61201e6 100644 --- a/service/iot/api_op_DeletePolicyVersion.go +++ b/service/iot/api_op_DeletePolicyVersion.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeletePolicyVersion(ctx context.Context, params *DeletePolicyVe addawsRestjson1_serdeOpDeletePolicyVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteProvisioningTemplate.go b/service/iot/api_op_DeleteProvisioningTemplate.go index e6242c2a011..4b4338fcc7b 100644 --- a/service/iot/api_op_DeleteProvisioningTemplate.go +++ b/service/iot/api_op_DeleteProvisioningTemplate.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteProvisioningTemplate(ctx context.Context, params *DeleteP addawsRestjson1_serdeOpDeleteProvisioningTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteProvisioningTemplateVersion.go b/service/iot/api_op_DeleteProvisioningTemplateVersion.go index f17ee416d2f..de8b4ffb288 100644 --- a/service/iot/api_op_DeleteProvisioningTemplateVersion.go +++ b/service/iot/api_op_DeleteProvisioningTemplateVersion.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteProvisioningTemplateVersion(ctx context.Context, params * addawsRestjson1_serdeOpDeleteProvisioningTemplateVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteRegistrationCode.go b/service/iot/api_op_DeleteRegistrationCode.go index 3e7ffd9dda9..bd5b9174aff 100644 --- a/service/iot/api_op_DeleteRegistrationCode.go +++ b/service/iot/api_op_DeleteRegistrationCode.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRegistrationCode(ctx context.Context, params *DeleteRegis addawsRestjson1_serdeOpDeleteRegistrationCodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteRoleAlias.go b/service/iot/api_op_DeleteRoleAlias.go index bb8dff51512..d9c76711ad4 100644 --- a/service/iot/api_op_DeleteRoleAlias.go +++ b/service/iot/api_op_DeleteRoleAlias.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRoleAlias(ctx context.Context, params *DeleteRoleAliasInp addawsRestjson1_serdeOpDeleteRoleAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteScheduledAudit.go b/service/iot/api_op_DeleteScheduledAudit.go index 35650dac7d4..05e2d0a85e7 100644 --- a/service/iot/api_op_DeleteScheduledAudit.go +++ b/service/iot/api_op_DeleteScheduledAudit.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteScheduledAudit(ctx context.Context, params *DeleteSchedul addawsRestjson1_serdeOpDeleteScheduledAuditMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteSecurityProfile.go b/service/iot/api_op_DeleteSecurityProfile.go index 4d0da018f43..c1eca764a29 100644 --- a/service/iot/api_op_DeleteSecurityProfile.go +++ b/service/iot/api_op_DeleteSecurityProfile.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSecurityProfile(ctx context.Context, params *DeleteSecuri addawsRestjson1_serdeOpDeleteSecurityProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteStream.go b/service/iot/api_op_DeleteStream.go index dbad83bea7e..9bb230568bd 100644 --- a/service/iot/api_op_DeleteStream.go +++ b/service/iot/api_op_DeleteStream.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteStream(ctx context.Context, params *DeleteStreamInput, op addawsRestjson1_serdeOpDeleteStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteThing.go b/service/iot/api_op_DeleteThing.go index 36c7947ccb5..0cda28d917d 100644 --- a/service/iot/api_op_DeleteThing.go +++ b/service/iot/api_op_DeleteThing.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteThing(ctx context.Context, params *DeleteThingInput, optF addawsRestjson1_serdeOpDeleteThingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteThingGroup.go b/service/iot/api_op_DeleteThingGroup.go index 27043b44aa5..c00a7d544a4 100644 --- a/service/iot/api_op_DeleteThingGroup.go +++ b/service/iot/api_op_DeleteThingGroup.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteThingGroup(ctx context.Context, params *DeleteThingGroupI addawsRestjson1_serdeOpDeleteThingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteThingType.go b/service/iot/api_op_DeleteThingType.go index 55ed245d59e..398607cb0d2 100644 --- a/service/iot/api_op_DeleteThingType.go +++ b/service/iot/api_op_DeleteThingType.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteThingType(ctx context.Context, params *DeleteThingTypeInp addawsRestjson1_serdeOpDeleteThingTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteTopicRule.go b/service/iot/api_op_DeleteTopicRule.go index e6027e88a10..9305a8a5da5 100644 --- a/service/iot/api_op_DeleteTopicRule.go +++ b/service/iot/api_op_DeleteTopicRule.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteTopicRule(ctx context.Context, params *DeleteTopicRuleInp addawsRestjson1_serdeOpDeleteTopicRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteTopicRuleDestination.go b/service/iot/api_op_DeleteTopicRuleDestination.go index 0501f66c5c4..da889892bc3 100644 --- a/service/iot/api_op_DeleteTopicRuleDestination.go +++ b/service/iot/api_op_DeleteTopicRuleDestination.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteTopicRuleDestination(ctx context.Context, params *DeleteT addawsRestjson1_serdeOpDeleteTopicRuleDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeleteV2LoggingLevel.go b/service/iot/api_op_DeleteV2LoggingLevel.go index 3eaa0710084..d7ab4519600 100644 --- a/service/iot/api_op_DeleteV2LoggingLevel.go +++ b/service/iot/api_op_DeleteV2LoggingLevel.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteV2LoggingLevel(ctx context.Context, params *DeleteV2Loggi addawsRestjson1_serdeOpDeleteV2LoggingLevelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DeprecateThingType.go b/service/iot/api_op_DeprecateThingType.go index 50b4598cb68..530d5f20358 100644 --- a/service/iot/api_op_DeprecateThingType.go +++ b/service/iot/api_op_DeprecateThingType.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeprecateThingType(ctx context.Context, params *DeprecateThingT addawsRestjson1_serdeOpDeprecateThingTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeAccountAuditConfiguration.go b/service/iot/api_op_DescribeAccountAuditConfiguration.go index b6f6cf9ee8b..9cf482aec09 100644 --- a/service/iot/api_op_DescribeAccountAuditConfiguration.go +++ b/service/iot/api_op_DescribeAccountAuditConfiguration.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeAccountAuditConfiguration(ctx context.Context, params * addawsRestjson1_serdeOpDescribeAccountAuditConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeAuditFinding.go b/service/iot/api_op_DescribeAuditFinding.go index 8747d933c8a..ef5f2fc8597 100644 --- a/service/iot/api_op_DescribeAuditFinding.go +++ b/service/iot/api_op_DescribeAuditFinding.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeAuditFinding(ctx context.Context, params *DescribeAudit addawsRestjson1_serdeOpDescribeAuditFindingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeAuditMitigationActionsTask.go b/service/iot/api_op_DescribeAuditMitigationActionsTask.go index 32c0540fb59..7e4524de580 100644 --- a/service/iot/api_op_DescribeAuditMitigationActionsTask.go +++ b/service/iot/api_op_DescribeAuditMitigationActionsTask.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeAuditMitigationActionsTask(ctx context.Context, params addawsRestjson1_serdeOpDescribeAuditMitigationActionsTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeAuditTask.go b/service/iot/api_op_DescribeAuditTask.go index c611dc9ef96..44fd9ac3f24 100644 --- a/service/iot/api_op_DescribeAuditTask.go +++ b/service/iot/api_op_DescribeAuditTask.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAuditTask(ctx context.Context, params *DescribeAuditTas addawsRestjson1_serdeOpDescribeAuditTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeAuthorizer.go b/service/iot/api_op_DescribeAuthorizer.go index 34a69065459..9e0fccb03bd 100644 --- a/service/iot/api_op_DescribeAuthorizer.go +++ b/service/iot/api_op_DescribeAuthorizer.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeAuthorizer(ctx context.Context, params *DescribeAuthori addawsRestjson1_serdeOpDescribeAuthorizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeBillingGroup.go b/service/iot/api_op_DescribeBillingGroup.go index 18f5ab1b6b0..1a17d9a5d57 100644 --- a/service/iot/api_op_DescribeBillingGroup.go +++ b/service/iot/api_op_DescribeBillingGroup.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeBillingGroup(ctx context.Context, params *DescribeBilli addawsRestjson1_serdeOpDescribeBillingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeCACertificate.go b/service/iot/api_op_DescribeCACertificate.go index 73048275b6a..2370a73fd19 100644 --- a/service/iot/api_op_DescribeCACertificate.go +++ b/service/iot/api_op_DescribeCACertificate.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeCACertificate(ctx context.Context, params *DescribeCACe addawsRestjson1_serdeOpDescribeCACertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeCertificate.go b/service/iot/api_op_DescribeCertificate.go index 7c903ff2ad6..f336db354aa 100644 --- a/service/iot/api_op_DescribeCertificate.go +++ b/service/iot/api_op_DescribeCertificate.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeCertificate(ctx context.Context, params *DescribeCertif addawsRestjson1_serdeOpDescribeCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeDefaultAuthorizer.go b/service/iot/api_op_DescribeDefaultAuthorizer.go index 1b5091a5942..146f18004aa 100644 --- a/service/iot/api_op_DescribeDefaultAuthorizer.go +++ b/service/iot/api_op_DescribeDefaultAuthorizer.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDefaultAuthorizer(ctx context.Context, params *Describe addawsRestjson1_serdeOpDescribeDefaultAuthorizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeDimension.go b/service/iot/api_op_DescribeDimension.go index b77b684d3f1..d6de468f61a 100644 --- a/service/iot/api_op_DescribeDimension.go +++ b/service/iot/api_op_DescribeDimension.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDimension(ctx context.Context, params *DescribeDimensio addawsRestjson1_serdeOpDescribeDimensionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeDomainConfiguration.go b/service/iot/api_op_DescribeDomainConfiguration.go index dfd6bc4345f..332061d9563 100644 --- a/service/iot/api_op_DescribeDomainConfiguration.go +++ b/service/iot/api_op_DescribeDomainConfiguration.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDomainConfiguration(ctx context.Context, params *Descri addawsRestjson1_serdeOpDescribeDomainConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeEndpoint.go b/service/iot/api_op_DescribeEndpoint.go index dca0c87e947..82d0ff30cbf 100644 --- a/service/iot/api_op_DescribeEndpoint.go +++ b/service/iot/api_op_DescribeEndpoint.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DescribeEndpoint(ctx context.Context, params *DescribeEndpointI addawsRestjson1_serdeOpDescribeEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeEventConfigurations.go b/service/iot/api_op_DescribeEventConfigurations.go index 8d286a0092b..556fd48a763 100644 --- a/service/iot/api_op_DescribeEventConfigurations.go +++ b/service/iot/api_op_DescribeEventConfigurations.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEventConfigurations(ctx context.Context, params *Descri addawsRestjson1_serdeOpDescribeEventConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeIndex.go b/service/iot/api_op_DescribeIndex.go index 899abc58b5c..a98619162db 100644 --- a/service/iot/api_op_DescribeIndex.go +++ b/service/iot/api_op_DescribeIndex.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeIndex(ctx context.Context, params *DescribeIndexInput, addawsRestjson1_serdeOpDescribeIndexMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeJob.go b/service/iot/api_op_DescribeJob.go index 4a5115760a6..bee13723ecb 100644 --- a/service/iot/api_op_DescribeJob.go +++ b/service/iot/api_op_DescribeJob.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeJob(ctx context.Context, params *DescribeJobInput, optF addawsRestjson1_serdeOpDescribeJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeJobExecution.go b/service/iot/api_op_DescribeJobExecution.go index 91d5940a5e3..bce90e20537 100644 --- a/service/iot/api_op_DescribeJobExecution.go +++ b/service/iot/api_op_DescribeJobExecution.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeJobExecution(ctx context.Context, params *DescribeJobEx addawsRestjson1_serdeOpDescribeJobExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeMitigationAction.go b/service/iot/api_op_DescribeMitigationAction.go index f75f7c1d22a..80300edc651 100644 --- a/service/iot/api_op_DescribeMitigationAction.go +++ b/service/iot/api_op_DescribeMitigationAction.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeMitigationAction(ctx context.Context, params *DescribeM addawsRestjson1_serdeOpDescribeMitigationActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeProvisioningTemplate.go b/service/iot/api_op_DescribeProvisioningTemplate.go index 36067767de9..8da694da591 100644 --- a/service/iot/api_op_DescribeProvisioningTemplate.go +++ b/service/iot/api_op_DescribeProvisioningTemplate.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeProvisioningTemplate(ctx context.Context, params *Descr addawsRestjson1_serdeOpDescribeProvisioningTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeProvisioningTemplateVersion.go b/service/iot/api_op_DescribeProvisioningTemplateVersion.go index c971a197e6e..ac2dbb6f771 100644 --- a/service/iot/api_op_DescribeProvisioningTemplateVersion.go +++ b/service/iot/api_op_DescribeProvisioningTemplateVersion.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DescribeProvisioningTemplateVersion(ctx context.Context, params addawsRestjson1_serdeOpDescribeProvisioningTemplateVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeRoleAlias.go b/service/iot/api_op_DescribeRoleAlias.go index 20cbcd5aa7a..887369a54c7 100644 --- a/service/iot/api_op_DescribeRoleAlias.go +++ b/service/iot/api_op_DescribeRoleAlias.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeRoleAlias(ctx context.Context, params *DescribeRoleAlia addawsRestjson1_serdeOpDescribeRoleAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeScheduledAudit.go b/service/iot/api_op_DescribeScheduledAudit.go index 04ebdbe0201..72d805617d5 100644 --- a/service/iot/api_op_DescribeScheduledAudit.go +++ b/service/iot/api_op_DescribeScheduledAudit.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeScheduledAudit(ctx context.Context, params *DescribeSch addawsRestjson1_serdeOpDescribeScheduledAuditMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeSecurityProfile.go b/service/iot/api_op_DescribeSecurityProfile.go index 5f5e3817cf1..ec96d760834 100644 --- a/service/iot/api_op_DescribeSecurityProfile.go +++ b/service/iot/api_op_DescribeSecurityProfile.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeSecurityProfile(ctx context.Context, params *DescribeSe addawsRestjson1_serdeOpDescribeSecurityProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeStream.go b/service/iot/api_op_DescribeStream.go index 2de991c5db1..bc758dd8cfd 100644 --- a/service/iot/api_op_DescribeStream.go +++ b/service/iot/api_op_DescribeStream.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeStream(ctx context.Context, params *DescribeStreamInput addawsRestjson1_serdeOpDescribeStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeThing.go b/service/iot/api_op_DescribeThing.go index 60f40b24b7a..19e3ec6e39d 100644 --- a/service/iot/api_op_DescribeThing.go +++ b/service/iot/api_op_DescribeThing.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DescribeThing(ctx context.Context, params *DescribeThingInput, addawsRestjson1_serdeOpDescribeThingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeThingGroup.go b/service/iot/api_op_DescribeThingGroup.go index 31b9162abcc..480b91b8d7a 100644 --- a/service/iot/api_op_DescribeThingGroup.go +++ b/service/iot/api_op_DescribeThingGroup.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeThingGroup(ctx context.Context, params *DescribeThingGr addawsRestjson1_serdeOpDescribeThingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeThingRegistrationTask.go b/service/iot/api_op_DescribeThingRegistrationTask.go index 0f08bc535df..4d4681e8601 100644 --- a/service/iot/api_op_DescribeThingRegistrationTask.go +++ b/service/iot/api_op_DescribeThingRegistrationTask.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeThingRegistrationTask(ctx context.Context, params *Desc addawsRestjson1_serdeOpDescribeThingRegistrationTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DescribeThingType.go b/service/iot/api_op_DescribeThingType.go index 4a3e7cebc40..b0859046c80 100644 --- a/service/iot/api_op_DescribeThingType.go +++ b/service/iot/api_op_DescribeThingType.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeThingType(ctx context.Context, params *DescribeThingTyp addawsRestjson1_serdeOpDescribeThingTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DetachPolicy.go b/service/iot/api_op_DetachPolicy.go index 0117891e1c9..599eca3c944 100644 --- a/service/iot/api_op_DetachPolicy.go +++ b/service/iot/api_op_DetachPolicy.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DetachPolicy(ctx context.Context, params *DetachPolicyInput, op addawsRestjson1_serdeOpDetachPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DetachPrincipalPolicy.go b/service/iot/api_op_DetachPrincipalPolicy.go index 6d5efd6e12e..b57a377e5c6 100644 --- a/service/iot/api_op_DetachPrincipalPolicy.go +++ b/service/iot/api_op_DetachPrincipalPolicy.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DetachPrincipalPolicy(ctx context.Context, params *DetachPrinci addawsRestjson1_serdeOpDetachPrincipalPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DetachSecurityProfile.go b/service/iot/api_op_DetachSecurityProfile.go index 57147209b93..766f42cea9c 100644 --- a/service/iot/api_op_DetachSecurityProfile.go +++ b/service/iot/api_op_DetachSecurityProfile.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DetachSecurityProfile(ctx context.Context, params *DetachSecuri addawsRestjson1_serdeOpDetachSecurityProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DetachThingPrincipal.go b/service/iot/api_op_DetachThingPrincipal.go index 44c511a7a80..4889ce7a991 100644 --- a/service/iot/api_op_DetachThingPrincipal.go +++ b/service/iot/api_op_DetachThingPrincipal.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DetachThingPrincipal(ctx context.Context, params *DetachThingPr addawsRestjson1_serdeOpDetachThingPrincipalMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_DisableTopicRule.go b/service/iot/api_op_DisableTopicRule.go index e23e36776ef..eaa5980e512 100644 --- a/service/iot/api_op_DisableTopicRule.go +++ b/service/iot/api_op_DisableTopicRule.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisableTopicRule(ctx context.Context, params *DisableTopicRuleI addawsRestjson1_serdeOpDisableTopicRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_EnableTopicRule.go b/service/iot/api_op_EnableTopicRule.go index 62f79e9eca9..8887bf06c29 100644 --- a/service/iot/api_op_EnableTopicRule.go +++ b/service/iot/api_op_EnableTopicRule.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) EnableTopicRule(ctx context.Context, params *EnableTopicRuleInp addawsRestjson1_serdeOpEnableTopicRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_GetCardinality.go b/service/iot/api_op_GetCardinality.go index 1754ea4629c..2d41ed0ee69 100644 --- a/service/iot/api_op_GetCardinality.go +++ b/service/iot/api_op_GetCardinality.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetCardinality(ctx context.Context, params *GetCardinalityInput addawsRestjson1_serdeOpGetCardinalityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_GetEffectivePolicies.go b/service/iot/api_op_GetEffectivePolicies.go index ee0bd97eb98..12b94a0ab43 100644 --- a/service/iot/api_op_GetEffectivePolicies.go +++ b/service/iot/api_op_GetEffectivePolicies.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetEffectivePolicies(ctx context.Context, params *GetEffectiveP addawsRestjson1_serdeOpGetEffectivePoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_GetIndexingConfiguration.go b/service/iot/api_op_GetIndexingConfiguration.go index 3a11e93dcc9..b4d03fce068 100644 --- a/service/iot/api_op_GetIndexingConfiguration.go +++ b/service/iot/api_op_GetIndexingConfiguration.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetIndexingConfiguration(ctx context.Context, params *GetIndexi addawsRestjson1_serdeOpGetIndexingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_GetJobDocument.go b/service/iot/api_op_GetJobDocument.go index 1a04b6a6e5f..833b9ae211e 100644 --- a/service/iot/api_op_GetJobDocument.go +++ b/service/iot/api_op_GetJobDocument.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetJobDocument(ctx context.Context, params *GetJobDocumentInput addawsRestjson1_serdeOpGetJobDocumentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_GetLoggingOptions.go b/service/iot/api_op_GetLoggingOptions.go index b1796042b65..3732cc6a3f3 100644 --- a/service/iot/api_op_GetLoggingOptions.go +++ b/service/iot/api_op_GetLoggingOptions.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetLoggingOptions(ctx context.Context, params *GetLoggingOption addawsRestjson1_serdeOpGetLoggingOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_GetOTAUpdate.go b/service/iot/api_op_GetOTAUpdate.go index 2dc3b345b6a..75e37bf374b 100644 --- a/service/iot/api_op_GetOTAUpdate.go +++ b/service/iot/api_op_GetOTAUpdate.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetOTAUpdate(ctx context.Context, params *GetOTAUpdateInput, op addawsRestjson1_serdeOpGetOTAUpdateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_GetPercentiles.go b/service/iot/api_op_GetPercentiles.go index 3bc9487bb03..11708c4426c 100644 --- a/service/iot/api_op_GetPercentiles.go +++ b/service/iot/api_op_GetPercentiles.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) GetPercentiles(ctx context.Context, params *GetPercentilesInput addawsRestjson1_serdeOpGetPercentilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_GetPolicy.go b/service/iot/api_op_GetPolicy.go index 4617f0546bf..4a077e98d1f 100644 --- a/service/iot/api_op_GetPolicy.go +++ b/service/iot/api_op_GetPolicy.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) GetPolicy(ctx context.Context, params *GetPolicyInput, optFns . addawsRestjson1_serdeOpGetPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_GetPolicyVersion.go b/service/iot/api_op_GetPolicyVersion.go index 7154b296e3c..4f346f1b300 100644 --- a/service/iot/api_op_GetPolicyVersion.go +++ b/service/iot/api_op_GetPolicyVersion.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetPolicyVersion(ctx context.Context, params *GetPolicyVersionI addawsRestjson1_serdeOpGetPolicyVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_GetRegistrationCode.go b/service/iot/api_op_GetRegistrationCode.go index 0d14a7e99be..1a910a70772 100644 --- a/service/iot/api_op_GetRegistrationCode.go +++ b/service/iot/api_op_GetRegistrationCode.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetRegistrationCode(ctx context.Context, params *GetRegistratio addawsRestjson1_serdeOpGetRegistrationCodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_GetStatistics.go b/service/iot/api_op_GetStatistics.go index 170543916d8..ce3cb647a6e 100644 --- a/service/iot/api_op_GetStatistics.go +++ b/service/iot/api_op_GetStatistics.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetStatistics(ctx context.Context, params *GetStatisticsInput, addawsRestjson1_serdeOpGetStatisticsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_GetTopicRule.go b/service/iot/api_op_GetTopicRule.go index 4da9f4e2bb9..2876916a038 100644 --- a/service/iot/api_op_GetTopicRule.go +++ b/service/iot/api_op_GetTopicRule.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetTopicRule(ctx context.Context, params *GetTopicRuleInput, op addawsRestjson1_serdeOpGetTopicRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_GetTopicRuleDestination.go b/service/iot/api_op_GetTopicRuleDestination.go index 129a637169f..4baf0c0b765 100644 --- a/service/iot/api_op_GetTopicRuleDestination.go +++ b/service/iot/api_op_GetTopicRuleDestination.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetTopicRuleDestination(ctx context.Context, params *GetTopicRu addawsRestjson1_serdeOpGetTopicRuleDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_GetV2LoggingOptions.go b/service/iot/api_op_GetV2LoggingOptions.go index bf69f08d8eb..c94a3a64a95 100644 --- a/service/iot/api_op_GetV2LoggingOptions.go +++ b/service/iot/api_op_GetV2LoggingOptions.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetV2LoggingOptions(ctx context.Context, params *GetV2LoggingOp addawsRestjson1_serdeOpGetV2LoggingOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListActiveViolations.go b/service/iot/api_op_ListActiveViolations.go index f7ae07d14a9..b85d70f4b3f 100644 --- a/service/iot/api_op_ListActiveViolations.go +++ b/service/iot/api_op_ListActiveViolations.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListActiveViolations(ctx context.Context, params *ListActiveVio addawsRestjson1_serdeOpListActiveViolationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListAttachedPolicies.go b/service/iot/api_op_ListAttachedPolicies.go index e16be0e98ec..c4737b3c7d2 100644 --- a/service/iot/api_op_ListAttachedPolicies.go +++ b/service/iot/api_op_ListAttachedPolicies.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListAttachedPolicies(ctx context.Context, params *ListAttachedP addawsRestjson1_serdeOpListAttachedPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListAuditFindings.go b/service/iot/api_op_ListAuditFindings.go index 5582ab605cf..66b73f33df9 100644 --- a/service/iot/api_op_ListAuditFindings.go +++ b/service/iot/api_op_ListAuditFindings.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListAuditFindings(ctx context.Context, params *ListAuditFinding addawsRestjson1_serdeOpListAuditFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListAuditMitigationActionsExecutions.go b/service/iot/api_op_ListAuditMitigationActionsExecutions.go index b0669743345..d787e1ca48f 100644 --- a/service/iot/api_op_ListAuditMitigationActionsExecutions.go +++ b/service/iot/api_op_ListAuditMitigationActionsExecutions.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListAuditMitigationActionsExecutions(ctx context.Context, param addawsRestjson1_serdeOpListAuditMitigationActionsExecutionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListAuditMitigationActionsTasks.go b/service/iot/api_op_ListAuditMitigationActionsTasks.go index e1a7558f677..3df3028228c 100644 --- a/service/iot/api_op_ListAuditMitigationActionsTasks.go +++ b/service/iot/api_op_ListAuditMitigationActionsTasks.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListAuditMitigationActionsTasks(ctx context.Context, params *Li addawsRestjson1_serdeOpListAuditMitigationActionsTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListAuditTasks.go b/service/iot/api_op_ListAuditTasks.go index 68b3d1dcba4..a35ae72c97a 100644 --- a/service/iot/api_op_ListAuditTasks.go +++ b/service/iot/api_op_ListAuditTasks.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListAuditTasks(ctx context.Context, params *ListAuditTasksInput addawsRestjson1_serdeOpListAuditTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListAuthorizers.go b/service/iot/api_op_ListAuthorizers.go index 1c87d2d2a30..44fb9ee4f44 100644 --- a/service/iot/api_op_ListAuthorizers.go +++ b/service/iot/api_op_ListAuthorizers.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListAuthorizers(ctx context.Context, params *ListAuthorizersInp addawsRestjson1_serdeOpListAuthorizersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListBillingGroups.go b/service/iot/api_op_ListBillingGroups.go index ab0c5248237..ed7ea7d1aee 100644 --- a/service/iot/api_op_ListBillingGroups.go +++ b/service/iot/api_op_ListBillingGroups.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListBillingGroups(ctx context.Context, params *ListBillingGroup addawsRestjson1_serdeOpListBillingGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListCACertificates.go b/service/iot/api_op_ListCACertificates.go index e4ede892308..99cbe075514 100644 --- a/service/iot/api_op_ListCACertificates.go +++ b/service/iot/api_op_ListCACertificates.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListCACertificates(ctx context.Context, params *ListCACertifica addawsRestjson1_serdeOpListCACertificatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListCertificates.go b/service/iot/api_op_ListCertificates.go index 50068d37214..f0983a248da 100644 --- a/service/iot/api_op_ListCertificates.go +++ b/service/iot/api_op_ListCertificates.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListCertificates(ctx context.Context, params *ListCertificatesI addawsRestjson1_serdeOpListCertificatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListCertificatesByCA.go b/service/iot/api_op_ListCertificatesByCA.go index 8075fd684e1..d679491a760 100644 --- a/service/iot/api_op_ListCertificatesByCA.go +++ b/service/iot/api_op_ListCertificatesByCA.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListCertificatesByCA(ctx context.Context, params *ListCertifica addawsRestjson1_serdeOpListCertificatesByCAMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListDimensions.go b/service/iot/api_op_ListDimensions.go index db1896503e1..c018c83fbaa 100644 --- a/service/iot/api_op_ListDimensions.go +++ b/service/iot/api_op_ListDimensions.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListDimensions(ctx context.Context, params *ListDimensionsInput addawsRestjson1_serdeOpListDimensionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListDomainConfigurations.go b/service/iot/api_op_ListDomainConfigurations.go index d73d4fb849e..3e3da48dc92 100644 --- a/service/iot/api_op_ListDomainConfigurations.go +++ b/service/iot/api_op_ListDomainConfigurations.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListDomainConfigurations(ctx context.Context, params *ListDomai addawsRestjson1_serdeOpListDomainConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListIndices.go b/service/iot/api_op_ListIndices.go index 9ad603c4124..79121d17bfe 100644 --- a/service/iot/api_op_ListIndices.go +++ b/service/iot/api_op_ListIndices.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListIndices(ctx context.Context, params *ListIndicesInput, optF addawsRestjson1_serdeOpListIndicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListJobExecutionsForJob.go b/service/iot/api_op_ListJobExecutionsForJob.go index 57b814ca513..5a09b9ffb10 100644 --- a/service/iot/api_op_ListJobExecutionsForJob.go +++ b/service/iot/api_op_ListJobExecutionsForJob.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListJobExecutionsForJob(ctx context.Context, params *ListJobExe addawsRestjson1_serdeOpListJobExecutionsForJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListJobExecutionsForThing.go b/service/iot/api_op_ListJobExecutionsForThing.go index c67284f4be3..1ee51994e2c 100644 --- a/service/iot/api_op_ListJobExecutionsForThing.go +++ b/service/iot/api_op_ListJobExecutionsForThing.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListJobExecutionsForThing(ctx context.Context, params *ListJobE addawsRestjson1_serdeOpListJobExecutionsForThingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListJobs.go b/service/iot/api_op_ListJobs.go index 7e56ddf66de..b8efb42bd38 100644 --- a/service/iot/api_op_ListJobs.go +++ b/service/iot/api_op_ListJobs.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListJobs(ctx context.Context, params *ListJobsInput, optFns ... addawsRestjson1_serdeOpListJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListMitigationActions.go b/service/iot/api_op_ListMitigationActions.go index d9477955ef4..c3af21f134f 100644 --- a/service/iot/api_op_ListMitigationActions.go +++ b/service/iot/api_op_ListMitigationActions.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListMitigationActions(ctx context.Context, params *ListMitigati addawsRestjson1_serdeOpListMitigationActionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListOTAUpdates.go b/service/iot/api_op_ListOTAUpdates.go index db6b5fe882b..df048a9d866 100644 --- a/service/iot/api_op_ListOTAUpdates.go +++ b/service/iot/api_op_ListOTAUpdates.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListOTAUpdates(ctx context.Context, params *ListOTAUpdatesInput addawsRestjson1_serdeOpListOTAUpdatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListOutgoingCertificates.go b/service/iot/api_op_ListOutgoingCertificates.go index e84cd3e71e2..a007b60edcf 100644 --- a/service/iot/api_op_ListOutgoingCertificates.go +++ b/service/iot/api_op_ListOutgoingCertificates.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListOutgoingCertificates(ctx context.Context, params *ListOutgo addawsRestjson1_serdeOpListOutgoingCertificatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListPolicies.go b/service/iot/api_op_ListPolicies.go index b9dfb120bba..cc87838d9ed 100644 --- a/service/iot/api_op_ListPolicies.go +++ b/service/iot/api_op_ListPolicies.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListPolicies(ctx context.Context, params *ListPoliciesInput, op addawsRestjson1_serdeOpListPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListPolicyPrincipals.go b/service/iot/api_op_ListPolicyPrincipals.go index 25deb73d58e..3ec0cbeaaea 100644 --- a/service/iot/api_op_ListPolicyPrincipals.go +++ b/service/iot/api_op_ListPolicyPrincipals.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ListPolicyPrincipals(ctx context.Context, params *ListPolicyPri addawsRestjson1_serdeOpListPolicyPrincipalsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListPolicyVersions.go b/service/iot/api_op_ListPolicyVersions.go index 2df92caf26e..a0fcc865bcc 100644 --- a/service/iot/api_op_ListPolicyVersions.go +++ b/service/iot/api_op_ListPolicyVersions.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListPolicyVersions(ctx context.Context, params *ListPolicyVersi addawsRestjson1_serdeOpListPolicyVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListPrincipalPolicies.go b/service/iot/api_op_ListPrincipalPolicies.go index 0f16b28358c..da6feb30a73 100644 --- a/service/iot/api_op_ListPrincipalPolicies.go +++ b/service/iot/api_op_ListPrincipalPolicies.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListPrincipalPolicies(ctx context.Context, params *ListPrincipa addawsRestjson1_serdeOpListPrincipalPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListPrincipalThings.go b/service/iot/api_op_ListPrincipalThings.go index 020de40c5d1..7add219ddca 100644 --- a/service/iot/api_op_ListPrincipalThings.go +++ b/service/iot/api_op_ListPrincipalThings.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ListPrincipalThings(ctx context.Context, params *ListPrincipalT addawsRestjson1_serdeOpListPrincipalThingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListProvisioningTemplateVersions.go b/service/iot/api_op_ListProvisioningTemplateVersions.go index 361a7f2245f..7ed2d6bca75 100644 --- a/service/iot/api_op_ListProvisioningTemplateVersions.go +++ b/service/iot/api_op_ListProvisioningTemplateVersions.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListProvisioningTemplateVersions(ctx context.Context, params *L addawsRestjson1_serdeOpListProvisioningTemplateVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListProvisioningTemplates.go b/service/iot/api_op_ListProvisioningTemplates.go index a7ddbe3ef55..ba422a8cf32 100644 --- a/service/iot/api_op_ListProvisioningTemplates.go +++ b/service/iot/api_op_ListProvisioningTemplates.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListProvisioningTemplates(ctx context.Context, params *ListProv addawsRestjson1_serdeOpListProvisioningTemplatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListRoleAliases.go b/service/iot/api_op_ListRoleAliases.go index 155e5329a26..526a69aa842 100644 --- a/service/iot/api_op_ListRoleAliases.go +++ b/service/iot/api_op_ListRoleAliases.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListRoleAliases(ctx context.Context, params *ListRoleAliasesInp addawsRestjson1_serdeOpListRoleAliasesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListScheduledAudits.go b/service/iot/api_op_ListScheduledAudits.go index 245359cbf3c..5de2a90b17e 100644 --- a/service/iot/api_op_ListScheduledAudits.go +++ b/service/iot/api_op_ListScheduledAudits.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListScheduledAudits(ctx context.Context, params *ListScheduledA addawsRestjson1_serdeOpListScheduledAuditsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListSecurityProfiles.go b/service/iot/api_op_ListSecurityProfiles.go index 736807264be..4d92658e7b2 100644 --- a/service/iot/api_op_ListSecurityProfiles.go +++ b/service/iot/api_op_ListSecurityProfiles.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListSecurityProfiles(ctx context.Context, params *ListSecurityP addawsRestjson1_serdeOpListSecurityProfilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListSecurityProfilesForTarget.go b/service/iot/api_op_ListSecurityProfilesForTarget.go index b3a5f76542d..3b98758ff11 100644 --- a/service/iot/api_op_ListSecurityProfilesForTarget.go +++ b/service/iot/api_op_ListSecurityProfilesForTarget.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListSecurityProfilesForTarget(ctx context.Context, params *List addawsRestjson1_serdeOpListSecurityProfilesForTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListStreams.go b/service/iot/api_op_ListStreams.go index 9292fdbbabc..e5ebf66e5d8 100644 --- a/service/iot/api_op_ListStreams.go +++ b/service/iot/api_op_ListStreams.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListStreams(ctx context.Context, params *ListStreamsInput, optF addawsRestjson1_serdeOpListStreamsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListTagsForResource.go b/service/iot/api_op_ListTagsForResource.go index 01ed557c641..a00ab37d4f7 100644 --- a/service/iot/api_op_ListTagsForResource.go +++ b/service/iot/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListTargetsForPolicy.go b/service/iot/api_op_ListTargetsForPolicy.go index 492f370ce2f..4e6f94a49a7 100644 --- a/service/iot/api_op_ListTargetsForPolicy.go +++ b/service/iot/api_op_ListTargetsForPolicy.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTargetsForPolicy(ctx context.Context, params *ListTargetsFo addawsRestjson1_serdeOpListTargetsForPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListTargetsForSecurityProfile.go b/service/iot/api_op_ListTargetsForSecurityProfile.go index 673a369f0f6..ee14e2e798e 100644 --- a/service/iot/api_op_ListTargetsForSecurityProfile.go +++ b/service/iot/api_op_ListTargetsForSecurityProfile.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTargetsForSecurityProfile(ctx context.Context, params *List addawsRestjson1_serdeOpListTargetsForSecurityProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListThingGroups.go b/service/iot/api_op_ListThingGroups.go index a1b9fd727d6..64d95e21d70 100644 --- a/service/iot/api_op_ListThingGroups.go +++ b/service/iot/api_op_ListThingGroups.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListThingGroups(ctx context.Context, params *ListThingGroupsInp addawsRestjson1_serdeOpListThingGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListThingGroupsForThing.go b/service/iot/api_op_ListThingGroupsForThing.go index 47d24584574..a33c8910e5a 100644 --- a/service/iot/api_op_ListThingGroupsForThing.go +++ b/service/iot/api_op_ListThingGroupsForThing.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListThingGroupsForThing(ctx context.Context, params *ListThingG addawsRestjson1_serdeOpListThingGroupsForThingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListThingPrincipals.go b/service/iot/api_op_ListThingPrincipals.go index 12b679d4c5f..e342c721048 100644 --- a/service/iot/api_op_ListThingPrincipals.go +++ b/service/iot/api_op_ListThingPrincipals.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ListThingPrincipals(ctx context.Context, params *ListThingPrinc addawsRestjson1_serdeOpListThingPrincipalsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListThingRegistrationTaskReports.go b/service/iot/api_op_ListThingRegistrationTaskReports.go index 006061866af..a4d94779709 100644 --- a/service/iot/api_op_ListThingRegistrationTaskReports.go +++ b/service/iot/api_op_ListThingRegistrationTaskReports.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListThingRegistrationTaskReports(ctx context.Context, params *L addawsRestjson1_serdeOpListThingRegistrationTaskReportsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListThingRegistrationTasks.go b/service/iot/api_op_ListThingRegistrationTasks.go index 623edc76a69..8519303dbf7 100644 --- a/service/iot/api_op_ListThingRegistrationTasks.go +++ b/service/iot/api_op_ListThingRegistrationTasks.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListThingRegistrationTasks(ctx context.Context, params *ListThi addawsRestjson1_serdeOpListThingRegistrationTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListThingTypes.go b/service/iot/api_op_ListThingTypes.go index 7dddc3b4290..03675d13656 100644 --- a/service/iot/api_op_ListThingTypes.go +++ b/service/iot/api_op_ListThingTypes.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListThingTypes(ctx context.Context, params *ListThingTypesInput addawsRestjson1_serdeOpListThingTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListThings.go b/service/iot/api_op_ListThings.go index 978daf09077..712bd2f3723 100644 --- a/service/iot/api_op_ListThings.go +++ b/service/iot/api_op_ListThings.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListThings(ctx context.Context, params *ListThingsInput, optFns addawsRestjson1_serdeOpListThingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListThingsInBillingGroup.go b/service/iot/api_op_ListThingsInBillingGroup.go index 0ba6bbe7c5f..54f71a7e6f1 100644 --- a/service/iot/api_op_ListThingsInBillingGroup.go +++ b/service/iot/api_op_ListThingsInBillingGroup.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListThingsInBillingGroup(ctx context.Context, params *ListThing addawsRestjson1_serdeOpListThingsInBillingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListThingsInThingGroup.go b/service/iot/api_op_ListThingsInThingGroup.go index 54fb59f3a17..5e435825639 100644 --- a/service/iot/api_op_ListThingsInThingGroup.go +++ b/service/iot/api_op_ListThingsInThingGroup.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListThingsInThingGroup(ctx context.Context, params *ListThingsI addawsRestjson1_serdeOpListThingsInThingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListTopicRuleDestinations.go b/service/iot/api_op_ListTopicRuleDestinations.go index 3cce89215a4..94e9874b93b 100644 --- a/service/iot/api_op_ListTopicRuleDestinations.go +++ b/service/iot/api_op_ListTopicRuleDestinations.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTopicRuleDestinations(ctx context.Context, params *ListTopi addawsRestjson1_serdeOpListTopicRuleDestinationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListTopicRules.go b/service/iot/api_op_ListTopicRules.go index 01ca1b5e73d..bda3da2683f 100644 --- a/service/iot/api_op_ListTopicRules.go +++ b/service/iot/api_op_ListTopicRules.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTopicRules(ctx context.Context, params *ListTopicRulesInput addawsRestjson1_serdeOpListTopicRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListV2LoggingLevels.go b/service/iot/api_op_ListV2LoggingLevels.go index 8cf0dfea970..132d2f5016d 100644 --- a/service/iot/api_op_ListV2LoggingLevels.go +++ b/service/iot/api_op_ListV2LoggingLevels.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListV2LoggingLevels(ctx context.Context, params *ListV2LoggingL addawsRestjson1_serdeOpListV2LoggingLevelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ListViolationEvents.go b/service/iot/api_op_ListViolationEvents.go index 6de26d6626f..ce55e267873 100644 --- a/service/iot/api_op_ListViolationEvents.go +++ b/service/iot/api_op_ListViolationEvents.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListViolationEvents(ctx context.Context, params *ListViolationE addawsRestjson1_serdeOpListViolationEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_RegisterCACertificate.go b/service/iot/api_op_RegisterCACertificate.go index 0aefc99d610..26a0847f01e 100644 --- a/service/iot/api_op_RegisterCACertificate.go +++ b/service/iot/api_op_RegisterCACertificate.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) RegisterCACertificate(ctx context.Context, params *RegisterCACe addawsRestjson1_serdeOpRegisterCACertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_RegisterCertificate.go b/service/iot/api_op_RegisterCertificate.go index 0f2faab01fc..2bbc7029edc 100644 --- a/service/iot/api_op_RegisterCertificate.go +++ b/service/iot/api_op_RegisterCertificate.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) RegisterCertificate(ctx context.Context, params *RegisterCertif addawsRestjson1_serdeOpRegisterCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_RegisterCertificateWithoutCA.go b/service/iot/api_op_RegisterCertificateWithoutCA.go index c6c8a9e733b..e4e79338beb 100644 --- a/service/iot/api_op_RegisterCertificateWithoutCA.go +++ b/service/iot/api_op_RegisterCertificateWithoutCA.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RegisterCertificateWithoutCA(ctx context.Context, params *Regis addawsRestjson1_serdeOpRegisterCertificateWithoutCAMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_RegisterThing.go b/service/iot/api_op_RegisterThing.go index 662668adf42..abadce123b5 100644 --- a/service/iot/api_op_RegisterThing.go +++ b/service/iot/api_op_RegisterThing.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) RegisterThing(ctx context.Context, params *RegisterThingInput, addawsRestjson1_serdeOpRegisterThingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_RejectCertificateTransfer.go b/service/iot/api_op_RejectCertificateTransfer.go index 1813e5c73b1..a38b1f3c615 100644 --- a/service/iot/api_op_RejectCertificateTransfer.go +++ b/service/iot/api_op_RejectCertificateTransfer.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) RejectCertificateTransfer(ctx context.Context, params *RejectCe addawsRestjson1_serdeOpRejectCertificateTransferMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_RemoveThingFromBillingGroup.go b/service/iot/api_op_RemoveThingFromBillingGroup.go index 3b193c2985a..82cb33868c9 100644 --- a/service/iot/api_op_RemoveThingFromBillingGroup.go +++ b/service/iot/api_op_RemoveThingFromBillingGroup.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RemoveThingFromBillingGroup(ctx context.Context, params *Remove addawsRestjson1_serdeOpRemoveThingFromBillingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_RemoveThingFromThingGroup.go b/service/iot/api_op_RemoveThingFromThingGroup.go index c505c08208c..9019bbb88db 100644 --- a/service/iot/api_op_RemoveThingFromThingGroup.go +++ b/service/iot/api_op_RemoveThingFromThingGroup.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) RemoveThingFromThingGroup(ctx context.Context, params *RemoveTh addawsRestjson1_serdeOpRemoveThingFromThingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ReplaceTopicRule.go b/service/iot/api_op_ReplaceTopicRule.go index 501366fba73..6cb3a787f12 100644 --- a/service/iot/api_op_ReplaceTopicRule.go +++ b/service/iot/api_op_ReplaceTopicRule.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ReplaceTopicRule(ctx context.Context, params *ReplaceTopicRuleI addawsRestjson1_serdeOpReplaceTopicRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_SearchIndex.go b/service/iot/api_op_SearchIndex.go index cd53d3df850..b6cc8c7c418 100644 --- a/service/iot/api_op_SearchIndex.go +++ b/service/iot/api_op_SearchIndex.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SearchIndex(ctx context.Context, params *SearchIndexInput, optF addawsRestjson1_serdeOpSearchIndexMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_SetDefaultAuthorizer.go b/service/iot/api_op_SetDefaultAuthorizer.go index 95f7697dc34..9e9460b00d3 100644 --- a/service/iot/api_op_SetDefaultAuthorizer.go +++ b/service/iot/api_op_SetDefaultAuthorizer.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) SetDefaultAuthorizer(ctx context.Context, params *SetDefaultAut addawsRestjson1_serdeOpSetDefaultAuthorizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_SetDefaultPolicyVersion.go b/service/iot/api_op_SetDefaultPolicyVersion.go index 7cfe6d0dcf9..8f43e4d99b3 100644 --- a/service/iot/api_op_SetDefaultPolicyVersion.go +++ b/service/iot/api_op_SetDefaultPolicyVersion.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) SetDefaultPolicyVersion(ctx context.Context, params *SetDefault addawsRestjson1_serdeOpSetDefaultPolicyVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_SetLoggingOptions.go b/service/iot/api_op_SetLoggingOptions.go index 3f6434e4b2b..dbb1fe25f11 100644 --- a/service/iot/api_op_SetLoggingOptions.go +++ b/service/iot/api_op_SetLoggingOptions.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) SetLoggingOptions(ctx context.Context, params *SetLoggingOption addawsRestjson1_serdeOpSetLoggingOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_SetV2LoggingLevel.go b/service/iot/api_op_SetV2LoggingLevel.go index 2525aecf7ab..595a3f31b73 100644 --- a/service/iot/api_op_SetV2LoggingLevel.go +++ b/service/iot/api_op_SetV2LoggingLevel.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SetV2LoggingLevel(ctx context.Context, params *SetV2LoggingLeve addawsRestjson1_serdeOpSetV2LoggingLevelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_SetV2LoggingOptions.go b/service/iot/api_op_SetV2LoggingOptions.go index 1b57d35b1c0..067ba7e3e48 100644 --- a/service/iot/api_op_SetV2LoggingOptions.go +++ b/service/iot/api_op_SetV2LoggingOptions.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SetV2LoggingOptions(ctx context.Context, params *SetV2LoggingOp addawsRestjson1_serdeOpSetV2LoggingOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_StartAuditMitigationActionsTask.go b/service/iot/api_op_StartAuditMitigationActionsTask.go index 201aef94d96..c33a4695848 100644 --- a/service/iot/api_op_StartAuditMitigationActionsTask.go +++ b/service/iot/api_op_StartAuditMitigationActionsTask.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) StartAuditMitigationActionsTask(ctx context.Context, params *St addawsRestjson1_serdeOpStartAuditMitigationActionsTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_StartOnDemandAuditTask.go b/service/iot/api_op_StartOnDemandAuditTask.go index ef87e382af3..49989447107 100644 --- a/service/iot/api_op_StartOnDemandAuditTask.go +++ b/service/iot/api_op_StartOnDemandAuditTask.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StartOnDemandAuditTask(ctx context.Context, params *StartOnDema addawsRestjson1_serdeOpStartOnDemandAuditTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_StartThingRegistrationTask.go b/service/iot/api_op_StartThingRegistrationTask.go index a6c96186bcc..790b6ca3fd8 100644 --- a/service/iot/api_op_StartThingRegistrationTask.go +++ b/service/iot/api_op_StartThingRegistrationTask.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StartThingRegistrationTask(ctx context.Context, params *StartTh addawsRestjson1_serdeOpStartThingRegistrationTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_StopThingRegistrationTask.go b/service/iot/api_op_StopThingRegistrationTask.go index ce64a062977..f8ad611a866 100644 --- a/service/iot/api_op_StopThingRegistrationTask.go +++ b/service/iot/api_op_StopThingRegistrationTask.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StopThingRegistrationTask(ctx context.Context, params *StopThin addawsRestjson1_serdeOpStopThingRegistrationTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_TagResource.go b/service/iot/api_op_TagResource.go index ec1ee42a1ed..30060c869dc 100644 --- a/service/iot/api_op_TagResource.go +++ b/service/iot/api_op_TagResource.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_TestAuthorization.go b/service/iot/api_op_TestAuthorization.go index ff532172dde..f830dc188f8 100644 --- a/service/iot/api_op_TestAuthorization.go +++ b/service/iot/api_op_TestAuthorization.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) TestAuthorization(ctx context.Context, params *TestAuthorizatio addawsRestjson1_serdeOpTestAuthorizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_TestInvokeAuthorizer.go b/service/iot/api_op_TestInvokeAuthorizer.go index 5194a16b6ce..8f512520c62 100644 --- a/service/iot/api_op_TestInvokeAuthorizer.go +++ b/service/iot/api_op_TestInvokeAuthorizer.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) TestInvokeAuthorizer(ctx context.Context, params *TestInvokeAut addawsRestjson1_serdeOpTestInvokeAuthorizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_TransferCertificate.go b/service/iot/api_op_TransferCertificate.go index 04445ce5cb2..92486467991 100644 --- a/service/iot/api_op_TransferCertificate.go +++ b/service/iot/api_op_TransferCertificate.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) TransferCertificate(ctx context.Context, params *TransferCertif addawsRestjson1_serdeOpTransferCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UntagResource.go b/service/iot/api_op_UntagResource.go index 86cb4530ee2..bf5712c88bf 100644 --- a/service/iot/api_op_UntagResource.go +++ b/service/iot/api_op_UntagResource.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateAccountAuditConfiguration.go b/service/iot/api_op_UpdateAccountAuditConfiguration.go index 7240973a1ea..c40042b4006 100644 --- a/service/iot/api_op_UpdateAccountAuditConfiguration.go +++ b/service/iot/api_op_UpdateAccountAuditConfiguration.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateAccountAuditConfiguration(ctx context.Context, params *Up addawsRestjson1_serdeOpUpdateAccountAuditConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateAuthorizer.go b/service/iot/api_op_UpdateAuthorizer.go index d019046047e..da30cc564d4 100644 --- a/service/iot/api_op_UpdateAuthorizer.go +++ b/service/iot/api_op_UpdateAuthorizer.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateAuthorizer(ctx context.Context, params *UpdateAuthorizerI addawsRestjson1_serdeOpUpdateAuthorizerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateBillingGroup.go b/service/iot/api_op_UpdateBillingGroup.go index b314b943f67..9f9daccde5c 100644 --- a/service/iot/api_op_UpdateBillingGroup.go +++ b/service/iot/api_op_UpdateBillingGroup.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateBillingGroup(ctx context.Context, params *UpdateBillingGr addawsRestjson1_serdeOpUpdateBillingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateCACertificate.go b/service/iot/api_op_UpdateCACertificate.go index 017bb031366..9d270032638 100644 --- a/service/iot/api_op_UpdateCACertificate.go +++ b/service/iot/api_op_UpdateCACertificate.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateCACertificate(ctx context.Context, params *UpdateCACertif addawsRestjson1_serdeOpUpdateCACertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateCertificate.go b/service/iot/api_op_UpdateCertificate.go index 87bfbc4026a..84f2897d00e 100644 --- a/service/iot/api_op_UpdateCertificate.go +++ b/service/iot/api_op_UpdateCertificate.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateCertificate(ctx context.Context, params *UpdateCertificat addawsRestjson1_serdeOpUpdateCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateDimension.go b/service/iot/api_op_UpdateDimension.go index 0b57ab2747d..2a49e56bd62 100644 --- a/service/iot/api_op_UpdateDimension.go +++ b/service/iot/api_op_UpdateDimension.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateDimension(ctx context.Context, params *UpdateDimensionInp addawsRestjson1_serdeOpUpdateDimensionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateDomainConfiguration.go b/service/iot/api_op_UpdateDomainConfiguration.go index 38b5da2abf4..a9fedda13f6 100644 --- a/service/iot/api_op_UpdateDomainConfiguration.go +++ b/service/iot/api_op_UpdateDomainConfiguration.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateDomainConfiguration(ctx context.Context, params *UpdateDo addawsRestjson1_serdeOpUpdateDomainConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateDynamicThingGroup.go b/service/iot/api_op_UpdateDynamicThingGroup.go index 24e067cc29b..12c06614bdc 100644 --- a/service/iot/api_op_UpdateDynamicThingGroup.go +++ b/service/iot/api_op_UpdateDynamicThingGroup.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDynamicThingGroup(ctx context.Context, params *UpdateDyna addawsRestjson1_serdeOpUpdateDynamicThingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateEventConfigurations.go b/service/iot/api_op_UpdateEventConfigurations.go index 86550d9a6af..ec13db6f208 100644 --- a/service/iot/api_op_UpdateEventConfigurations.go +++ b/service/iot/api_op_UpdateEventConfigurations.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateEventConfigurations(ctx context.Context, params *UpdateEv addawsRestjson1_serdeOpUpdateEventConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateIndexingConfiguration.go b/service/iot/api_op_UpdateIndexingConfiguration.go index 74fb5cc32c6..db93615c378 100644 --- a/service/iot/api_op_UpdateIndexingConfiguration.go +++ b/service/iot/api_op_UpdateIndexingConfiguration.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateIndexingConfiguration(ctx context.Context, params *Update addawsRestjson1_serdeOpUpdateIndexingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateJob.go b/service/iot/api_op_UpdateJob.go index 47d1c16a55d..51fcdd5db75 100644 --- a/service/iot/api_op_UpdateJob.go +++ b/service/iot/api_op_UpdateJob.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateJob(ctx context.Context, params *UpdateJobInput, optFns . addawsRestjson1_serdeOpUpdateJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateMitigationAction.go b/service/iot/api_op_UpdateMitigationAction.go index 72e23eb6b8a..8c9c844110f 100644 --- a/service/iot/api_op_UpdateMitigationAction.go +++ b/service/iot/api_op_UpdateMitigationAction.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateMitigationAction(ctx context.Context, params *UpdateMitig addawsRestjson1_serdeOpUpdateMitigationActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateProvisioningTemplate.go b/service/iot/api_op_UpdateProvisioningTemplate.go index 41a5783f939..b03613c9321 100644 --- a/service/iot/api_op_UpdateProvisioningTemplate.go +++ b/service/iot/api_op_UpdateProvisioningTemplate.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateProvisioningTemplate(ctx context.Context, params *UpdateP addawsRestjson1_serdeOpUpdateProvisioningTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateRoleAlias.go b/service/iot/api_op_UpdateRoleAlias.go index 610a2ceb179..3c4c2c00759 100644 --- a/service/iot/api_op_UpdateRoleAlias.go +++ b/service/iot/api_op_UpdateRoleAlias.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateRoleAlias(ctx context.Context, params *UpdateRoleAliasInp addawsRestjson1_serdeOpUpdateRoleAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateScheduledAudit.go b/service/iot/api_op_UpdateScheduledAudit.go index 6e599bbded7..20ca806710b 100644 --- a/service/iot/api_op_UpdateScheduledAudit.go +++ b/service/iot/api_op_UpdateScheduledAudit.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateScheduledAudit(ctx context.Context, params *UpdateSchedul addawsRestjson1_serdeOpUpdateScheduledAuditMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateSecurityProfile.go b/service/iot/api_op_UpdateSecurityProfile.go index 9fb67b6f7f8..a4e54224ecd 100644 --- a/service/iot/api_op_UpdateSecurityProfile.go +++ b/service/iot/api_op_UpdateSecurityProfile.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateSecurityProfile(ctx context.Context, params *UpdateSecuri addawsRestjson1_serdeOpUpdateSecurityProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateStream.go b/service/iot/api_op_UpdateStream.go index 21c1709affe..3d377f8173d 100644 --- a/service/iot/api_op_UpdateStream.go +++ b/service/iot/api_op_UpdateStream.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateStream(ctx context.Context, params *UpdateStreamInput, op addawsRestjson1_serdeOpUpdateStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateThing.go b/service/iot/api_op_UpdateThing.go index 7dff5660025..b9ebe535f4f 100644 --- a/service/iot/api_op_UpdateThing.go +++ b/service/iot/api_op_UpdateThing.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateThing(ctx context.Context, params *UpdateThingInput, optF addawsRestjson1_serdeOpUpdateThingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateThingGroup.go b/service/iot/api_op_UpdateThingGroup.go index b6a640deaa1..fa15c031b6b 100644 --- a/service/iot/api_op_UpdateThingGroup.go +++ b/service/iot/api_op_UpdateThingGroup.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateThingGroup(ctx context.Context, params *UpdateThingGroupI addawsRestjson1_serdeOpUpdateThingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateThingGroupsForThing.go b/service/iot/api_op_UpdateThingGroupsForThing.go index 404242d2791..2f58287b6ae 100644 --- a/service/iot/api_op_UpdateThingGroupsForThing.go +++ b/service/iot/api_op_UpdateThingGroupsForThing.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateThingGroupsForThing(ctx context.Context, params *UpdateTh addawsRestjson1_serdeOpUpdateThingGroupsForThingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_UpdateTopicRuleDestination.go b/service/iot/api_op_UpdateTopicRuleDestination.go index bf5b2e623fe..e2ebfaa6863 100644 --- a/service/iot/api_op_UpdateTopicRuleDestination.go +++ b/service/iot/api_op_UpdateTopicRuleDestination.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateTopicRuleDestination(ctx context.Context, params *UpdateT addawsRestjson1_serdeOpUpdateTopicRuleDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/api_op_ValidateSecurityProfileBehaviors.go b/service/iot/api_op_ValidateSecurityProfileBehaviors.go index 9900e2c3600..56a829d6170 100644 --- a/service/iot/api_op_ValidateSecurityProfileBehaviors.go +++ b/service/iot/api_op_ValidateSecurityProfileBehaviors.go @@ -5,7 +5,6 @@ package iot import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ValidateSecurityProfileBehaviors(ctx context.Context, params *V addawsRestjson1_serdeOpValidateSecurityProfileBehaviorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot/endpoints.go b/service/iot/endpoints.go index 02ad6eec762..3a97e28941a 100644 --- a/service/iot/endpoints.go +++ b/service/iot/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/iot1clickdevicesservice/api_client.go b/service/iot1clickdevicesservice/api_client.go index fae99a50d80..aed982e8ca6 100644 --- a/service/iot1clickdevicesservice/api_client.go +++ b/service/iot1clickdevicesservice/api_client.go @@ -79,30 +79,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -168,6 +144,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/iot1clickdevicesservice/api_op_ClaimDevicesByClaimCode.go b/service/iot1clickdevicesservice/api_op_ClaimDevicesByClaimCode.go index 446efc93b4b..5b2ab48318e 100644 --- a/service/iot1clickdevicesservice/api_op_ClaimDevicesByClaimCode.go +++ b/service/iot1clickdevicesservice/api_op_ClaimDevicesByClaimCode.go @@ -5,7 +5,6 @@ package iot1clickdevicesservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ClaimDevicesByClaimCode(ctx context.Context, params *ClaimDevic addawsRestjson1_serdeOpClaimDevicesByClaimCodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickdevicesservice/api_op_DescribeDevice.go b/service/iot1clickdevicesservice/api_op_DescribeDevice.go index b54f2fe79a4..29cc71f37f5 100644 --- a/service/iot1clickdevicesservice/api_op_DescribeDevice.go +++ b/service/iot1clickdevicesservice/api_op_DescribeDevice.go @@ -5,7 +5,6 @@ package iot1clickdevicesservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot1clickdevicesservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDevice(ctx context.Context, params *DescribeDeviceInput addawsRestjson1_serdeOpDescribeDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickdevicesservice/api_op_FinalizeDeviceClaim.go b/service/iot1clickdevicesservice/api_op_FinalizeDeviceClaim.go index 8ee96118ad9..7a9883f39f0 100644 --- a/service/iot1clickdevicesservice/api_op_FinalizeDeviceClaim.go +++ b/service/iot1clickdevicesservice/api_op_FinalizeDeviceClaim.go @@ -5,7 +5,6 @@ package iot1clickdevicesservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) FinalizeDeviceClaim(ctx context.Context, params *FinalizeDevice addawsRestjson1_serdeOpFinalizeDeviceClaimMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickdevicesservice/api_op_GetDeviceMethods.go b/service/iot1clickdevicesservice/api_op_GetDeviceMethods.go index c6ac8646a2f..11c1c39ddcb 100644 --- a/service/iot1clickdevicesservice/api_op_GetDeviceMethods.go +++ b/service/iot1clickdevicesservice/api_op_GetDeviceMethods.go @@ -5,7 +5,6 @@ package iot1clickdevicesservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot1clickdevicesservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDeviceMethods(ctx context.Context, params *GetDeviceMethodsI addawsRestjson1_serdeOpGetDeviceMethodsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickdevicesservice/api_op_InitiateDeviceClaim.go b/service/iot1clickdevicesservice/api_op_InitiateDeviceClaim.go index dc271ab615c..bbbb36b8320 100644 --- a/service/iot1clickdevicesservice/api_op_InitiateDeviceClaim.go +++ b/service/iot1clickdevicesservice/api_op_InitiateDeviceClaim.go @@ -5,7 +5,6 @@ package iot1clickdevicesservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) InitiateDeviceClaim(ctx context.Context, params *InitiateDevice addawsRestjson1_serdeOpInitiateDeviceClaimMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickdevicesservice/api_op_InvokeDeviceMethod.go b/service/iot1clickdevicesservice/api_op_InvokeDeviceMethod.go index 97b01184872..dfdd75a556f 100644 --- a/service/iot1clickdevicesservice/api_op_InvokeDeviceMethod.go +++ b/service/iot1clickdevicesservice/api_op_InvokeDeviceMethod.go @@ -5,7 +5,6 @@ package iot1clickdevicesservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot1clickdevicesservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) InvokeDeviceMethod(ctx context.Context, params *InvokeDeviceMet addawsRestjson1_serdeOpInvokeDeviceMethodMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickdevicesservice/api_op_ListDeviceEvents.go b/service/iot1clickdevicesservice/api_op_ListDeviceEvents.go index 46ef95001bd..014bcbe0f03 100644 --- a/service/iot1clickdevicesservice/api_op_ListDeviceEvents.go +++ b/service/iot1clickdevicesservice/api_op_ListDeviceEvents.go @@ -5,7 +5,6 @@ package iot1clickdevicesservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot1clickdevicesservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListDeviceEvents(ctx context.Context, params *ListDeviceEventsI addawsRestjson1_serdeOpListDeviceEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickdevicesservice/api_op_ListDevices.go b/service/iot1clickdevicesservice/api_op_ListDevices.go index 9df4dfd1a05..db5bae9a56c 100644 --- a/service/iot1clickdevicesservice/api_op_ListDevices.go +++ b/service/iot1clickdevicesservice/api_op_ListDevices.go @@ -5,7 +5,6 @@ package iot1clickdevicesservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot1clickdevicesservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDevices(ctx context.Context, params *ListDevicesInput, optF addawsRestjson1_serdeOpListDevicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickdevicesservice/api_op_ListTagsForResource.go b/service/iot1clickdevicesservice/api_op_ListTagsForResource.go index 198ff0f14bc..1b0e43c165c 100644 --- a/service/iot1clickdevicesservice/api_op_ListTagsForResource.go +++ b/service/iot1clickdevicesservice/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package iot1clickdevicesservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickdevicesservice/api_op_TagResource.go b/service/iot1clickdevicesservice/api_op_TagResource.go index 53cf5610bf3..387211ee4a7 100644 --- a/service/iot1clickdevicesservice/api_op_TagResource.go +++ b/service/iot1clickdevicesservice/api_op_TagResource.go @@ -5,7 +5,6 @@ package iot1clickdevicesservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickdevicesservice/api_op_UnclaimDevice.go b/service/iot1clickdevicesservice/api_op_UnclaimDevice.go index 9781bc4ceb5..c04c388dec2 100644 --- a/service/iot1clickdevicesservice/api_op_UnclaimDevice.go +++ b/service/iot1clickdevicesservice/api_op_UnclaimDevice.go @@ -5,7 +5,6 @@ package iot1clickdevicesservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UnclaimDevice(ctx context.Context, params *UnclaimDeviceInput, addawsRestjson1_serdeOpUnclaimDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickdevicesservice/api_op_UntagResource.go b/service/iot1clickdevicesservice/api_op_UntagResource.go index db1755e1136..35812487204 100644 --- a/service/iot1clickdevicesservice/api_op_UntagResource.go +++ b/service/iot1clickdevicesservice/api_op_UntagResource.go @@ -5,7 +5,6 @@ package iot1clickdevicesservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickdevicesservice/api_op_UpdateDeviceState.go b/service/iot1clickdevicesservice/api_op_UpdateDeviceState.go index a4c900b103d..7882ec57359 100644 --- a/service/iot1clickdevicesservice/api_op_UpdateDeviceState.go +++ b/service/iot1clickdevicesservice/api_op_UpdateDeviceState.go @@ -5,7 +5,6 @@ package iot1clickdevicesservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpdateDeviceState(ctx context.Context, params *UpdateDeviceStat addawsRestjson1_serdeOpUpdateDeviceStateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickdevicesservice/endpoints.go b/service/iot1clickdevicesservice/endpoints.go index f93d0614c6e..93ad2e2fd99 100644 --- a/service/iot1clickdevicesservice/endpoints.go +++ b/service/iot1clickdevicesservice/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/iot1clickprojects/api_client.go b/service/iot1clickprojects/api_client.go index d82e27948c7..76e1cbaba87 100644 --- a/service/iot1clickprojects/api_client.go +++ b/service/iot1clickprojects/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/iot1clickprojects/api_op_AssociateDeviceWithPlacement.go b/service/iot1clickprojects/api_op_AssociateDeviceWithPlacement.go index e9bb5bc0703..f5ad1f47041 100644 --- a/service/iot1clickprojects/api_op_AssociateDeviceWithPlacement.go +++ b/service/iot1clickprojects/api_op_AssociateDeviceWithPlacement.go @@ -5,7 +5,6 @@ package iot1clickprojects import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AssociateDeviceWithPlacement(ctx context.Context, params *Assoc addawsRestjson1_serdeOpAssociateDeviceWithPlacementMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickprojects/api_op_CreatePlacement.go b/service/iot1clickprojects/api_op_CreatePlacement.go index 67946ee7a38..b6b6e8ef7b9 100644 --- a/service/iot1clickprojects/api_op_CreatePlacement.go +++ b/service/iot1clickprojects/api_op_CreatePlacement.go @@ -5,7 +5,6 @@ package iot1clickprojects import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreatePlacement(ctx context.Context, params *CreatePlacementInp addawsRestjson1_serdeOpCreatePlacementMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickprojects/api_op_CreateProject.go b/service/iot1clickprojects/api_op_CreateProject.go index bae9047ef41..2765d4dbca0 100644 --- a/service/iot1clickprojects/api_op_CreateProject.go +++ b/service/iot1clickprojects/api_op_CreateProject.go @@ -5,7 +5,6 @@ package iot1clickprojects import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot1clickprojects/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateProject(ctx context.Context, params *CreateProjectInput, addawsRestjson1_serdeOpCreateProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickprojects/api_op_DeletePlacement.go b/service/iot1clickprojects/api_op_DeletePlacement.go index ff291768b81..613e7e72757 100644 --- a/service/iot1clickprojects/api_op_DeletePlacement.go +++ b/service/iot1clickprojects/api_op_DeletePlacement.go @@ -5,7 +5,6 @@ package iot1clickprojects import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeletePlacement(ctx context.Context, params *DeletePlacementInp addawsRestjson1_serdeOpDeletePlacementMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickprojects/api_op_DeleteProject.go b/service/iot1clickprojects/api_op_DeleteProject.go index a8621be12f3..4f3163d16ba 100644 --- a/service/iot1clickprojects/api_op_DeleteProject.go +++ b/service/iot1clickprojects/api_op_DeleteProject.go @@ -5,7 +5,6 @@ package iot1clickprojects import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteProject(ctx context.Context, params *DeleteProjectInput, addawsRestjson1_serdeOpDeleteProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickprojects/api_op_DescribePlacement.go b/service/iot1clickprojects/api_op_DescribePlacement.go index 198c0de2c66..16c1b55114c 100644 --- a/service/iot1clickprojects/api_op_DescribePlacement.go +++ b/service/iot1clickprojects/api_op_DescribePlacement.go @@ -5,7 +5,6 @@ package iot1clickprojects import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot1clickprojects/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribePlacement(ctx context.Context, params *DescribePlacemen addawsRestjson1_serdeOpDescribePlacementMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickprojects/api_op_DescribeProject.go b/service/iot1clickprojects/api_op_DescribeProject.go index 7b25766c0b0..98de16972d0 100644 --- a/service/iot1clickprojects/api_op_DescribeProject.go +++ b/service/iot1clickprojects/api_op_DescribeProject.go @@ -5,7 +5,6 @@ package iot1clickprojects import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot1clickprojects/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeProject(ctx context.Context, params *DescribeProjectInp addawsRestjson1_serdeOpDescribeProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickprojects/api_op_DisassociateDeviceFromPlacement.go b/service/iot1clickprojects/api_op_DisassociateDeviceFromPlacement.go index 933eee7fa26..e40455f236e 100644 --- a/service/iot1clickprojects/api_op_DisassociateDeviceFromPlacement.go +++ b/service/iot1clickprojects/api_op_DisassociateDeviceFromPlacement.go @@ -5,7 +5,6 @@ package iot1clickprojects import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisassociateDeviceFromPlacement(ctx context.Context, params *Di addawsRestjson1_serdeOpDisassociateDeviceFromPlacementMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickprojects/api_op_GetDevicesInPlacement.go b/service/iot1clickprojects/api_op_GetDevicesInPlacement.go index cda1272fde6..c77d85729af 100644 --- a/service/iot1clickprojects/api_op_GetDevicesInPlacement.go +++ b/service/iot1clickprojects/api_op_GetDevicesInPlacement.go @@ -5,7 +5,6 @@ package iot1clickprojects import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetDevicesInPlacement(ctx context.Context, params *GetDevicesIn addawsRestjson1_serdeOpGetDevicesInPlacementMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickprojects/api_op_ListPlacements.go b/service/iot1clickprojects/api_op_ListPlacements.go index 15fc30a43eb..6f987206936 100644 --- a/service/iot1clickprojects/api_op_ListPlacements.go +++ b/service/iot1clickprojects/api_op_ListPlacements.go @@ -5,7 +5,6 @@ package iot1clickprojects import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot1clickprojects/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListPlacements(ctx context.Context, params *ListPlacementsInput addawsRestjson1_serdeOpListPlacementsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickprojects/api_op_ListProjects.go b/service/iot1clickprojects/api_op_ListProjects.go index fe3eb1418be..1568ec00dab 100644 --- a/service/iot1clickprojects/api_op_ListProjects.go +++ b/service/iot1clickprojects/api_op_ListProjects.go @@ -5,7 +5,6 @@ package iot1clickprojects import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot1clickprojects/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListProjects(ctx context.Context, params *ListProjectsInput, op addawsRestjson1_serdeOpListProjectsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickprojects/api_op_ListTagsForResource.go b/service/iot1clickprojects/api_op_ListTagsForResource.go index 005d47db445..2d1bcb33e88 100644 --- a/service/iot1clickprojects/api_op_ListTagsForResource.go +++ b/service/iot1clickprojects/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package iot1clickprojects import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickprojects/api_op_TagResource.go b/service/iot1clickprojects/api_op_TagResource.go index 918caf1917b..100c5eb1637 100644 --- a/service/iot1clickprojects/api_op_TagResource.go +++ b/service/iot1clickprojects/api_op_TagResource.go @@ -5,7 +5,6 @@ package iot1clickprojects import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickprojects/api_op_UntagResource.go b/service/iot1clickprojects/api_op_UntagResource.go index c1830c01471..c4dd5c93918 100644 --- a/service/iot1clickprojects/api_op_UntagResource.go +++ b/service/iot1clickprojects/api_op_UntagResource.go @@ -5,7 +5,6 @@ package iot1clickprojects import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickprojects/api_op_UpdatePlacement.go b/service/iot1clickprojects/api_op_UpdatePlacement.go index b71a9c1ef84..eacff814593 100644 --- a/service/iot1clickprojects/api_op_UpdatePlacement.go +++ b/service/iot1clickprojects/api_op_UpdatePlacement.go @@ -5,7 +5,6 @@ package iot1clickprojects import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpdatePlacement(ctx context.Context, params *UpdatePlacementInp addawsRestjson1_serdeOpUpdatePlacementMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickprojects/api_op_UpdateProject.go b/service/iot1clickprojects/api_op_UpdateProject.go index c5f93744f94..985b8bc06fa 100644 --- a/service/iot1clickprojects/api_op_UpdateProject.go +++ b/service/iot1clickprojects/api_op_UpdateProject.go @@ -5,7 +5,6 @@ package iot1clickprojects import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iot1clickprojects/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateProject(ctx context.Context, params *UpdateProjectInput, addawsRestjson1_serdeOpUpdateProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iot1clickprojects/endpoints.go b/service/iot1clickprojects/endpoints.go index 73776317ddf..429b389f439 100644 --- a/service/iot1clickprojects/endpoints.go +++ b/service/iot1clickprojects/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/iotanalytics/api_client.go b/service/iotanalytics/api_client.go index 9f5ec745244..be5282c0b0a 100644 --- a/service/iotanalytics/api_client.go +++ b/service/iotanalytics/api_client.go @@ -97,30 +97,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -186,6 +162,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/iotanalytics/api_op_BatchPutMessage.go b/service/iotanalytics/api_op_BatchPutMessage.go index ebfefb895cf..61cc6445b6a 100644 --- a/service/iotanalytics/api_op_BatchPutMessage.go +++ b/service/iotanalytics/api_op_BatchPutMessage.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchPutMessage(ctx context.Context, params *BatchPutMessageInp addawsRestjson1_serdeOpBatchPutMessageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_CancelPipelineReprocessing.go b/service/iotanalytics/api_op_CancelPipelineReprocessing.go index 6a3fc3fe638..da3e8c474f0 100644 --- a/service/iotanalytics/api_op_CancelPipelineReprocessing.go +++ b/service/iotanalytics/api_op_CancelPipelineReprocessing.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CancelPipelineReprocessing(ctx context.Context, params *CancelP addawsRestjson1_serdeOpCancelPipelineReprocessingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_CreateChannel.go b/service/iotanalytics/api_op_CreateChannel.go index 667ce32b9be..724c3f2ad1f 100644 --- a/service/iotanalytics/api_op_CreateChannel.go +++ b/service/iotanalytics/api_op_CreateChannel.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateChannel(ctx context.Context, params *CreateChannelInput, addawsRestjson1_serdeOpCreateChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_CreateDataset.go b/service/iotanalytics/api_op_CreateDataset.go index 7e6b8866ba4..a032c52c76c 100644 --- a/service/iotanalytics/api_op_CreateDataset.go +++ b/service/iotanalytics/api_op_CreateDataset.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateDataset(ctx context.Context, params *CreateDatasetInput, addawsRestjson1_serdeOpCreateDatasetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_CreateDatasetContent.go b/service/iotanalytics/api_op_CreateDatasetContent.go index a8a3c02c116..7053601bbc9 100644 --- a/service/iotanalytics/api_op_CreateDatasetContent.go +++ b/service/iotanalytics/api_op_CreateDatasetContent.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateDatasetContent(ctx context.Context, params *CreateDataset addawsRestjson1_serdeOpCreateDatasetContentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_CreateDatastore.go b/service/iotanalytics/api_op_CreateDatastore.go index e80c13a856d..e38af29b5bc 100644 --- a/service/iotanalytics/api_op_CreateDatastore.go +++ b/service/iotanalytics/api_op_CreateDatastore.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDatastore(ctx context.Context, params *CreateDatastoreInp addawsRestjson1_serdeOpCreateDatastoreMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_CreatePipeline.go b/service/iotanalytics/api_op_CreatePipeline.go index 35876e16310..143023fd7c2 100644 --- a/service/iotanalytics/api_op_CreatePipeline.go +++ b/service/iotanalytics/api_op_CreatePipeline.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreatePipeline(ctx context.Context, params *CreatePipelineInput addawsRestjson1_serdeOpCreatePipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_DeleteChannel.go b/service/iotanalytics/api_op_DeleteChannel.go index ab919a88172..8cd54a3a6e1 100644 --- a/service/iotanalytics/api_op_DeleteChannel.go +++ b/service/iotanalytics/api_op_DeleteChannel.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteChannel(ctx context.Context, params *DeleteChannelInput, addawsRestjson1_serdeOpDeleteChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_DeleteDataset.go b/service/iotanalytics/api_op_DeleteDataset.go index 05496d8842f..386cbdaa731 100644 --- a/service/iotanalytics/api_op_DeleteDataset.go +++ b/service/iotanalytics/api_op_DeleteDataset.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDataset(ctx context.Context, params *DeleteDatasetInput, addawsRestjson1_serdeOpDeleteDatasetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_DeleteDatasetContent.go b/service/iotanalytics/api_op_DeleteDatasetContent.go index c4a62da5153..94d3a37ab8a 100644 --- a/service/iotanalytics/api_op_DeleteDatasetContent.go +++ b/service/iotanalytics/api_op_DeleteDatasetContent.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDatasetContent(ctx context.Context, params *DeleteDataset addawsRestjson1_serdeOpDeleteDatasetContentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_DeleteDatastore.go b/service/iotanalytics/api_op_DeleteDatastore.go index b87940b0bed..9a3bc6710ec 100644 --- a/service/iotanalytics/api_op_DeleteDatastore.go +++ b/service/iotanalytics/api_op_DeleteDatastore.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDatastore(ctx context.Context, params *DeleteDatastoreInp addawsRestjson1_serdeOpDeleteDatastoreMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_DeletePipeline.go b/service/iotanalytics/api_op_DeletePipeline.go index 0deacd0c278..e0b2122557c 100644 --- a/service/iotanalytics/api_op_DeletePipeline.go +++ b/service/iotanalytics/api_op_DeletePipeline.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeletePipeline(ctx context.Context, params *DeletePipelineInput addawsRestjson1_serdeOpDeletePipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_DescribeChannel.go b/service/iotanalytics/api_op_DescribeChannel.go index 727a5bb4830..7d7688c74f2 100644 --- a/service/iotanalytics/api_op_DescribeChannel.go +++ b/service/iotanalytics/api_op_DescribeChannel.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeChannel(ctx context.Context, params *DescribeChannelInp addawsRestjson1_serdeOpDescribeChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_DescribeDataset.go b/service/iotanalytics/api_op_DescribeDataset.go index 3a8aa7c5cb7..5d4099a3436 100644 --- a/service/iotanalytics/api_op_DescribeDataset.go +++ b/service/iotanalytics/api_op_DescribeDataset.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDataset(ctx context.Context, params *DescribeDatasetInp addawsRestjson1_serdeOpDescribeDatasetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_DescribeDatastore.go b/service/iotanalytics/api_op_DescribeDatastore.go index 1511af9c8e4..dc26dfea755 100644 --- a/service/iotanalytics/api_op_DescribeDatastore.go +++ b/service/iotanalytics/api_op_DescribeDatastore.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDatastore(ctx context.Context, params *DescribeDatastor addawsRestjson1_serdeOpDescribeDatastoreMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_DescribeLoggingOptions.go b/service/iotanalytics/api_op_DescribeLoggingOptions.go index 4dac03f1d55..b13b0114de0 100644 --- a/service/iotanalytics/api_op_DescribeLoggingOptions.go +++ b/service/iotanalytics/api_op_DescribeLoggingOptions.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeLoggingOptions(ctx context.Context, params *DescribeLog addawsRestjson1_serdeOpDescribeLoggingOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_DescribePipeline.go b/service/iotanalytics/api_op_DescribePipeline.go index 0e8fbf15203..d06d62ac510 100644 --- a/service/iotanalytics/api_op_DescribePipeline.go +++ b/service/iotanalytics/api_op_DescribePipeline.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribePipeline(ctx context.Context, params *DescribePipelineI addawsRestjson1_serdeOpDescribePipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_GetDatasetContent.go b/service/iotanalytics/api_op_GetDatasetContent.go index 04907ebf5ce..b8b4e1f097f 100644 --- a/service/iotanalytics/api_op_GetDatasetContent.go +++ b/service/iotanalytics/api_op_GetDatasetContent.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetDatasetContent(ctx context.Context, params *GetDatasetConten addawsRestjson1_serdeOpGetDatasetContentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_ListChannels.go b/service/iotanalytics/api_op_ListChannels.go index 39b1816c5d6..53c95265986 100644 --- a/service/iotanalytics/api_op_ListChannels.go +++ b/service/iotanalytics/api_op_ListChannels.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListChannels(ctx context.Context, params *ListChannelsInput, op addawsRestjson1_serdeOpListChannelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_ListDatasetContents.go b/service/iotanalytics/api_op_ListDatasetContents.go index f2bd8e0d5c7..6b2f27d9338 100644 --- a/service/iotanalytics/api_op_ListDatasetContents.go +++ b/service/iotanalytics/api_op_ListDatasetContents.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListDatasetContents(ctx context.Context, params *ListDatasetCon addawsRestjson1_serdeOpListDatasetContentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_ListDatasets.go b/service/iotanalytics/api_op_ListDatasets.go index 5ce53be916b..c64a9217256 100644 --- a/service/iotanalytics/api_op_ListDatasets.go +++ b/service/iotanalytics/api_op_ListDatasets.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDatasets(ctx context.Context, params *ListDatasetsInput, op addawsRestjson1_serdeOpListDatasetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_ListDatastores.go b/service/iotanalytics/api_op_ListDatastores.go index 36699fc2193..16bc169d3e6 100644 --- a/service/iotanalytics/api_op_ListDatastores.go +++ b/service/iotanalytics/api_op_ListDatastores.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDatastores(ctx context.Context, params *ListDatastoresInput addawsRestjson1_serdeOpListDatastoresMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_ListPipelines.go b/service/iotanalytics/api_op_ListPipelines.go index b50fc952f8c..9db77595ddc 100644 --- a/service/iotanalytics/api_op_ListPipelines.go +++ b/service/iotanalytics/api_op_ListPipelines.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListPipelines(ctx context.Context, params *ListPipelinesInput, addawsRestjson1_serdeOpListPipelinesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_ListTagsForResource.go b/service/iotanalytics/api_op_ListTagsForResource.go index f207d18e3df..1d5be6155d2 100644 --- a/service/iotanalytics/api_op_ListTagsForResource.go +++ b/service/iotanalytics/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_PutLoggingOptions.go b/service/iotanalytics/api_op_PutLoggingOptions.go index e6798a3fdb7..ff5d94c0a2b 100644 --- a/service/iotanalytics/api_op_PutLoggingOptions.go +++ b/service/iotanalytics/api_op_PutLoggingOptions.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) PutLoggingOptions(ctx context.Context, params *PutLoggingOption addawsRestjson1_serdeOpPutLoggingOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_RunPipelineActivity.go b/service/iotanalytics/api_op_RunPipelineActivity.go index a342a8a26f9..06db583c686 100644 --- a/service/iotanalytics/api_op_RunPipelineActivity.go +++ b/service/iotanalytics/api_op_RunPipelineActivity.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RunPipelineActivity(ctx context.Context, params *RunPipelineAct addawsRestjson1_serdeOpRunPipelineActivityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_SampleChannelData.go b/service/iotanalytics/api_op_SampleChannelData.go index 0608b1c8906..52e42dffc08 100644 --- a/service/iotanalytics/api_op_SampleChannelData.go +++ b/service/iotanalytics/api_op_SampleChannelData.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) SampleChannelData(ctx context.Context, params *SampleChannelDat addawsRestjson1_serdeOpSampleChannelDataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_StartPipelineReprocessing.go b/service/iotanalytics/api_op_StartPipelineReprocessing.go index a2189cbe97d..d6666fe0c61 100644 --- a/service/iotanalytics/api_op_StartPipelineReprocessing.go +++ b/service/iotanalytics/api_op_StartPipelineReprocessing.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) StartPipelineReprocessing(ctx context.Context, params *StartPip addawsRestjson1_serdeOpStartPipelineReprocessingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_TagResource.go b/service/iotanalytics/api_op_TagResource.go index e025ae0ea23..f818553de0d 100644 --- a/service/iotanalytics/api_op_TagResource.go +++ b/service/iotanalytics/api_op_TagResource.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_UntagResource.go b/service/iotanalytics/api_op_UntagResource.go index c146e2d9891..7f5a96e10b7 100644 --- a/service/iotanalytics/api_op_UntagResource.go +++ b/service/iotanalytics/api_op_UntagResource.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_UpdateChannel.go b/service/iotanalytics/api_op_UpdateChannel.go index 2f113b5df8d..39d3aa3c37d 100644 --- a/service/iotanalytics/api_op_UpdateChannel.go +++ b/service/iotanalytics/api_op_UpdateChannel.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateChannel(ctx context.Context, params *UpdateChannelInput, addawsRestjson1_serdeOpUpdateChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_UpdateDataset.go b/service/iotanalytics/api_op_UpdateDataset.go index c6c20ca25fa..c81c3e782dc 100644 --- a/service/iotanalytics/api_op_UpdateDataset.go +++ b/service/iotanalytics/api_op_UpdateDataset.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDataset(ctx context.Context, params *UpdateDatasetInput, addawsRestjson1_serdeOpUpdateDatasetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_UpdateDatastore.go b/service/iotanalytics/api_op_UpdateDatastore.go index 54be502c720..49659268c2c 100644 --- a/service/iotanalytics/api_op_UpdateDatastore.go +++ b/service/iotanalytics/api_op_UpdateDatastore.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDatastore(ctx context.Context, params *UpdateDatastoreInp addawsRestjson1_serdeOpUpdateDatastoreMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/api_op_UpdatePipeline.go b/service/iotanalytics/api_op_UpdatePipeline.go index 81b4f2a24dd..f1319c96859 100644 --- a/service/iotanalytics/api_op_UpdatePipeline.go +++ b/service/iotanalytics/api_op_UpdatePipeline.go @@ -5,7 +5,6 @@ package iotanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdatePipeline(ctx context.Context, params *UpdatePipelineInput addawsRestjson1_serdeOpUpdatePipelineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotanalytics/endpoints.go b/service/iotanalytics/endpoints.go index beec7009de5..3d533061fe2 100644 --- a/service/iotanalytics/endpoints.go +++ b/service/iotanalytics/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/iotdataplane/api_client.go b/service/iotdataplane/api_client.go index 881437cb5b1..8cbe41ed6ec 100644 --- a/service/iotdataplane/api_client.go +++ b/service/iotdataplane/api_client.go @@ -86,30 +86,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -175,6 +151,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/iotdataplane/api_op_DeleteThingShadow.go b/service/iotdataplane/api_op_DeleteThingShadow.go index 518bb9fd66e..56c14c1f14b 100644 --- a/service/iotdataplane/api_op_DeleteThingShadow.go +++ b/service/iotdataplane/api_op_DeleteThingShadow.go @@ -5,7 +5,6 @@ package iotdataplane import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteThingShadow(ctx context.Context, params *DeleteThingShado addawsRestjson1_serdeOpDeleteThingShadowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotdataplane/api_op_GetThingShadow.go b/service/iotdataplane/api_op_GetThingShadow.go index 6fdd3ce4dc0..109b9e6746a 100644 --- a/service/iotdataplane/api_op_GetThingShadow.go +++ b/service/iotdataplane/api_op_GetThingShadow.go @@ -5,7 +5,6 @@ package iotdataplane import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) GetThingShadow(ctx context.Context, params *GetThingShadowInput addawsRestjson1_serdeOpGetThingShadowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotdataplane/api_op_ListNamedShadowsForThing.go b/service/iotdataplane/api_op_ListNamedShadowsForThing.go index 218288cf754..1e7c43bb20e 100644 --- a/service/iotdataplane/api_op_ListNamedShadowsForThing.go +++ b/service/iotdataplane/api_op_ListNamedShadowsForThing.go @@ -5,7 +5,6 @@ package iotdataplane import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListNamedShadowsForThing(ctx context.Context, params *ListNamed addawsRestjson1_serdeOpListNamedShadowsForThingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotdataplane/api_op_Publish.go b/service/iotdataplane/api_op_Publish.go index 7cb0893a6af..55e6c30f90e 100644 --- a/service/iotdataplane/api_op_Publish.go +++ b/service/iotdataplane/api_op_Publish.go @@ -5,7 +5,6 @@ package iotdataplane import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) Publish(ctx context.Context, params *PublishInput, optFns ...fu addawsRestjson1_serdeOpPublishMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotdataplane/api_op_UpdateThingShadow.go b/service/iotdataplane/api_op_UpdateThingShadow.go index 632d66bbe3a..a4bb524ccba 100644 --- a/service/iotdataplane/api_op_UpdateThingShadow.go +++ b/service/iotdataplane/api_op_UpdateThingShadow.go @@ -5,7 +5,6 @@ package iotdataplane import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) UpdateThingShadow(ctx context.Context, params *UpdateThingShado addawsRestjson1_serdeOpUpdateThingShadowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotdataplane/endpoints.go b/service/iotdataplane/endpoints.go index 590e348bd2f..66b0a9d4e38 100644 --- a/service/iotdataplane/endpoints.go +++ b/service/iotdataplane/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/iotevents/api_client.go b/service/iotevents/api_client.go index 4be85e6e2bc..c0da6e102b4 100644 --- a/service/iotevents/api_client.go +++ b/service/iotevents/api_client.go @@ -80,30 +80,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -169,6 +145,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/iotevents/api_op_CreateDetectorModel.go b/service/iotevents/api_op_CreateDetectorModel.go index 7694026b8db..4356138e8bb 100644 --- a/service/iotevents/api_op_CreateDetectorModel.go +++ b/service/iotevents/api_op_CreateDetectorModel.go @@ -5,7 +5,6 @@ package iotevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotevents/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDetectorModel(ctx context.Context, params *CreateDetector addawsRestjson1_serdeOpCreateDetectorModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotevents/api_op_CreateInput.go b/service/iotevents/api_op_CreateInput.go index 91c805958e2..f9832a48794 100644 --- a/service/iotevents/api_op_CreateInput.go +++ b/service/iotevents/api_op_CreateInput.go @@ -5,7 +5,6 @@ package iotevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotevents/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateInput(ctx context.Context, params *CreateInputInput, optF addawsRestjson1_serdeOpCreateInputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotevents/api_op_DeleteDetectorModel.go b/service/iotevents/api_op_DeleteDetectorModel.go index 6d8330b5099..3e6e24aaa91 100644 --- a/service/iotevents/api_op_DeleteDetectorModel.go +++ b/service/iotevents/api_op_DeleteDetectorModel.go @@ -5,7 +5,6 @@ package iotevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDetectorModel(ctx context.Context, params *DeleteDetector addawsRestjson1_serdeOpDeleteDetectorModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotevents/api_op_DeleteInput.go b/service/iotevents/api_op_DeleteInput.go index d7a3e8e96b8..d04e02ac7e8 100644 --- a/service/iotevents/api_op_DeleteInput.go +++ b/service/iotevents/api_op_DeleteInput.go @@ -5,7 +5,6 @@ package iotevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteInput(ctx context.Context, params *DeleteInputInput, optF addawsRestjson1_serdeOpDeleteInputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotevents/api_op_DescribeDetectorModel.go b/service/iotevents/api_op_DescribeDetectorModel.go index 32a8a77863e..341e8666fdd 100644 --- a/service/iotevents/api_op_DescribeDetectorModel.go +++ b/service/iotevents/api_op_DescribeDetectorModel.go @@ -5,7 +5,6 @@ package iotevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotevents/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDetectorModel(ctx context.Context, params *DescribeDete addawsRestjson1_serdeOpDescribeDetectorModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotevents/api_op_DescribeInput.go b/service/iotevents/api_op_DescribeInput.go index f13b583b1c2..424de195d48 100644 --- a/service/iotevents/api_op_DescribeInput.go +++ b/service/iotevents/api_op_DescribeInput.go @@ -5,7 +5,6 @@ package iotevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotevents/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeInput(ctx context.Context, params *DescribeInputInput, addawsRestjson1_serdeOpDescribeInputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotevents/api_op_DescribeLoggingOptions.go b/service/iotevents/api_op_DescribeLoggingOptions.go index 4f0d3631ccf..d53ae908255 100644 --- a/service/iotevents/api_op_DescribeLoggingOptions.go +++ b/service/iotevents/api_op_DescribeLoggingOptions.go @@ -5,7 +5,6 @@ package iotevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotevents/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeLoggingOptions(ctx context.Context, params *DescribeLog addawsRestjson1_serdeOpDescribeLoggingOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotevents/api_op_ListDetectorModelVersions.go b/service/iotevents/api_op_ListDetectorModelVersions.go index acda1c35ccd..862450a8df2 100644 --- a/service/iotevents/api_op_ListDetectorModelVersions.go +++ b/service/iotevents/api_op_ListDetectorModelVersions.go @@ -5,7 +5,6 @@ package iotevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotevents/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListDetectorModelVersions(ctx context.Context, params *ListDete addawsRestjson1_serdeOpListDetectorModelVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotevents/api_op_ListDetectorModels.go b/service/iotevents/api_op_ListDetectorModels.go index 43e5213ed8a..3b7a59cefd2 100644 --- a/service/iotevents/api_op_ListDetectorModels.go +++ b/service/iotevents/api_op_ListDetectorModels.go @@ -5,7 +5,6 @@ package iotevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotevents/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListDetectorModels(ctx context.Context, params *ListDetectorMod addawsRestjson1_serdeOpListDetectorModelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotevents/api_op_ListInputs.go b/service/iotevents/api_op_ListInputs.go index 5928a746d7d..abe17ec26a0 100644 --- a/service/iotevents/api_op_ListInputs.go +++ b/service/iotevents/api_op_ListInputs.go @@ -5,7 +5,6 @@ package iotevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotevents/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListInputs(ctx context.Context, params *ListInputsInput, optFns addawsRestjson1_serdeOpListInputsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotevents/api_op_ListTagsForResource.go b/service/iotevents/api_op_ListTagsForResource.go index e634fd8f1c6..9dc05d03248 100644 --- a/service/iotevents/api_op_ListTagsForResource.go +++ b/service/iotevents/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package iotevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotevents/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotevents/api_op_PutLoggingOptions.go b/service/iotevents/api_op_PutLoggingOptions.go index 31444677959..461bed48383 100644 --- a/service/iotevents/api_op_PutLoggingOptions.go +++ b/service/iotevents/api_op_PutLoggingOptions.go @@ -5,7 +5,6 @@ package iotevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotevents/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) PutLoggingOptions(ctx context.Context, params *PutLoggingOption addawsRestjson1_serdeOpPutLoggingOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotevents/api_op_TagResource.go b/service/iotevents/api_op_TagResource.go index 0bcb29ee8fd..eef915dd4b6 100644 --- a/service/iotevents/api_op_TagResource.go +++ b/service/iotevents/api_op_TagResource.go @@ -5,7 +5,6 @@ package iotevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotevents/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotevents/api_op_UntagResource.go b/service/iotevents/api_op_UntagResource.go index 7f634388d06..8e771247c1f 100644 --- a/service/iotevents/api_op_UntagResource.go +++ b/service/iotevents/api_op_UntagResource.go @@ -5,7 +5,6 @@ package iotevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotevents/api_op_UpdateDetectorModel.go b/service/iotevents/api_op_UpdateDetectorModel.go index 9a957344002..81ed5c8883b 100644 --- a/service/iotevents/api_op_UpdateDetectorModel.go +++ b/service/iotevents/api_op_UpdateDetectorModel.go @@ -5,7 +5,6 @@ package iotevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotevents/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateDetectorModel(ctx context.Context, params *UpdateDetector addawsRestjson1_serdeOpUpdateDetectorModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotevents/api_op_UpdateInput.go b/service/iotevents/api_op_UpdateInput.go index a5433192b4b..6dca30c9d73 100644 --- a/service/iotevents/api_op_UpdateInput.go +++ b/service/iotevents/api_op_UpdateInput.go @@ -5,7 +5,6 @@ package iotevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotevents/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateInput(ctx context.Context, params *UpdateInputInput, optF addawsRestjson1_serdeOpUpdateInputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotevents/endpoints.go b/service/iotevents/endpoints.go index 6f9f94d9e37..b328bb6b5a7 100644 --- a/service/iotevents/endpoints.go +++ b/service/iotevents/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/ioteventsdata/api_client.go b/service/ioteventsdata/api_client.go index e3d53fb80a7..97052dbee43 100644 --- a/service/ioteventsdata/api_client.go +++ b/service/ioteventsdata/api_client.go @@ -80,30 +80,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -169,6 +145,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/ioteventsdata/api_op_BatchPutMessage.go b/service/ioteventsdata/api_op_BatchPutMessage.go index 3875b68373c..817114a29fc 100644 --- a/service/ioteventsdata/api_op_BatchPutMessage.go +++ b/service/ioteventsdata/api_op_BatchPutMessage.go @@ -5,7 +5,6 @@ package ioteventsdata import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ioteventsdata/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) BatchPutMessage(ctx context.Context, params *BatchPutMessageInp addawsRestjson1_serdeOpBatchPutMessageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ioteventsdata/api_op_BatchUpdateDetector.go b/service/ioteventsdata/api_op_BatchUpdateDetector.go index c9ebc1ec2a3..53b09bfd588 100644 --- a/service/ioteventsdata/api_op_BatchUpdateDetector.go +++ b/service/ioteventsdata/api_op_BatchUpdateDetector.go @@ -5,7 +5,6 @@ package ioteventsdata import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ioteventsdata/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) BatchUpdateDetector(ctx context.Context, params *BatchUpdateDet addawsRestjson1_serdeOpBatchUpdateDetectorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ioteventsdata/api_op_DescribeDetector.go b/service/ioteventsdata/api_op_DescribeDetector.go index 4fc14b540a9..aad25abd279 100644 --- a/service/ioteventsdata/api_op_DescribeDetector.go +++ b/service/ioteventsdata/api_op_DescribeDetector.go @@ -5,7 +5,6 @@ package ioteventsdata import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ioteventsdata/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDetector(ctx context.Context, params *DescribeDetectorI addawsRestjson1_serdeOpDescribeDetectorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ioteventsdata/api_op_ListDetectors.go b/service/ioteventsdata/api_op_ListDetectors.go index 573ecb21a76..7888648b1d2 100644 --- a/service/ioteventsdata/api_op_ListDetectors.go +++ b/service/ioteventsdata/api_op_ListDetectors.go @@ -5,7 +5,6 @@ package ioteventsdata import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ioteventsdata/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDetectors(ctx context.Context, params *ListDetectorsInput, addawsRestjson1_serdeOpListDetectorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ioteventsdata/endpoints.go b/service/ioteventsdata/endpoints.go index 029cffd9024..01712f7fce1 100644 --- a/service/ioteventsdata/endpoints.go +++ b/service/ioteventsdata/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/iotjobsdataplane/api_client.go b/service/iotjobsdataplane/api_client.go index b85ef8a4974..855f759349b 100644 --- a/service/iotjobsdataplane/api_client.go +++ b/service/iotjobsdataplane/api_client.go @@ -89,30 +89,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -178,6 +154,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/iotjobsdataplane/api_op_DescribeJobExecution.go b/service/iotjobsdataplane/api_op_DescribeJobExecution.go index 76071b7ab7e..c8173872346 100644 --- a/service/iotjobsdataplane/api_op_DescribeJobExecution.go +++ b/service/iotjobsdataplane/api_op_DescribeJobExecution.go @@ -5,7 +5,6 @@ package iotjobsdataplane import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotjobsdataplane/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeJobExecution(ctx context.Context, params *DescribeJobEx addawsRestjson1_serdeOpDescribeJobExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotjobsdataplane/api_op_GetPendingJobExecutions.go b/service/iotjobsdataplane/api_op_GetPendingJobExecutions.go index e6692f07834..22fdf3d0386 100644 --- a/service/iotjobsdataplane/api_op_GetPendingJobExecutions.go +++ b/service/iotjobsdataplane/api_op_GetPendingJobExecutions.go @@ -5,7 +5,6 @@ package iotjobsdataplane import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotjobsdataplane/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetPendingJobExecutions(ctx context.Context, params *GetPending addawsRestjson1_serdeOpGetPendingJobExecutionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotjobsdataplane/api_op_StartNextPendingJobExecution.go b/service/iotjobsdataplane/api_op_StartNextPendingJobExecution.go index 051004d21bc..0317b01ddff 100644 --- a/service/iotjobsdataplane/api_op_StartNextPendingJobExecution.go +++ b/service/iotjobsdataplane/api_op_StartNextPendingJobExecution.go @@ -5,7 +5,6 @@ package iotjobsdataplane import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotjobsdataplane/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) StartNextPendingJobExecution(ctx context.Context, params *Start addawsRestjson1_serdeOpStartNextPendingJobExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotjobsdataplane/api_op_UpdateJobExecution.go b/service/iotjobsdataplane/api_op_UpdateJobExecution.go index fdc72649bc1..75ac410d847 100644 --- a/service/iotjobsdataplane/api_op_UpdateJobExecution.go +++ b/service/iotjobsdataplane/api_op_UpdateJobExecution.go @@ -5,7 +5,6 @@ package iotjobsdataplane import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotjobsdataplane/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateJobExecution(ctx context.Context, params *UpdateJobExecut addawsRestjson1_serdeOpUpdateJobExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotjobsdataplane/endpoints.go b/service/iotjobsdataplane/endpoints.go index b55dc5c0b19..bd04416499e 100644 --- a/service/iotjobsdataplane/endpoints.go +++ b/service/iotjobsdataplane/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/iotsecuretunneling/api_client.go b/service/iotsecuretunneling/api_client.go index e2fa2ed33ed..0e415312eaa 100644 --- a/service/iotsecuretunneling/api_client.go +++ b/service/iotsecuretunneling/api_client.go @@ -80,30 +80,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -169,6 +145,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/iotsecuretunneling/api_op_CloseTunnel.go b/service/iotsecuretunneling/api_op_CloseTunnel.go index a8322cc0098..5f5aef9bacd 100644 --- a/service/iotsecuretunneling/api_op_CloseTunnel.go +++ b/service/iotsecuretunneling/api_op_CloseTunnel.go @@ -5,7 +5,6 @@ package iotsecuretunneling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CloseTunnel(ctx context.Context, params *CloseTunnelInput, optF addawsAwsjson11_serdeOpCloseTunnelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsecuretunneling/api_op_DescribeTunnel.go b/service/iotsecuretunneling/api_op_DescribeTunnel.go index 857302f449d..54dd023b892 100644 --- a/service/iotsecuretunneling/api_op_DescribeTunnel.go +++ b/service/iotsecuretunneling/api_op_DescribeTunnel.go @@ -5,7 +5,6 @@ package iotsecuretunneling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsecuretunneling/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeTunnel(ctx context.Context, params *DescribeTunnelInput addawsAwsjson11_serdeOpDescribeTunnelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsecuretunneling/api_op_ListTagsForResource.go b/service/iotsecuretunneling/api_op_ListTagsForResource.go index e7100eefc05..84dbf5478c9 100644 --- a/service/iotsecuretunneling/api_op_ListTagsForResource.go +++ b/service/iotsecuretunneling/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package iotsecuretunneling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsecuretunneling/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsecuretunneling/api_op_ListTunnels.go b/service/iotsecuretunneling/api_op_ListTunnels.go index 03b3195c49a..2fb4e347db3 100644 --- a/service/iotsecuretunneling/api_op_ListTunnels.go +++ b/service/iotsecuretunneling/api_op_ListTunnels.go @@ -5,7 +5,6 @@ package iotsecuretunneling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsecuretunneling/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTunnels(ctx context.Context, params *ListTunnelsInput, optF addawsAwsjson11_serdeOpListTunnelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsecuretunneling/api_op_OpenTunnel.go b/service/iotsecuretunneling/api_op_OpenTunnel.go index 939965a83b1..d5b4cbb33dc 100644 --- a/service/iotsecuretunneling/api_op_OpenTunnel.go +++ b/service/iotsecuretunneling/api_op_OpenTunnel.go @@ -5,7 +5,6 @@ package iotsecuretunneling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsecuretunneling/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) OpenTunnel(ctx context.Context, params *OpenTunnelInput, optFns addawsAwsjson11_serdeOpOpenTunnelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsecuretunneling/api_op_TagResource.go b/service/iotsecuretunneling/api_op_TagResource.go index eb69a2c8a72..77e283e7e61 100644 --- a/service/iotsecuretunneling/api_op_TagResource.go +++ b/service/iotsecuretunneling/api_op_TagResource.go @@ -5,7 +5,6 @@ package iotsecuretunneling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsecuretunneling/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsecuretunneling/api_op_UntagResource.go b/service/iotsecuretunneling/api_op_UntagResource.go index 03cb100ef28..45ac19e31a6 100644 --- a/service/iotsecuretunneling/api_op_UntagResource.go +++ b/service/iotsecuretunneling/api_op_UntagResource.go @@ -5,7 +5,6 @@ package iotsecuretunneling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsecuretunneling/endpoints.go b/service/iotsecuretunneling/endpoints.go index a831b38209d..f6c137f17a1 100644 --- a/service/iotsecuretunneling/endpoints.go +++ b/service/iotsecuretunneling/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/iotsitewise/api_client.go b/service/iotsitewise/api_client.go index 5c72e78e66a..c8b7d15af19 100644 --- a/service/iotsitewise/api_client.go +++ b/service/iotsitewise/api_client.go @@ -93,34 +93,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -193,6 +165,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/iotsitewise/api_op_AssociateAssets.go b/service/iotsitewise/api_op_AssociateAssets.go index 64fdbabb5c0..b630a8fe6e0 100644 --- a/service/iotsitewise/api_op_AssociateAssets.go +++ b/service/iotsitewise/api_op_AssociateAssets.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) AssociateAssets(ctx context.Context, params *AssociateAssetsInp addawsRestjson1_serdeOpAssociateAssetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_BatchAssociateProjectAssets.go b/service/iotsitewise/api_op_BatchAssociateProjectAssets.go index fc84a4ec0de..08eee271c59 100644 --- a/service/iotsitewise/api_op_BatchAssociateProjectAssets.go +++ b/service/iotsitewise/api_op_BatchAssociateProjectAssets.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) BatchAssociateProjectAssets(ctx context.Context, params *BatchA addawsRestjson1_serdeOpBatchAssociateProjectAssetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_BatchDisassociateProjectAssets.go b/service/iotsitewise/api_op_BatchDisassociateProjectAssets.go index 3dcd78e06dc..b457b9853ac 100644 --- a/service/iotsitewise/api_op_BatchDisassociateProjectAssets.go +++ b/service/iotsitewise/api_op_BatchDisassociateProjectAssets.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) BatchDisassociateProjectAssets(ctx context.Context, params *Bat addawsRestjson1_serdeOpBatchDisassociateProjectAssetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_BatchPutAssetPropertyValue.go b/service/iotsitewise/api_op_BatchPutAssetPropertyValue.go index cca17c91441..a7a329cd80a 100644 --- a/service/iotsitewise/api_op_BatchPutAssetPropertyValue.go +++ b/service/iotsitewise/api_op_BatchPutAssetPropertyValue.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) BatchPutAssetPropertyValue(ctx context.Context, params *BatchPu addawsRestjson1_serdeOpBatchPutAssetPropertyValueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_CreateAccessPolicy.go b/service/iotsitewise/api_op_CreateAccessPolicy.go index 0802575f69f..4461a9301bf 100644 --- a/service/iotsitewise/api_op_CreateAccessPolicy.go +++ b/service/iotsitewise/api_op_CreateAccessPolicy.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateAccessPolicy(ctx context.Context, params *CreateAccessPol addawsRestjson1_serdeOpCreateAccessPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_CreateAsset.go b/service/iotsitewise/api_op_CreateAsset.go index 5133a10fcea..866a9f7e0fe 100644 --- a/service/iotsitewise/api_op_CreateAsset.go +++ b/service/iotsitewise/api_op_CreateAsset.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateAsset(ctx context.Context, params *CreateAssetInput, optF addawsRestjson1_serdeOpCreateAssetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_CreateAssetModel.go b/service/iotsitewise/api_op_CreateAssetModel.go index 442de355c55..6eb9bddcd61 100644 --- a/service/iotsitewise/api_op_CreateAssetModel.go +++ b/service/iotsitewise/api_op_CreateAssetModel.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateAssetModel(ctx context.Context, params *CreateAssetModelI addawsRestjson1_serdeOpCreateAssetModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_CreateDashboard.go b/service/iotsitewise/api_op_CreateDashboard.go index d0a0557381c..2ac50dbcc77 100644 --- a/service/iotsitewise/api_op_CreateDashboard.go +++ b/service/iotsitewise/api_op_CreateDashboard.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateDashboard(ctx context.Context, params *CreateDashboardInp addawsRestjson1_serdeOpCreateDashboardMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_CreateGateway.go b/service/iotsitewise/api_op_CreateGateway.go index c8e520e50e9..13f7aecde83 100644 --- a/service/iotsitewise/api_op_CreateGateway.go +++ b/service/iotsitewise/api_op_CreateGateway.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateGateway(ctx context.Context, params *CreateGatewayInput, addawsRestjson1_serdeOpCreateGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_CreatePortal.go b/service/iotsitewise/api_op_CreatePortal.go index fcadb466644..0a10eba7a33 100644 --- a/service/iotsitewise/api_op_CreatePortal.go +++ b/service/iotsitewise/api_op_CreatePortal.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) CreatePortal(ctx context.Context, params *CreatePortalInput, op addawsRestjson1_serdeOpCreatePortalMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_CreateProject.go b/service/iotsitewise/api_op_CreateProject.go index db22b1e1ccd..b8eb67ddea2 100644 --- a/service/iotsitewise/api_op_CreateProject.go +++ b/service/iotsitewise/api_op_CreateProject.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateProject(ctx context.Context, params *CreateProjectInput, addawsRestjson1_serdeOpCreateProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_DeleteAccessPolicy.go b/service/iotsitewise/api_op_DeleteAccessPolicy.go index 8197cf79336..f34a6f696d3 100644 --- a/service/iotsitewise/api_op_DeleteAccessPolicy.go +++ b/service/iotsitewise/api_op_DeleteAccessPolicy.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteAccessPolicy(ctx context.Context, params *DeleteAccessPol addawsRestjson1_serdeOpDeleteAccessPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_DeleteAsset.go b/service/iotsitewise/api_op_DeleteAsset.go index d77a9e50025..b506e8b4ade 100644 --- a/service/iotsitewise/api_op_DeleteAsset.go +++ b/service/iotsitewise/api_op_DeleteAsset.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DeleteAsset(ctx context.Context, params *DeleteAssetInput, optF addawsRestjson1_serdeOpDeleteAssetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_DeleteAssetModel.go b/service/iotsitewise/api_op_DeleteAssetModel.go index 2b8f6d85aad..8625d23fa70 100644 --- a/service/iotsitewise/api_op_DeleteAssetModel.go +++ b/service/iotsitewise/api_op_DeleteAssetModel.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DeleteAssetModel(ctx context.Context, params *DeleteAssetModelI addawsRestjson1_serdeOpDeleteAssetModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_DeleteDashboard.go b/service/iotsitewise/api_op_DeleteDashboard.go index 382b3a30175..b9ace2b294e 100644 --- a/service/iotsitewise/api_op_DeleteDashboard.go +++ b/service/iotsitewise/api_op_DeleteDashboard.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDashboard(ctx context.Context, params *DeleteDashboardInp addawsRestjson1_serdeOpDeleteDashboardMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_DeleteGateway.go b/service/iotsitewise/api_op_DeleteGateway.go index aecf360b369..26371ca2349 100644 --- a/service/iotsitewise/api_op_DeleteGateway.go +++ b/service/iotsitewise/api_op_DeleteGateway.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteGateway(ctx context.Context, params *DeleteGatewayInput, addawsRestjson1_serdeOpDeleteGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_DeletePortal.go b/service/iotsitewise/api_op_DeletePortal.go index 8e72adc7ef2..cd3dbcd28c6 100644 --- a/service/iotsitewise/api_op_DeletePortal.go +++ b/service/iotsitewise/api_op_DeletePortal.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeletePortal(ctx context.Context, params *DeletePortalInput, op addawsRestjson1_serdeOpDeletePortalMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_DeleteProject.go b/service/iotsitewise/api_op_DeleteProject.go index 67c17dbd02d..bdbc36c9f02 100644 --- a/service/iotsitewise/api_op_DeleteProject.go +++ b/service/iotsitewise/api_op_DeleteProject.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteProject(ctx context.Context, params *DeleteProjectInput, addawsRestjson1_serdeOpDeleteProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_DescribeAccessPolicy.go b/service/iotsitewise/api_op_DescribeAccessPolicy.go index ea4a467b234..e138184a002 100644 --- a/service/iotsitewise/api_op_DescribeAccessPolicy.go +++ b/service/iotsitewise/api_op_DescribeAccessPolicy.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeAccessPolicy(ctx context.Context, params *DescribeAcces addawsRestjson1_serdeOpDescribeAccessPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_DescribeAsset.go b/service/iotsitewise/api_op_DescribeAsset.go index 97868e2b766..f210c7f73e0 100644 --- a/service/iotsitewise/api_op_DescribeAsset.go +++ b/service/iotsitewise/api_op_DescribeAsset.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAsset(ctx context.Context, params *DescribeAssetInput, addawsRestjson1_serdeOpDescribeAssetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_DescribeAssetModel.go b/service/iotsitewise/api_op_DescribeAssetModel.go index 5bfe66e311f..99e0af3c3b1 100644 --- a/service/iotsitewise/api_op_DescribeAssetModel.go +++ b/service/iotsitewise/api_op_DescribeAssetModel.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAssetModel(ctx context.Context, params *DescribeAssetMo addawsRestjson1_serdeOpDescribeAssetModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_DescribeAssetProperty.go b/service/iotsitewise/api_op_DescribeAssetProperty.go index cf618cf1894..ada5b6d726f 100644 --- a/service/iotsitewise/api_op_DescribeAssetProperty.go +++ b/service/iotsitewise/api_op_DescribeAssetProperty.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeAssetProperty(ctx context.Context, params *DescribeAsse addawsRestjson1_serdeOpDescribeAssetPropertyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_DescribeDashboard.go b/service/iotsitewise/api_op_DescribeDashboard.go index cf5f9d5b6bb..1d2de5b294e 100644 --- a/service/iotsitewise/api_op_DescribeDashboard.go +++ b/service/iotsitewise/api_op_DescribeDashboard.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DescribeDashboard(ctx context.Context, params *DescribeDashboar addawsRestjson1_serdeOpDescribeDashboardMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_DescribeGateway.go b/service/iotsitewise/api_op_DescribeGateway.go index 4bcaa9cf54e..5c654976e9f 100644 --- a/service/iotsitewise/api_op_DescribeGateway.go +++ b/service/iotsitewise/api_op_DescribeGateway.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeGateway(ctx context.Context, params *DescribeGatewayInp addawsRestjson1_serdeOpDescribeGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_DescribeGatewayCapabilityConfiguration.go b/service/iotsitewise/api_op_DescribeGatewayCapabilityConfiguration.go index 1d6e6a4671f..7f0238985c8 100644 --- a/service/iotsitewise/api_op_DescribeGatewayCapabilityConfiguration.go +++ b/service/iotsitewise/api_op_DescribeGatewayCapabilityConfiguration.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeGatewayCapabilityConfiguration(ctx context.Context, par addawsRestjson1_serdeOpDescribeGatewayCapabilityConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_DescribeLoggingOptions.go b/service/iotsitewise/api_op_DescribeLoggingOptions.go index 9332e46a2c4..a8e8e285113 100644 --- a/service/iotsitewise/api_op_DescribeLoggingOptions.go +++ b/service/iotsitewise/api_op_DescribeLoggingOptions.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeLoggingOptions(ctx context.Context, params *DescribeLog addawsRestjson1_serdeOpDescribeLoggingOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_DescribePortal.go b/service/iotsitewise/api_op_DescribePortal.go index c07e6e1bf20..64ad705657a 100644 --- a/service/iotsitewise/api_op_DescribePortal.go +++ b/service/iotsitewise/api_op_DescribePortal.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribePortal(ctx context.Context, params *DescribePortalInput addawsRestjson1_serdeOpDescribePortalMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_DescribeProject.go b/service/iotsitewise/api_op_DescribeProject.go index 88cd72590bf..7ff54bc50ee 100644 --- a/service/iotsitewise/api_op_DescribeProject.go +++ b/service/iotsitewise/api_op_DescribeProject.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DescribeProject(ctx context.Context, params *DescribeProjectInp addawsRestjson1_serdeOpDescribeProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_DisassociateAssets.go b/service/iotsitewise/api_op_DisassociateAssets.go index 924cded5c7e..3b2cc956e2b 100644 --- a/service/iotsitewise/api_op_DisassociateAssets.go +++ b/service/iotsitewise/api_op_DisassociateAssets.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DisassociateAssets(ctx context.Context, params *DisassociateAss addawsRestjson1_serdeOpDisassociateAssetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_GetAssetPropertyAggregates.go b/service/iotsitewise/api_op_GetAssetPropertyAggregates.go index d10d839d872..e86c9b09f46 100644 --- a/service/iotsitewise/api_op_GetAssetPropertyAggregates.go +++ b/service/iotsitewise/api_op_GetAssetPropertyAggregates.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) GetAssetPropertyAggregates(ctx context.Context, params *GetAsse addawsRestjson1_serdeOpGetAssetPropertyAggregatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_GetAssetPropertyValue.go b/service/iotsitewise/api_op_GetAssetPropertyValue.go index 35c0911895a..ca4898b250f 100644 --- a/service/iotsitewise/api_op_GetAssetPropertyValue.go +++ b/service/iotsitewise/api_op_GetAssetPropertyValue.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) GetAssetPropertyValue(ctx context.Context, params *GetAssetProp addawsRestjson1_serdeOpGetAssetPropertyValueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_GetAssetPropertyValueHistory.go b/service/iotsitewise/api_op_GetAssetPropertyValueHistory.go index 6fcdf76e5f9..33312d195f8 100644 --- a/service/iotsitewise/api_op_GetAssetPropertyValueHistory.go +++ b/service/iotsitewise/api_op_GetAssetPropertyValueHistory.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) GetAssetPropertyValueHistory(ctx context.Context, params *GetAs addawsRestjson1_serdeOpGetAssetPropertyValueHistoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_ListAccessPolicies.go b/service/iotsitewise/api_op_ListAccessPolicies.go index 4576dfcf653..5a4978d1004 100644 --- a/service/iotsitewise/api_op_ListAccessPolicies.go +++ b/service/iotsitewise/api_op_ListAccessPolicies.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListAccessPolicies(ctx context.Context, params *ListAccessPolic addawsRestjson1_serdeOpListAccessPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_ListAssetModels.go b/service/iotsitewise/api_op_ListAssetModels.go index 8d21374da70..9e26dfa644c 100644 --- a/service/iotsitewise/api_op_ListAssetModels.go +++ b/service/iotsitewise/api_op_ListAssetModels.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListAssetModels(ctx context.Context, params *ListAssetModelsInp addawsRestjson1_serdeOpListAssetModelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_ListAssets.go b/service/iotsitewise/api_op_ListAssets.go index 6f03790d94f..79752c4a668 100644 --- a/service/iotsitewise/api_op_ListAssets.go +++ b/service/iotsitewise/api_op_ListAssets.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) ListAssets(ctx context.Context, params *ListAssetsInput, optFns addawsRestjson1_serdeOpListAssetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_ListAssociatedAssets.go b/service/iotsitewise/api_op_ListAssociatedAssets.go index 4bc8a2ef651..fca561cf82c 100644 --- a/service/iotsitewise/api_op_ListAssociatedAssets.go +++ b/service/iotsitewise/api_op_ListAssociatedAssets.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListAssociatedAssets(ctx context.Context, params *ListAssociate addawsRestjson1_serdeOpListAssociatedAssetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_ListDashboards.go b/service/iotsitewise/api_op_ListDashboards.go index a1a3369cc41..90b541a19e2 100644 --- a/service/iotsitewise/api_op_ListDashboards.go +++ b/service/iotsitewise/api_op_ListDashboards.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListDashboards(ctx context.Context, params *ListDashboardsInput addawsRestjson1_serdeOpListDashboardsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_ListGateways.go b/service/iotsitewise/api_op_ListGateways.go index e828d8b38ee..0817f7a4e7b 100644 --- a/service/iotsitewise/api_op_ListGateways.go +++ b/service/iotsitewise/api_op_ListGateways.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListGateways(ctx context.Context, params *ListGatewaysInput, op addawsRestjson1_serdeOpListGatewaysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_ListPortals.go b/service/iotsitewise/api_op_ListPortals.go index e6c9f49aecf..128c9a9bf8b 100644 --- a/service/iotsitewise/api_op_ListPortals.go +++ b/service/iotsitewise/api_op_ListPortals.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListPortals(ctx context.Context, params *ListPortalsInput, optF addawsRestjson1_serdeOpListPortalsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_ListProjectAssets.go b/service/iotsitewise/api_op_ListProjectAssets.go index 74a63b48b0a..0809c36de58 100644 --- a/service/iotsitewise/api_op_ListProjectAssets.go +++ b/service/iotsitewise/api_op_ListProjectAssets.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ListProjectAssets(ctx context.Context, params *ListProjectAsset addawsRestjson1_serdeOpListProjectAssetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_ListProjects.go b/service/iotsitewise/api_op_ListProjects.go index d8c42dff9f4..739d66e89c7 100644 --- a/service/iotsitewise/api_op_ListProjects.go +++ b/service/iotsitewise/api_op_ListProjects.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListProjects(ctx context.Context, params *ListProjectsInput, op addawsRestjson1_serdeOpListProjectsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_ListTagsForResource.go b/service/iotsitewise/api_op_ListTagsForResource.go index 63dc5683f76..0d9d3cf4644 100644 --- a/service/iotsitewise/api_op_ListTagsForResource.go +++ b/service/iotsitewise/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_PutLoggingOptions.go b/service/iotsitewise/api_op_PutLoggingOptions.go index fc44873c726..da8c184700f 100644 --- a/service/iotsitewise/api_op_PutLoggingOptions.go +++ b/service/iotsitewise/api_op_PutLoggingOptions.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutLoggingOptions(ctx context.Context, params *PutLoggingOption addawsRestjson1_serdeOpPutLoggingOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_TagResource.go b/service/iotsitewise/api_op_TagResource.go index bd4abe99197..aa01a25e989 100644 --- a/service/iotsitewise/api_op_TagResource.go +++ b/service/iotsitewise/api_op_TagResource.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_UntagResource.go b/service/iotsitewise/api_op_UntagResource.go index a2474d42649..ce0a01738cf 100644 --- a/service/iotsitewise/api_op_UntagResource.go +++ b/service/iotsitewise/api_op_UntagResource.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_UpdateAccessPolicy.go b/service/iotsitewise/api_op_UpdateAccessPolicy.go index fbc96c72cba..643606ade16 100644 --- a/service/iotsitewise/api_op_UpdateAccessPolicy.go +++ b/service/iotsitewise/api_op_UpdateAccessPolicy.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateAccessPolicy(ctx context.Context, params *UpdateAccessPol addawsRestjson1_serdeOpUpdateAccessPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_UpdateAsset.go b/service/iotsitewise/api_op_UpdateAsset.go index 114bcaf5f6b..5d1a94c7619 100644 --- a/service/iotsitewise/api_op_UpdateAsset.go +++ b/service/iotsitewise/api_op_UpdateAsset.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateAsset(ctx context.Context, params *UpdateAssetInput, optF addawsRestjson1_serdeOpUpdateAssetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_UpdateAssetModel.go b/service/iotsitewise/api_op_UpdateAssetModel.go index 4bf0eb36c42..9723a09796a 100644 --- a/service/iotsitewise/api_op_UpdateAssetModel.go +++ b/service/iotsitewise/api_op_UpdateAssetModel.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) UpdateAssetModel(ctx context.Context, params *UpdateAssetModelI addawsRestjson1_serdeOpUpdateAssetModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_UpdateAssetProperty.go b/service/iotsitewise/api_op_UpdateAssetProperty.go index f57007f71ee..045d27b3539 100644 --- a/service/iotsitewise/api_op_UpdateAssetProperty.go +++ b/service/iotsitewise/api_op_UpdateAssetProperty.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) UpdateAssetProperty(ctx context.Context, params *UpdateAssetPro addawsRestjson1_serdeOpUpdateAssetPropertyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_UpdateDashboard.go b/service/iotsitewise/api_op_UpdateDashboard.go index 0eb47fd1238..0bc94fd9450 100644 --- a/service/iotsitewise/api_op_UpdateDashboard.go +++ b/service/iotsitewise/api_op_UpdateDashboard.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpdateDashboard(ctx context.Context, params *UpdateDashboardInp addawsRestjson1_serdeOpUpdateDashboardMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_UpdateGateway.go b/service/iotsitewise/api_op_UpdateGateway.go index 197b7846803..0de8f4327f8 100644 --- a/service/iotsitewise/api_op_UpdateGateway.go +++ b/service/iotsitewise/api_op_UpdateGateway.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateGateway(ctx context.Context, params *UpdateGatewayInput, addawsRestjson1_serdeOpUpdateGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_UpdateGatewayCapabilityConfiguration.go b/service/iotsitewise/api_op_UpdateGatewayCapabilityConfiguration.go index 1af84641457..6cc2ad90127 100644 --- a/service/iotsitewise/api_op_UpdateGatewayCapabilityConfiguration.go +++ b/service/iotsitewise/api_op_UpdateGatewayCapabilityConfiguration.go @@ -5,7 +5,6 @@ package iotsitewise import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) UpdateGatewayCapabilityConfiguration(ctx context.Context, param addawsRestjson1_serdeOpUpdateGatewayCapabilityConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_UpdatePortal.go b/service/iotsitewise/api_op_UpdatePortal.go index 96dd4b3749d..70b5e8bf2ba 100644 --- a/service/iotsitewise/api_op_UpdatePortal.go +++ b/service/iotsitewise/api_op_UpdatePortal.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotsitewise/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdatePortal(ctx context.Context, params *UpdatePortalInput, op addawsRestjson1_serdeOpUpdatePortalMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/api_op_UpdateProject.go b/service/iotsitewise/api_op_UpdateProject.go index bd9b17b13b6..37d72642de0 100644 --- a/service/iotsitewise/api_op_UpdateProject.go +++ b/service/iotsitewise/api_op_UpdateProject.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpdateProject(ctx context.Context, params *UpdateProjectInput, addawsRestjson1_serdeOpUpdateProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotsitewise/endpoints.go b/service/iotsitewise/endpoints.go index 148651e377a..339bf38829d 100644 --- a/service/iotsitewise/endpoints.go +++ b/service/iotsitewise/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/iotthingsgraph/api_client.go b/service/iotthingsgraph/api_client.go index 78db7bf18ec..21c6f12d2c1 100644 --- a/service/iotthingsgraph/api_client.go +++ b/service/iotthingsgraph/api_client.go @@ -83,30 +83,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -172,6 +148,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/iotthingsgraph/api_op_AssociateEntityToThing.go b/service/iotthingsgraph/api_op_AssociateEntityToThing.go index 00f78590401..27bf2b4578c 100644 --- a/service/iotthingsgraph/api_op_AssociateEntityToThing.go +++ b/service/iotthingsgraph/api_op_AssociateEntityToThing.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) AssociateEntityToThing(ctx context.Context, params *AssociateEn addawsAwsjson11_serdeOpAssociateEntityToThingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_CreateFlowTemplate.go b/service/iotthingsgraph/api_op_CreateFlowTemplate.go index 76faed4480c..d5f825cd61c 100644 --- a/service/iotthingsgraph/api_op_CreateFlowTemplate.go +++ b/service/iotthingsgraph/api_op_CreateFlowTemplate.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateFlowTemplate(ctx context.Context, params *CreateFlowTempl addawsAwsjson11_serdeOpCreateFlowTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_CreateSystemInstance.go b/service/iotthingsgraph/api_op_CreateSystemInstance.go index 04bce7ed0ad..268d808b092 100644 --- a/service/iotthingsgraph/api_op_CreateSystemInstance.go +++ b/service/iotthingsgraph/api_op_CreateSystemInstance.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) CreateSystemInstance(ctx context.Context, params *CreateSystemI addawsAwsjson11_serdeOpCreateSystemInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_CreateSystemTemplate.go b/service/iotthingsgraph/api_op_CreateSystemTemplate.go index 4be004184f3..02687ae3909 100644 --- a/service/iotthingsgraph/api_op_CreateSystemTemplate.go +++ b/service/iotthingsgraph/api_op_CreateSystemTemplate.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateSystemTemplate(ctx context.Context, params *CreateSystemT addawsAwsjson11_serdeOpCreateSystemTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_DeleteFlowTemplate.go b/service/iotthingsgraph/api_op_DeleteFlowTemplate.go index 623f6f9354a..9522e52f77e 100644 --- a/service/iotthingsgraph/api_op_DeleteFlowTemplate.go +++ b/service/iotthingsgraph/api_op_DeleteFlowTemplate.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteFlowTemplate(ctx context.Context, params *DeleteFlowTempl addawsAwsjson11_serdeOpDeleteFlowTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_DeleteNamespace.go b/service/iotthingsgraph/api_op_DeleteNamespace.go index 272c269afd7..b75f9e1203e 100644 --- a/service/iotthingsgraph/api_op_DeleteNamespace.go +++ b/service/iotthingsgraph/api_op_DeleteNamespace.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteNamespace(ctx context.Context, params *DeleteNamespaceInp addawsAwsjson11_serdeOpDeleteNamespaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_DeleteSystemInstance.go b/service/iotthingsgraph/api_op_DeleteSystemInstance.go index 2fc98a778cb..45b9dcabed5 100644 --- a/service/iotthingsgraph/api_op_DeleteSystemInstance.go +++ b/service/iotthingsgraph/api_op_DeleteSystemInstance.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteSystemInstance(ctx context.Context, params *DeleteSystemI addawsAwsjson11_serdeOpDeleteSystemInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_DeleteSystemTemplate.go b/service/iotthingsgraph/api_op_DeleteSystemTemplate.go index 60de220f294..9b754d7fbf5 100644 --- a/service/iotthingsgraph/api_op_DeleteSystemTemplate.go +++ b/service/iotthingsgraph/api_op_DeleteSystemTemplate.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteSystemTemplate(ctx context.Context, params *DeleteSystemT addawsAwsjson11_serdeOpDeleteSystemTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_DeploySystemInstance.go b/service/iotthingsgraph/api_op_DeploySystemInstance.go index a6aa642e10c..90c16488f76 100644 --- a/service/iotthingsgraph/api_op_DeploySystemInstance.go +++ b/service/iotthingsgraph/api_op_DeploySystemInstance.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) DeploySystemInstance(ctx context.Context, params *DeploySystemI addawsAwsjson11_serdeOpDeploySystemInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_DeprecateFlowTemplate.go b/service/iotthingsgraph/api_op_DeprecateFlowTemplate.go index 355b2cc3369..fd05d932046 100644 --- a/service/iotthingsgraph/api_op_DeprecateFlowTemplate.go +++ b/service/iotthingsgraph/api_op_DeprecateFlowTemplate.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeprecateFlowTemplate(ctx context.Context, params *DeprecateFlo addawsAwsjson11_serdeOpDeprecateFlowTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_DeprecateSystemTemplate.go b/service/iotthingsgraph/api_op_DeprecateSystemTemplate.go index 735aa042558..de095993c8e 100644 --- a/service/iotthingsgraph/api_op_DeprecateSystemTemplate.go +++ b/service/iotthingsgraph/api_op_DeprecateSystemTemplate.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeprecateSystemTemplate(ctx context.Context, params *DeprecateS addawsAwsjson11_serdeOpDeprecateSystemTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_DescribeNamespace.go b/service/iotthingsgraph/api_op_DescribeNamespace.go index 50020ba71c4..be1097edf8d 100644 --- a/service/iotthingsgraph/api_op_DescribeNamespace.go +++ b/service/iotthingsgraph/api_op_DescribeNamespace.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DescribeNamespace(ctx context.Context, params *DescribeNamespac addawsAwsjson11_serdeOpDescribeNamespaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_DissociateEntityFromThing.go b/service/iotthingsgraph/api_op_DissociateEntityFromThing.go index c67ddbd8327..0c14f87d8c4 100644 --- a/service/iotthingsgraph/api_op_DissociateEntityFromThing.go +++ b/service/iotthingsgraph/api_op_DissociateEntityFromThing.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DissociateEntityFromThing(ctx context.Context, params *Dissocia addawsAwsjson11_serdeOpDissociateEntityFromThingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_GetEntities.go b/service/iotthingsgraph/api_op_GetEntities.go index a698bd292a4..dc368f50267 100644 --- a/service/iotthingsgraph/api_op_GetEntities.go +++ b/service/iotthingsgraph/api_op_GetEntities.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) GetEntities(ctx context.Context, params *GetEntitiesInput, optF addawsAwsjson11_serdeOpGetEntitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_GetFlowTemplate.go b/service/iotthingsgraph/api_op_GetFlowTemplate.go index 7d4761692fe..101ae6d96d4 100644 --- a/service/iotthingsgraph/api_op_GetFlowTemplate.go +++ b/service/iotthingsgraph/api_op_GetFlowTemplate.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetFlowTemplate(ctx context.Context, params *GetFlowTemplateInp addawsAwsjson11_serdeOpGetFlowTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_GetFlowTemplateRevisions.go b/service/iotthingsgraph/api_op_GetFlowTemplateRevisions.go index 96cb1af77c6..8d9c85bfc80 100644 --- a/service/iotthingsgraph/api_op_GetFlowTemplateRevisions.go +++ b/service/iotthingsgraph/api_op_GetFlowTemplateRevisions.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetFlowTemplateRevisions(ctx context.Context, params *GetFlowTe addawsAwsjson11_serdeOpGetFlowTemplateRevisionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_GetNamespaceDeletionStatus.go b/service/iotthingsgraph/api_op_GetNamespaceDeletionStatus.go index 4c670f1f754..3035be1ee5e 100644 --- a/service/iotthingsgraph/api_op_GetNamespaceDeletionStatus.go +++ b/service/iotthingsgraph/api_op_GetNamespaceDeletionStatus.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetNamespaceDeletionStatus(ctx context.Context, params *GetName addawsAwsjson11_serdeOpGetNamespaceDeletionStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_GetSystemInstance.go b/service/iotthingsgraph/api_op_GetSystemInstance.go index 759f5e6bc98..b5d4300044a 100644 --- a/service/iotthingsgraph/api_op_GetSystemInstance.go +++ b/service/iotthingsgraph/api_op_GetSystemInstance.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetSystemInstance(ctx context.Context, params *GetSystemInstanc addawsAwsjson11_serdeOpGetSystemInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_GetSystemTemplate.go b/service/iotthingsgraph/api_op_GetSystemTemplate.go index 1b1be17981c..e219c876fff 100644 --- a/service/iotthingsgraph/api_op_GetSystemTemplate.go +++ b/service/iotthingsgraph/api_op_GetSystemTemplate.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetSystemTemplate(ctx context.Context, params *GetSystemTemplat addawsAwsjson11_serdeOpGetSystemTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_GetSystemTemplateRevisions.go b/service/iotthingsgraph/api_op_GetSystemTemplateRevisions.go index 10f1e79b3a0..43f7e88cab8 100644 --- a/service/iotthingsgraph/api_op_GetSystemTemplateRevisions.go +++ b/service/iotthingsgraph/api_op_GetSystemTemplateRevisions.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetSystemTemplateRevisions(ctx context.Context, params *GetSyst addawsAwsjson11_serdeOpGetSystemTemplateRevisionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_GetUploadStatus.go b/service/iotthingsgraph/api_op_GetUploadStatus.go index 3d198b693a0..22e9b96e810 100644 --- a/service/iotthingsgraph/api_op_GetUploadStatus.go +++ b/service/iotthingsgraph/api_op_GetUploadStatus.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetUploadStatus(ctx context.Context, params *GetUploadStatusInp addawsAwsjson11_serdeOpGetUploadStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_ListFlowExecutionMessages.go b/service/iotthingsgraph/api_op_ListFlowExecutionMessages.go index 6ad9a3a3171..304583852e8 100644 --- a/service/iotthingsgraph/api_op_ListFlowExecutionMessages.go +++ b/service/iotthingsgraph/api_op_ListFlowExecutionMessages.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListFlowExecutionMessages(ctx context.Context, params *ListFlow addawsAwsjson11_serdeOpListFlowExecutionMessagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_ListTagsForResource.go b/service/iotthingsgraph/api_op_ListTagsForResource.go index b12d78bb86e..ba983c353de 100644 --- a/service/iotthingsgraph/api_op_ListTagsForResource.go +++ b/service/iotthingsgraph/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_SearchEntities.go b/service/iotthingsgraph/api_op_SearchEntities.go index cf040c4e687..2cf9580473d 100644 --- a/service/iotthingsgraph/api_op_SearchEntities.go +++ b/service/iotthingsgraph/api_op_SearchEntities.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) SearchEntities(ctx context.Context, params *SearchEntitiesInput addawsAwsjson11_serdeOpSearchEntitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_SearchFlowExecutions.go b/service/iotthingsgraph/api_op_SearchFlowExecutions.go index 669b895d88f..0b0cced2eea 100644 --- a/service/iotthingsgraph/api_op_SearchFlowExecutions.go +++ b/service/iotthingsgraph/api_op_SearchFlowExecutions.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) SearchFlowExecutions(ctx context.Context, params *SearchFlowExe addawsAwsjson11_serdeOpSearchFlowExecutionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_SearchFlowTemplates.go b/service/iotthingsgraph/api_op_SearchFlowTemplates.go index daf35b6b726..6a5ead28a00 100644 --- a/service/iotthingsgraph/api_op_SearchFlowTemplates.go +++ b/service/iotthingsgraph/api_op_SearchFlowTemplates.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SearchFlowTemplates(ctx context.Context, params *SearchFlowTemp addawsAwsjson11_serdeOpSearchFlowTemplatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_SearchSystemInstances.go b/service/iotthingsgraph/api_op_SearchSystemInstances.go index d01215c7a14..7e04d9b3c8d 100644 --- a/service/iotthingsgraph/api_op_SearchSystemInstances.go +++ b/service/iotthingsgraph/api_op_SearchSystemInstances.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SearchSystemInstances(ctx context.Context, params *SearchSystem addawsAwsjson11_serdeOpSearchSystemInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_SearchSystemTemplates.go b/service/iotthingsgraph/api_op_SearchSystemTemplates.go index 7687b73bac5..3742932968f 100644 --- a/service/iotthingsgraph/api_op_SearchSystemTemplates.go +++ b/service/iotthingsgraph/api_op_SearchSystemTemplates.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) SearchSystemTemplates(ctx context.Context, params *SearchSystem addawsAwsjson11_serdeOpSearchSystemTemplatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_SearchThings.go b/service/iotthingsgraph/api_op_SearchThings.go index 9ba22d5d63e..1e8417ef851 100644 --- a/service/iotthingsgraph/api_op_SearchThings.go +++ b/service/iotthingsgraph/api_op_SearchThings.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) SearchThings(ctx context.Context, params *SearchThingsInput, op addawsAwsjson11_serdeOpSearchThingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_TagResource.go b/service/iotthingsgraph/api_op_TagResource.go index 14c433334d9..34e535ace76 100644 --- a/service/iotthingsgraph/api_op_TagResource.go +++ b/service/iotthingsgraph/api_op_TagResource.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_UndeploySystemInstance.go b/service/iotthingsgraph/api_op_UndeploySystemInstance.go index b07aa0df0d4..9832ddf0422 100644 --- a/service/iotthingsgraph/api_op_UndeploySystemInstance.go +++ b/service/iotthingsgraph/api_op_UndeploySystemInstance.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UndeploySystemInstance(ctx context.Context, params *UndeploySys addawsAwsjson11_serdeOpUndeploySystemInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_UntagResource.go b/service/iotthingsgraph/api_op_UntagResource.go index c2b6107bfaf..ea9bb3e9fa2 100644 --- a/service/iotthingsgraph/api_op_UntagResource.go +++ b/service/iotthingsgraph/api_op_UntagResource.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_UpdateFlowTemplate.go b/service/iotthingsgraph/api_op_UpdateFlowTemplate.go index 0edf69d9f0f..01d84069e04 100644 --- a/service/iotthingsgraph/api_op_UpdateFlowTemplate.go +++ b/service/iotthingsgraph/api_op_UpdateFlowTemplate.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateFlowTemplate(ctx context.Context, params *UpdateFlowTempl addawsAwsjson11_serdeOpUpdateFlowTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_UpdateSystemTemplate.go b/service/iotthingsgraph/api_op_UpdateSystemTemplate.go index cb8898fd261..425c03431c1 100644 --- a/service/iotthingsgraph/api_op_UpdateSystemTemplate.go +++ b/service/iotthingsgraph/api_op_UpdateSystemTemplate.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateSystemTemplate(ctx context.Context, params *UpdateSystemT addawsAwsjson11_serdeOpUpdateSystemTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/api_op_UploadEntityDefinitions.go b/service/iotthingsgraph/api_op_UploadEntityDefinitions.go index 7db792475bc..c4fa2cf03ad 100644 --- a/service/iotthingsgraph/api_op_UploadEntityDefinitions.go +++ b/service/iotthingsgraph/api_op_UploadEntityDefinitions.go @@ -5,7 +5,6 @@ package iotthingsgraph import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/iotthingsgraph/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) UploadEntityDefinitions(ctx context.Context, params *UploadEnti addawsAwsjson11_serdeOpUploadEntityDefinitionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/iotthingsgraph/endpoints.go b/service/iotthingsgraph/endpoints.go index b3a400c1682..114d9d27869 100644 --- a/service/iotthingsgraph/endpoints.go +++ b/service/iotthingsgraph/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/ivs/api_client.go b/service/ivs/api_client.go index c34a4787185..e0137110a4c 100644 --- a/service/ivs/api_client.go +++ b/service/ivs/api_client.go @@ -155,30 +155,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -244,6 +220,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/ivs/api_op_BatchGetChannel.go b/service/ivs/api_op_BatchGetChannel.go index 2b0bdc5d865..3b944952006 100644 --- a/service/ivs/api_op_BatchGetChannel.go +++ b/service/ivs/api_op_BatchGetChannel.go @@ -5,7 +5,6 @@ package ivs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ivs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchGetChannel(ctx context.Context, params *BatchGetChannelInp addawsRestjson1_serdeOpBatchGetChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ivs/api_op_BatchGetStreamKey.go b/service/ivs/api_op_BatchGetStreamKey.go index 6e927ea9bb6..c4bd23852b4 100644 --- a/service/ivs/api_op_BatchGetStreamKey.go +++ b/service/ivs/api_op_BatchGetStreamKey.go @@ -5,7 +5,6 @@ package ivs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ivs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchGetStreamKey(ctx context.Context, params *BatchGetStreamKe addawsRestjson1_serdeOpBatchGetStreamKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ivs/api_op_CreateChannel.go b/service/ivs/api_op_CreateChannel.go index 574ffc589d6..63f3ffab6b7 100644 --- a/service/ivs/api_op_CreateChannel.go +++ b/service/ivs/api_op_CreateChannel.go @@ -5,7 +5,6 @@ package ivs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ivs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateChannel(ctx context.Context, params *CreateChannelInput, addawsRestjson1_serdeOpCreateChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ivs/api_op_CreateStreamKey.go b/service/ivs/api_op_CreateStreamKey.go index dcac9f2612f..5c94a3265ac 100644 --- a/service/ivs/api_op_CreateStreamKey.go +++ b/service/ivs/api_op_CreateStreamKey.go @@ -5,7 +5,6 @@ package ivs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ivs/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateStreamKey(ctx context.Context, params *CreateStreamKeyInp addawsRestjson1_serdeOpCreateStreamKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ivs/api_op_DeleteChannel.go b/service/ivs/api_op_DeleteChannel.go index 1eecc723e28..c3097a1e95a 100644 --- a/service/ivs/api_op_DeleteChannel.go +++ b/service/ivs/api_op_DeleteChannel.go @@ -5,7 +5,6 @@ package ivs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteChannel(ctx context.Context, params *DeleteChannelInput, addawsRestjson1_serdeOpDeleteChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ivs/api_op_DeleteStreamKey.go b/service/ivs/api_op_DeleteStreamKey.go index 7423a4c730e..27b9be759d3 100644 --- a/service/ivs/api_op_DeleteStreamKey.go +++ b/service/ivs/api_op_DeleteStreamKey.go @@ -5,7 +5,6 @@ package ivs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteStreamKey(ctx context.Context, params *DeleteStreamKeyInp addawsRestjson1_serdeOpDeleteStreamKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ivs/api_op_GetChannel.go b/service/ivs/api_op_GetChannel.go index cfae1b168c0..00bc8aa1d2d 100644 --- a/service/ivs/api_op_GetChannel.go +++ b/service/ivs/api_op_GetChannel.go @@ -5,7 +5,6 @@ package ivs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ivs/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetChannel(ctx context.Context, params *GetChannelInput, optFns addawsRestjson1_serdeOpGetChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ivs/api_op_GetStream.go b/service/ivs/api_op_GetStream.go index 06e24509d24..6ace2dffc44 100644 --- a/service/ivs/api_op_GetStream.go +++ b/service/ivs/api_op_GetStream.go @@ -5,7 +5,6 @@ package ivs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ivs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetStream(ctx context.Context, params *GetStreamInput, optFns . addawsRestjson1_serdeOpGetStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ivs/api_op_GetStreamKey.go b/service/ivs/api_op_GetStreamKey.go index 3d37fa15687..5f43d2b3a1a 100644 --- a/service/ivs/api_op_GetStreamKey.go +++ b/service/ivs/api_op_GetStreamKey.go @@ -5,7 +5,6 @@ package ivs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ivs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetStreamKey(ctx context.Context, params *GetStreamKeyInput, op addawsRestjson1_serdeOpGetStreamKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ivs/api_op_ListChannels.go b/service/ivs/api_op_ListChannels.go index 45ad102e35c..1a50817470c 100644 --- a/service/ivs/api_op_ListChannels.go +++ b/service/ivs/api_op_ListChannels.go @@ -5,7 +5,6 @@ package ivs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ivs/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListChannels(ctx context.Context, params *ListChannelsInput, op addawsRestjson1_serdeOpListChannelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ivs/api_op_ListStreamKeys.go b/service/ivs/api_op_ListStreamKeys.go index 8713546907e..c789b3560c0 100644 --- a/service/ivs/api_op_ListStreamKeys.go +++ b/service/ivs/api_op_ListStreamKeys.go @@ -5,7 +5,6 @@ package ivs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ivs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListStreamKeys(ctx context.Context, params *ListStreamKeysInput addawsRestjson1_serdeOpListStreamKeysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ivs/api_op_ListStreams.go b/service/ivs/api_op_ListStreams.go index 9b0faf8851a..9726b530c03 100644 --- a/service/ivs/api_op_ListStreams.go +++ b/service/ivs/api_op_ListStreams.go @@ -5,7 +5,6 @@ package ivs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ivs/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListStreams(ctx context.Context, params *ListStreamsInput, optF addawsRestjson1_serdeOpListStreamsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ivs/api_op_ListTagsForResource.go b/service/ivs/api_op_ListTagsForResource.go index aa685e1526d..9eef4c57095 100644 --- a/service/ivs/api_op_ListTagsForResource.go +++ b/service/ivs/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package ivs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ivs/api_op_PutMetadata.go b/service/ivs/api_op_PutMetadata.go index bc2db71d503..af36f58c169 100644 --- a/service/ivs/api_op_PutMetadata.go +++ b/service/ivs/api_op_PutMetadata.go @@ -5,7 +5,6 @@ package ivs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) PutMetadata(ctx context.Context, params *PutMetadataInput, optF addawsRestjson1_serdeOpPutMetadataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ivs/api_op_StopStream.go b/service/ivs/api_op_StopStream.go index 1116bd58529..d515f64ebee 100644 --- a/service/ivs/api_op_StopStream.go +++ b/service/ivs/api_op_StopStream.go @@ -5,7 +5,6 @@ package ivs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) StopStream(ctx context.Context, params *StopStreamInput, optFns addawsRestjson1_serdeOpStopStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ivs/api_op_TagResource.go b/service/ivs/api_op_TagResource.go index 8e289b24ddd..7f0dafe7728 100644 --- a/service/ivs/api_op_TagResource.go +++ b/service/ivs/api_op_TagResource.go @@ -5,7 +5,6 @@ package ivs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ivs/api_op_UntagResource.go b/service/ivs/api_op_UntagResource.go index 8680d37504d..b736feccb0d 100644 --- a/service/ivs/api_op_UntagResource.go +++ b/service/ivs/api_op_UntagResource.go @@ -5,7 +5,6 @@ package ivs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ivs/api_op_UpdateChannel.go b/service/ivs/api_op_UpdateChannel.go index c2d7666758e..26a302584f3 100644 --- a/service/ivs/api_op_UpdateChannel.go +++ b/service/ivs/api_op_UpdateChannel.go @@ -5,7 +5,6 @@ package ivs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ivs/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateChannel(ctx context.Context, params *UpdateChannelInput, addawsRestjson1_serdeOpUpdateChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ivs/endpoints.go b/service/ivs/endpoints.go index fadc8f64ba5..d843c88a14f 100644 --- a/service/ivs/endpoints.go +++ b/service/ivs/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/kafka/api_client.go b/service/kafka/api_client.go index 4347375424c..9be3505e33c 100644 --- a/service/kafka/api_client.go +++ b/service/kafka/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/kafka/api_op_CreateCluster.go b/service/kafka/api_op_CreateCluster.go index e7082536782..f3020205d37 100644 --- a/service/kafka/api_op_CreateCluster.go +++ b/service/kafka/api_op_CreateCluster.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kafka/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateCluster(ctx context.Context, params *CreateClusterInput, addawsRestjson1_serdeOpCreateClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_CreateConfiguration.go b/service/kafka/api_op_CreateConfiguration.go index 6dd46e51fd7..0b18d93470f 100644 --- a/service/kafka/api_op_CreateConfiguration.go +++ b/service/kafka/api_op_CreateConfiguration.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kafka/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateConfiguration(ctx context.Context, params *CreateConfigur addawsRestjson1_serdeOpCreateConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_DeleteCluster.go b/service/kafka/api_op_DeleteCluster.go index 66ec9854d87..3ee68f71444 100644 --- a/service/kafka/api_op_DeleteCluster.go +++ b/service/kafka/api_op_DeleteCluster.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kafka/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteCluster(ctx context.Context, params *DeleteClusterInput, addawsRestjson1_serdeOpDeleteClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_DescribeCluster.go b/service/kafka/api_op_DescribeCluster.go index 972e2da8c37..2a835a1364d 100644 --- a/service/kafka/api_op_DescribeCluster.go +++ b/service/kafka/api_op_DescribeCluster.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kafka/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeCluster(ctx context.Context, params *DescribeClusterInp addawsRestjson1_serdeOpDescribeClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_DescribeClusterOperation.go b/service/kafka/api_op_DescribeClusterOperation.go index 1c8e2cef7a7..9e4fdb21c8a 100644 --- a/service/kafka/api_op_DescribeClusterOperation.go +++ b/service/kafka/api_op_DescribeClusterOperation.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kafka/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeClusterOperation(ctx context.Context, params *DescribeC addawsRestjson1_serdeOpDescribeClusterOperationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_DescribeConfiguration.go b/service/kafka/api_op_DescribeConfiguration.go index c0cdbadd79f..14e0ebed709 100644 --- a/service/kafka/api_op_DescribeConfiguration.go +++ b/service/kafka/api_op_DescribeConfiguration.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kafka/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeConfiguration(ctx context.Context, params *DescribeConf addawsRestjson1_serdeOpDescribeConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_DescribeConfigurationRevision.go b/service/kafka/api_op_DescribeConfigurationRevision.go index 9e726ce31bd..697fb1e09b5 100644 --- a/service/kafka/api_op_DescribeConfigurationRevision.go +++ b/service/kafka/api_op_DescribeConfigurationRevision.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DescribeConfigurationRevision(ctx context.Context, params *Desc addawsRestjson1_serdeOpDescribeConfigurationRevisionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_GetBootstrapBrokers.go b/service/kafka/api_op_GetBootstrapBrokers.go index efb95ab049e..c91bd54d25e 100644 --- a/service/kafka/api_op_GetBootstrapBrokers.go +++ b/service/kafka/api_op_GetBootstrapBrokers.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetBootstrapBrokers(ctx context.Context, params *GetBootstrapBr addawsRestjson1_serdeOpGetBootstrapBrokersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_GetCompatibleKafkaVersions.go b/service/kafka/api_op_GetCompatibleKafkaVersions.go index 28503e66531..392746a75cf 100644 --- a/service/kafka/api_op_GetCompatibleKafkaVersions.go +++ b/service/kafka/api_op_GetCompatibleKafkaVersions.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kafka/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetCompatibleKafkaVersions(ctx context.Context, params *GetComp addawsRestjson1_serdeOpGetCompatibleKafkaVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_ListClusterOperations.go b/service/kafka/api_op_ListClusterOperations.go index 64af41c8d26..305da7a8919 100644 --- a/service/kafka/api_op_ListClusterOperations.go +++ b/service/kafka/api_op_ListClusterOperations.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kafka/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListClusterOperations(ctx context.Context, params *ListClusterO addawsRestjson1_serdeOpListClusterOperationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_ListClusters.go b/service/kafka/api_op_ListClusters.go index ec98e3ea514..835b18334bb 100644 --- a/service/kafka/api_op_ListClusters.go +++ b/service/kafka/api_op_ListClusters.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kafka/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListClusters(ctx context.Context, params *ListClustersInput, op addawsRestjson1_serdeOpListClustersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_ListConfigurationRevisions.go b/service/kafka/api_op_ListConfigurationRevisions.go index 27b230d1714..20671969fa5 100644 --- a/service/kafka/api_op_ListConfigurationRevisions.go +++ b/service/kafka/api_op_ListConfigurationRevisions.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kafka/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListConfigurationRevisions(ctx context.Context, params *ListCon addawsRestjson1_serdeOpListConfigurationRevisionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_ListConfigurations.go b/service/kafka/api_op_ListConfigurations.go index bd69073dc32..b939fc0efa6 100644 --- a/service/kafka/api_op_ListConfigurations.go +++ b/service/kafka/api_op_ListConfigurations.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kafka/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListConfigurations(ctx context.Context, params *ListConfigurati addawsRestjson1_serdeOpListConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_ListKafkaVersions.go b/service/kafka/api_op_ListKafkaVersions.go index 0c22824cb6f..f847538df69 100644 --- a/service/kafka/api_op_ListKafkaVersions.go +++ b/service/kafka/api_op_ListKafkaVersions.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kafka/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListKafkaVersions(ctx context.Context, params *ListKafkaVersion addawsRestjson1_serdeOpListKafkaVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_ListNodes.go b/service/kafka/api_op_ListNodes.go index 3483a19a3ba..8c9dd39cd94 100644 --- a/service/kafka/api_op_ListNodes.go +++ b/service/kafka/api_op_ListNodes.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kafka/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListNodes(ctx context.Context, params *ListNodesInput, optFns . addawsRestjson1_serdeOpListNodesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_ListTagsForResource.go b/service/kafka/api_op_ListTagsForResource.go index 25c2f39440b..b5885ec2d70 100644 --- a/service/kafka/api_op_ListTagsForResource.go +++ b/service/kafka/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_RebootBroker.go b/service/kafka/api_op_RebootBroker.go index 9a13ba53833..5bd679e828b 100644 --- a/service/kafka/api_op_RebootBroker.go +++ b/service/kafka/api_op_RebootBroker.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RebootBroker(ctx context.Context, params *RebootBrokerInput, op addawsRestjson1_serdeOpRebootBrokerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_TagResource.go b/service/kafka/api_op_TagResource.go index dd759d595a8..97236a1e8bb 100644 --- a/service/kafka/api_op_TagResource.go +++ b/service/kafka/api_op_TagResource.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_UntagResource.go b/service/kafka/api_op_UntagResource.go index 0885411b55d..9127d89adb1 100644 --- a/service/kafka/api_op_UntagResource.go +++ b/service/kafka/api_op_UntagResource.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_UpdateBrokerCount.go b/service/kafka/api_op_UpdateBrokerCount.go index 37eff7535a8..15e318a7dd1 100644 --- a/service/kafka/api_op_UpdateBrokerCount.go +++ b/service/kafka/api_op_UpdateBrokerCount.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateBrokerCount(ctx context.Context, params *UpdateBrokerCoun addawsRestjson1_serdeOpUpdateBrokerCountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_UpdateBrokerStorage.go b/service/kafka/api_op_UpdateBrokerStorage.go index e18fe02d8e0..a75243cb928 100644 --- a/service/kafka/api_op_UpdateBrokerStorage.go +++ b/service/kafka/api_op_UpdateBrokerStorage.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kafka/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateBrokerStorage(ctx context.Context, params *UpdateBrokerSt addawsRestjson1_serdeOpUpdateBrokerStorageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_UpdateClusterConfiguration.go b/service/kafka/api_op_UpdateClusterConfiguration.go index f40d3a5121b..6f51d57dee1 100644 --- a/service/kafka/api_op_UpdateClusterConfiguration.go +++ b/service/kafka/api_op_UpdateClusterConfiguration.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kafka/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateClusterConfiguration(ctx context.Context, params *UpdateC addawsRestjson1_serdeOpUpdateClusterConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_UpdateClusterKafkaVersion.go b/service/kafka/api_op_UpdateClusterKafkaVersion.go index db8609db871..cc71c5e3176 100644 --- a/service/kafka/api_op_UpdateClusterKafkaVersion.go +++ b/service/kafka/api_op_UpdateClusterKafkaVersion.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kafka/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateClusterKafkaVersion(ctx context.Context, params *UpdateCl addawsRestjson1_serdeOpUpdateClusterKafkaVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/api_op_UpdateMonitoring.go b/service/kafka/api_op_UpdateMonitoring.go index 38cc3fb6e85..47d561e7e33 100644 --- a/service/kafka/api_op_UpdateMonitoring.go +++ b/service/kafka/api_op_UpdateMonitoring.go @@ -5,7 +5,6 @@ package kafka import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kafka/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateMonitoring(ctx context.Context, params *UpdateMonitoringI addawsRestjson1_serdeOpUpdateMonitoringMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kafka/endpoints.go b/service/kafka/endpoints.go index 9d0ef515816..28441c3d39f 100644 --- a/service/kafka/endpoints.go +++ b/service/kafka/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/kendra/api_client.go b/service/kendra/api_client.go index 70a2a664e04..edf902dcf82 100644 --- a/service/kendra/api_client.go +++ b/service/kendra/api_client.go @@ -85,34 +85,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -185,6 +157,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/kendra/api_op_BatchDeleteDocument.go b/service/kendra/api_op_BatchDeleteDocument.go index 046e7c96568..b69282b924f 100644 --- a/service/kendra/api_op_BatchDeleteDocument.go +++ b/service/kendra/api_op_BatchDeleteDocument.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kendra/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) BatchDeleteDocument(ctx context.Context, params *BatchDeleteDoc addawsAwsjson11_serdeOpBatchDeleteDocumentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_BatchPutDocument.go b/service/kendra/api_op_BatchPutDocument.go index 7f541c6c3c1..55d86c2b14c 100644 --- a/service/kendra/api_op_BatchPutDocument.go +++ b/service/kendra/api_op_BatchPutDocument.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kendra/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) BatchPutDocument(ctx context.Context, params *BatchPutDocumentI addawsAwsjson11_serdeOpBatchPutDocumentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_CreateDataSource.go b/service/kendra/api_op_CreateDataSource.go index 18c0ac7b42b..d33b74f39f9 100644 --- a/service/kendra/api_op_CreateDataSource.go +++ b/service/kendra/api_op_CreateDataSource.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kendra/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateDataSource(ctx context.Context, params *CreateDataSourceI addawsAwsjson11_serdeOpCreateDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_CreateFaq.go b/service/kendra/api_op_CreateFaq.go index 617b4d7bcef..9f4aae1ae70 100644 --- a/service/kendra/api_op_CreateFaq.go +++ b/service/kendra/api_op_CreateFaq.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kendra/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateFaq(ctx context.Context, params *CreateFaqInput, optFns . addawsAwsjson11_serdeOpCreateFaqMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_CreateIndex.go b/service/kendra/api_op_CreateIndex.go index 6a6730b23df..f4768b61976 100644 --- a/service/kendra/api_op_CreateIndex.go +++ b/service/kendra/api_op_CreateIndex.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kendra/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateIndex(ctx context.Context, params *CreateIndexInput, optF addawsAwsjson11_serdeOpCreateIndexMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_DeleteDataSource.go b/service/kendra/api_op_DeleteDataSource.go index 51fd7a9ee7f..4ec0231fd2f 100644 --- a/service/kendra/api_op_DeleteDataSource.go +++ b/service/kendra/api_op_DeleteDataSource.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteDataSource(ctx context.Context, params *DeleteDataSourceI addawsAwsjson11_serdeOpDeleteDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_DeleteFaq.go b/service/kendra/api_op_DeleteFaq.go index 0eb8ae00d70..207689e3411 100644 --- a/service/kendra/api_op_DeleteFaq.go +++ b/service/kendra/api_op_DeleteFaq.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteFaq(ctx context.Context, params *DeleteFaqInput, optFns . addawsAwsjson11_serdeOpDeleteFaqMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_DeleteIndex.go b/service/kendra/api_op_DeleteIndex.go index 7214a2983d0..65fdd9c189c 100644 --- a/service/kendra/api_op_DeleteIndex.go +++ b/service/kendra/api_op_DeleteIndex.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteIndex(ctx context.Context, params *DeleteIndexInput, optF addawsAwsjson11_serdeOpDeleteIndexMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_DescribeDataSource.go b/service/kendra/api_op_DescribeDataSource.go index ae10011a9f6..41117f8b87d 100644 --- a/service/kendra/api_op_DescribeDataSource.go +++ b/service/kendra/api_op_DescribeDataSource.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kendra/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDataSource(ctx context.Context, params *DescribeDataSou addawsAwsjson11_serdeOpDescribeDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_DescribeFaq.go b/service/kendra/api_op_DescribeFaq.go index 17af25b08ce..c9d4e43f315 100644 --- a/service/kendra/api_op_DescribeFaq.go +++ b/service/kendra/api_op_DescribeFaq.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kendra/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeFaq(ctx context.Context, params *DescribeFaqInput, optF addawsAwsjson11_serdeOpDescribeFaqMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_DescribeIndex.go b/service/kendra/api_op_DescribeIndex.go index a7c3b8b8b69..f125191b115 100644 --- a/service/kendra/api_op_DescribeIndex.go +++ b/service/kendra/api_op_DescribeIndex.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kendra/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeIndex(ctx context.Context, params *DescribeIndexInput, addawsAwsjson11_serdeOpDescribeIndexMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_ListDataSourceSyncJobs.go b/service/kendra/api_op_ListDataSourceSyncJobs.go index ccde21f7890..bc07d0fdf04 100644 --- a/service/kendra/api_op_ListDataSourceSyncJobs.go +++ b/service/kendra/api_op_ListDataSourceSyncJobs.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kendra/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDataSourceSyncJobs(ctx context.Context, params *ListDataSou addawsAwsjson11_serdeOpListDataSourceSyncJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_ListDataSources.go b/service/kendra/api_op_ListDataSources.go index e176ecee869..85a8f5a9803 100644 --- a/service/kendra/api_op_ListDataSources.go +++ b/service/kendra/api_op_ListDataSources.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kendra/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDataSources(ctx context.Context, params *ListDataSourcesInp addawsAwsjson11_serdeOpListDataSourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_ListFaqs.go b/service/kendra/api_op_ListFaqs.go index 00076f4eb16..ecfda01a3f9 100644 --- a/service/kendra/api_op_ListFaqs.go +++ b/service/kendra/api_op_ListFaqs.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kendra/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListFaqs(ctx context.Context, params *ListFaqsInput, optFns ... addawsAwsjson11_serdeOpListFaqsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_ListIndices.go b/service/kendra/api_op_ListIndices.go index 8960f52f70d..ac440e78787 100644 --- a/service/kendra/api_op_ListIndices.go +++ b/service/kendra/api_op_ListIndices.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kendra/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListIndices(ctx context.Context, params *ListIndicesInput, optF addawsAwsjson11_serdeOpListIndicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_ListTagsForResource.go b/service/kendra/api_op_ListTagsForResource.go index 4713f4b3338..2f2fbc326bc 100644 --- a/service/kendra/api_op_ListTagsForResource.go +++ b/service/kendra/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kendra/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_Query.go b/service/kendra/api_op_Query.go index a7034b18c73..a9b968249fd 100644 --- a/service/kendra/api_op_Query.go +++ b/service/kendra/api_op_Query.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kendra/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) Query(ctx context.Context, params *QueryInput, optFns ...func(* addawsAwsjson11_serdeOpQueryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_StartDataSourceSyncJob.go b/service/kendra/api_op_StartDataSourceSyncJob.go index 60e72d92843..9bcf894b9cc 100644 --- a/service/kendra/api_op_StartDataSourceSyncJob.go +++ b/service/kendra/api_op_StartDataSourceSyncJob.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) StartDataSourceSyncJob(ctx context.Context, params *StartDataSo addawsAwsjson11_serdeOpStartDataSourceSyncJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_StopDataSourceSyncJob.go b/service/kendra/api_op_StopDataSourceSyncJob.go index 5991871789b..0c9ed681d47 100644 --- a/service/kendra/api_op_StopDataSourceSyncJob.go +++ b/service/kendra/api_op_StopDataSourceSyncJob.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) StopDataSourceSyncJob(ctx context.Context, params *StopDataSour addawsAwsjson11_serdeOpStopDataSourceSyncJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_SubmitFeedback.go b/service/kendra/api_op_SubmitFeedback.go index dafc3c4e8e0..f69bf977bd7 100644 --- a/service/kendra/api_op_SubmitFeedback.go +++ b/service/kendra/api_op_SubmitFeedback.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kendra/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) SubmitFeedback(ctx context.Context, params *SubmitFeedbackInput addawsAwsjson11_serdeOpSubmitFeedbackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_TagResource.go b/service/kendra/api_op_TagResource.go index 8de252768d0..6ba7634ef0f 100644 --- a/service/kendra/api_op_TagResource.go +++ b/service/kendra/api_op_TagResource.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kendra/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_UntagResource.go b/service/kendra/api_op_UntagResource.go index d6e163d10b5..fad85f02e76 100644 --- a/service/kendra/api_op_UntagResource.go +++ b/service/kendra/api_op_UntagResource.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_UpdateDataSource.go b/service/kendra/api_op_UpdateDataSource.go index 6b00993fa24..0d9b097ebc9 100644 --- a/service/kendra/api_op_UpdateDataSource.go +++ b/service/kendra/api_op_UpdateDataSource.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kendra/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDataSource(ctx context.Context, params *UpdateDataSourceI addawsAwsjson11_serdeOpUpdateDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/api_op_UpdateIndex.go b/service/kendra/api_op_UpdateIndex.go index 0c3424b2044..41b55c954d9 100644 --- a/service/kendra/api_op_UpdateIndex.go +++ b/service/kendra/api_op_UpdateIndex.go @@ -5,7 +5,6 @@ package kendra import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kendra/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateIndex(ctx context.Context, params *UpdateIndexInput, optF addawsAwsjson11_serdeOpUpdateIndexMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kendra/endpoints.go b/service/kendra/endpoints.go index ad71efd3c60..ba798231c58 100644 --- a/service/kendra/endpoints.go +++ b/service/kendra/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/kinesis/api_client.go b/service/kinesis/api_client.go index 29df9bc0b9e..fdd4c81f445 100644 --- a/service/kinesis/api_client.go +++ b/service/kinesis/api_client.go @@ -79,30 +79,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -168,6 +144,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/kinesis/api_op_AddTagsToStream.go b/service/kinesis/api_op_AddTagsToStream.go index 16241f7df51..0fd2a1b13f1 100644 --- a/service/kinesis/api_op_AddTagsToStream.go +++ b/service/kinesis/api_op_AddTagsToStream.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) AddTagsToStream(ctx context.Context, params *AddTagsToStreamInp addawsAwsjson11_serdeOpAddTagsToStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_CreateStream.go b/service/kinesis/api_op_CreateStream.go index 66c79dc087c..46a0d890b7d 100644 --- a/service/kinesis/api_op_CreateStream.go +++ b/service/kinesis/api_op_CreateStream.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -55,9 +54,9 @@ func (c *Client) CreateStream(ctx context.Context, params *CreateStreamInput, op addawsAwsjson11_serdeOpCreateStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_DecreaseStreamRetentionPeriod.go b/service/kinesis/api_op_DecreaseStreamRetentionPeriod.go index b0100d0aa0a..f12ee27b7b0 100644 --- a/service/kinesis/api_op_DecreaseStreamRetentionPeriod.go +++ b/service/kinesis/api_op_DecreaseStreamRetentionPeriod.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DecreaseStreamRetentionPeriod(ctx context.Context, params *Decr addawsAwsjson11_serdeOpDecreaseStreamRetentionPeriodMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_DeleteStream.go b/service/kinesis/api_op_DeleteStream.go index d633bd5c51f..3d78c061140 100644 --- a/service/kinesis/api_op_DeleteStream.go +++ b/service/kinesis/api_op_DeleteStream.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -34,9 +33,9 @@ func (c *Client) DeleteStream(ctx context.Context, params *DeleteStreamInput, op addawsAwsjson11_serdeOpDeleteStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_DeregisterStreamConsumer.go b/service/kinesis/api_op_DeregisterStreamConsumer.go index b47b8cef81c..b0916448014 100644 --- a/service/kinesis/api_op_DeregisterStreamConsumer.go +++ b/service/kinesis/api_op_DeregisterStreamConsumer.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DeregisterStreamConsumer(ctx context.Context, params *Deregiste addawsAwsjson11_serdeOpDeregisterStreamConsumerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_DescribeLimits.go b/service/kinesis/api_op_DescribeLimits.go index 3e53da7f1a2..43bafd07859 100644 --- a/service/kinesis/api_op_DescribeLimits.go +++ b/service/kinesis/api_op_DescribeLimits.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DescribeLimits(ctx context.Context, params *DescribeLimitsInput addawsAwsjson11_serdeOpDescribeLimitsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_DescribeStream.go b/service/kinesis/api_op_DescribeStream.go index fb8ce265834..2cbcdd88675 100644 --- a/service/kinesis/api_op_DescribeStream.go +++ b/service/kinesis/api_op_DescribeStream.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesis/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) DescribeStream(ctx context.Context, params *DescribeStreamInput addawsAwsjson11_serdeOpDescribeStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_DescribeStreamConsumer.go b/service/kinesis/api_op_DescribeStreamConsumer.go index 44bbb0ac01d..001e58641d5 100644 --- a/service/kinesis/api_op_DescribeStreamConsumer.go +++ b/service/kinesis/api_op_DescribeStreamConsumer.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesis/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DescribeStreamConsumer(ctx context.Context, params *DescribeStr addawsAwsjson11_serdeOpDescribeStreamConsumerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_DescribeStreamSummary.go b/service/kinesis/api_op_DescribeStreamSummary.go index 46651d95377..60df8abbe78 100644 --- a/service/kinesis/api_op_DescribeStreamSummary.go +++ b/service/kinesis/api_op_DescribeStreamSummary.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesis/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeStreamSummary(ctx context.Context, params *DescribeStre addawsAwsjson11_serdeOpDescribeStreamSummaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_DisableEnhancedMonitoring.go b/service/kinesis/api_op_DisableEnhancedMonitoring.go index e27bf494349..c59d661fc7a 100644 --- a/service/kinesis/api_op_DisableEnhancedMonitoring.go +++ b/service/kinesis/api_op_DisableEnhancedMonitoring.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesis/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DisableEnhancedMonitoring(ctx context.Context, params *DisableE addawsAwsjson11_serdeOpDisableEnhancedMonitoringMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_EnableEnhancedMonitoring.go b/service/kinesis/api_op_EnableEnhancedMonitoring.go index 55ae82c3e58..aa4eb07f1bf 100644 --- a/service/kinesis/api_op_EnableEnhancedMonitoring.go +++ b/service/kinesis/api_op_EnableEnhancedMonitoring.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesis/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) EnableEnhancedMonitoring(ctx context.Context, params *EnableEnh addawsAwsjson11_serdeOpEnableEnhancedMonitoringMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_GetRecords.go b/service/kinesis/api_op_GetRecords.go index 141f571011f..db4c94b19d7 100644 --- a/service/kinesis/api_op_GetRecords.go +++ b/service/kinesis/api_op_GetRecords.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" kinesiscust "github.com/aws/aws-sdk-go-v2/service/kinesis/internal/customizations" @@ -74,9 +73,9 @@ func (c *Client) GetRecords(ctx context.Context, params *GetRecordsInput, optFns addawsAwsjson11_serdeOpGetRecordsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_GetShardIterator.go b/service/kinesis/api_op_GetShardIterator.go index 93ee3c06a1c..7939396f608 100644 --- a/service/kinesis/api_op_GetShardIterator.go +++ b/service/kinesis/api_op_GetShardIterator.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesis/types" smithy "github.com/awslabs/smithy-go" @@ -54,9 +53,9 @@ func (c *Client) GetShardIterator(ctx context.Context, params *GetShardIteratorI addawsAwsjson11_serdeOpGetShardIteratorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_IncreaseStreamRetentionPeriod.go b/service/kinesis/api_op_IncreaseStreamRetentionPeriod.go index 9520e26e957..0bd8e7fd0a2 100644 --- a/service/kinesis/api_op_IncreaseStreamRetentionPeriod.go +++ b/service/kinesis/api_op_IncreaseStreamRetentionPeriod.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) IncreaseStreamRetentionPeriod(ctx context.Context, params *Incr addawsAwsjson11_serdeOpIncreaseStreamRetentionPeriodMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_ListShards.go b/service/kinesis/api_op_ListShards.go index 02f7f1e5e06..0c7fa67e403 100644 --- a/service/kinesis/api_op_ListShards.go +++ b/service/kinesis/api_op_ListShards.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesis/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListShards(ctx context.Context, params *ListShardsInput, optFns addawsAwsjson11_serdeOpListShardsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_ListStreamConsumers.go b/service/kinesis/api_op_ListStreamConsumers.go index 6b7624bc6db..dbb2513313d 100644 --- a/service/kinesis/api_op_ListStreamConsumers.go +++ b/service/kinesis/api_op_ListStreamConsumers.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesis/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListStreamConsumers(ctx context.Context, params *ListStreamCons addawsAwsjson11_serdeOpListStreamConsumersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_ListStreams.go b/service/kinesis/api_op_ListStreams.go index 2625bee3221..b9d276d56f3 100644 --- a/service/kinesis/api_op_ListStreams.go +++ b/service/kinesis/api_op_ListStreams.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) ListStreams(ctx context.Context, params *ListStreamsInput, optF addawsAwsjson11_serdeOpListStreamsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_ListTagsForStream.go b/service/kinesis/api_op_ListTagsForStream.go index 640e0385e53..0196fc7826b 100644 --- a/service/kinesis/api_op_ListTagsForStream.go +++ b/service/kinesis/api_op_ListTagsForStream.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesis/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTagsForStream(ctx context.Context, params *ListTagsForStrea addawsAwsjson11_serdeOpListTagsForStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_MergeShards.go b/service/kinesis/api_op_MergeShards.go index e6f0702e4c6..712c4cea076 100644 --- a/service/kinesis/api_op_MergeShards.go +++ b/service/kinesis/api_op_MergeShards.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -49,9 +48,9 @@ func (c *Client) MergeShards(ctx context.Context, params *MergeShardsInput, optF addawsAwsjson11_serdeOpMergeShardsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_PutRecord.go b/service/kinesis/api_op_PutRecord.go index c9ae7d4aae4..4250b74b4b5 100644 --- a/service/kinesis/api_op_PutRecord.go +++ b/service/kinesis/api_op_PutRecord.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesis/types" smithy "github.com/awslabs/smithy-go" @@ -55,9 +54,9 @@ func (c *Client) PutRecord(ctx context.Context, params *PutRecordInput, optFns . addawsAwsjson11_serdeOpPutRecordMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_PutRecords.go b/service/kinesis/api_op_PutRecords.go index 35e2dcd45c5..d3487360b85 100644 --- a/service/kinesis/api_op_PutRecords.go +++ b/service/kinesis/api_op_PutRecords.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesis/types" smithy "github.com/awslabs/smithy-go" @@ -71,9 +70,9 @@ func (c *Client) PutRecords(ctx context.Context, params *PutRecordsInput, optFns addawsAwsjson11_serdeOpPutRecordsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_RegisterStreamConsumer.go b/service/kinesis/api_op_RegisterStreamConsumer.go index 1596e57ce9d..4bf5c62808b 100644 --- a/service/kinesis/api_op_RegisterStreamConsumer.go +++ b/service/kinesis/api_op_RegisterStreamConsumer.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesis/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) RegisterStreamConsumer(ctx context.Context, params *RegisterStr addawsAwsjson11_serdeOpRegisterStreamConsumerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_RemoveTagsFromStream.go b/service/kinesis/api_op_RemoveTagsFromStream.go index 5d069a0098a..8f983d85897 100644 --- a/service/kinesis/api_op_RemoveTagsFromStream.go +++ b/service/kinesis/api_op_RemoveTagsFromStream.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) RemoveTagsFromStream(ctx context.Context, params *RemoveTagsFro addawsAwsjson11_serdeOpRemoveTagsFromStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_SplitShard.go b/service/kinesis/api_op_SplitShard.go index 423ab312874..496ffa624ac 100644 --- a/service/kinesis/api_op_SplitShard.go +++ b/service/kinesis/api_op_SplitShard.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -59,9 +58,9 @@ func (c *Client) SplitShard(ctx context.Context, params *SplitShardInput, optFns addawsAwsjson11_serdeOpSplitShardMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_StartStreamEncryption.go b/service/kinesis/api_op_StartStreamEncryption.go index 7ecc823759e..b809ac69a10 100644 --- a/service/kinesis/api_op_StartStreamEncryption.go +++ b/service/kinesis/api_op_StartStreamEncryption.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesis/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) StartStreamEncryption(ctx context.Context, params *StartStreamE addawsAwsjson11_serdeOpStartStreamEncryptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_StopStreamEncryption.go b/service/kinesis/api_op_StopStreamEncryption.go index 379294aa94c..db89fc3847d 100644 --- a/service/kinesis/api_op_StopStreamEncryption.go +++ b/service/kinesis/api_op_StopStreamEncryption.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesis/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) StopStreamEncryption(ctx context.Context, params *StopStreamEnc addawsAwsjson11_serdeOpStopStreamEncryptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_SubscribeToShard.go b/service/kinesis/api_op_SubscribeToShard.go index 0d10f4089c5..3adccb2e555 100644 --- a/service/kinesis/api_op_SubscribeToShard.go +++ b/service/kinesis/api_op_SubscribeToShard.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesis/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) SubscribeToShard(ctx context.Context, params *SubscribeToShardI addawsAwsjson11_serdeOpSubscribeToShardMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/api_op_UpdateShardCount.go b/service/kinesis/api_op_UpdateShardCount.go index b5d722b0e0c..deebbed0c9b 100644 --- a/service/kinesis/api_op_UpdateShardCount.go +++ b/service/kinesis/api_op_UpdateShardCount.go @@ -5,7 +5,6 @@ package kinesis import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesis/types" smithy "github.com/awslabs/smithy-go" @@ -59,9 +58,9 @@ func (c *Client) UpdateShardCount(ctx context.Context, params *UpdateShardCountI addawsAwsjson11_serdeOpUpdateShardCountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesis/endpoints.go b/service/kinesis/endpoints.go index ca627d94756..0bb74f860fa 100644 --- a/service/kinesis/endpoints.go +++ b/service/kinesis/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/kinesisanalytics/api_client.go b/service/kinesisanalytics/api_client.go index 6a5a422802d..5d96c419937 100644 --- a/service/kinesisanalytics/api_client.go +++ b/service/kinesisanalytics/api_client.go @@ -82,30 +82,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -171,6 +147,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/kinesisanalytics/api_op_AddApplicationCloudWatchLoggingOption.go b/service/kinesisanalytics/api_op_AddApplicationCloudWatchLoggingOption.go index 143335af834..4fed541050b 100644 --- a/service/kinesisanalytics/api_op_AddApplicationCloudWatchLoggingOption.go +++ b/service/kinesisanalytics/api_op_AddApplicationCloudWatchLoggingOption.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) AddApplicationCloudWatchLoggingOption(ctx context.Context, para addawsAwsjson11_serdeOpAddApplicationCloudWatchLoggingOptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_AddApplicationInput.go b/service/kinesisanalytics/api_op_AddApplicationInput.go index e9d8d96c144..b204c141144 100644 --- a/service/kinesisanalytics/api_op_AddApplicationInput.go +++ b/service/kinesisanalytics/api_op_AddApplicationInput.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) AddApplicationInput(ctx context.Context, params *AddApplication addawsAwsjson11_serdeOpAddApplicationInputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_AddApplicationInputProcessingConfiguration.go b/service/kinesisanalytics/api_op_AddApplicationInputProcessingConfiguration.go index f7d9f3da0e2..3141b13ffeb 100644 --- a/service/kinesisanalytics/api_op_AddApplicationInputProcessingConfiguration.go +++ b/service/kinesisanalytics/api_op_AddApplicationInputProcessingConfiguration.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) AddApplicationInputProcessingConfiguration(ctx context.Context, addawsAwsjson11_serdeOpAddApplicationInputProcessingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_AddApplicationOutput.go b/service/kinesisanalytics/api_op_AddApplicationOutput.go index 812d89f5506..7c988efb8c7 100644 --- a/service/kinesisanalytics/api_op_AddApplicationOutput.go +++ b/service/kinesisanalytics/api_op_AddApplicationOutput.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) AddApplicationOutput(ctx context.Context, params *AddApplicatio addawsAwsjson11_serdeOpAddApplicationOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_AddApplicationReferenceDataSource.go b/service/kinesisanalytics/api_op_AddApplicationReferenceDataSource.go index 32a397c47e4..b756669f20c 100644 --- a/service/kinesisanalytics/api_op_AddApplicationReferenceDataSource.go +++ b/service/kinesisanalytics/api_op_AddApplicationReferenceDataSource.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) AddApplicationReferenceDataSource(ctx context.Context, params * addawsAwsjson11_serdeOpAddApplicationReferenceDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_CreateApplication.go b/service/kinesisanalytics/api_op_CreateApplication.go index 28f191de1dd..5be0fba985a 100644 --- a/service/kinesisanalytics/api_op_CreateApplication.go +++ b/service/kinesisanalytics/api_op_CreateApplication.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) CreateApplication(ctx context.Context, params *CreateApplicatio addawsAwsjson11_serdeOpCreateApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_DeleteApplication.go b/service/kinesisanalytics/api_op_DeleteApplication.go index 5f561eee1ae..f9d0bc52098 100644 --- a/service/kinesisanalytics/api_op_DeleteApplication.go +++ b/service/kinesisanalytics/api_op_DeleteApplication.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) DeleteApplication(ctx context.Context, params *DeleteApplicatio addawsAwsjson11_serdeOpDeleteApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_DeleteApplicationCloudWatchLoggingOption.go b/service/kinesisanalytics/api_op_DeleteApplicationCloudWatchLoggingOption.go index 5aba89edb2b..18afa2708ae 100644 --- a/service/kinesisanalytics/api_op_DeleteApplicationCloudWatchLoggingOption.go +++ b/service/kinesisanalytics/api_op_DeleteApplicationCloudWatchLoggingOption.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeleteApplicationCloudWatchLoggingOption(ctx context.Context, p addawsAwsjson11_serdeOpDeleteApplicationCloudWatchLoggingOptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_DeleteApplicationInputProcessingConfiguration.go b/service/kinesisanalytics/api_op_DeleteApplicationInputProcessingConfiguration.go index 1f8465f2a5f..96067eaf6e0 100644 --- a/service/kinesisanalytics/api_op_DeleteApplicationInputProcessingConfiguration.go +++ b/service/kinesisanalytics/api_op_DeleteApplicationInputProcessingConfiguration.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteApplicationInputProcessingConfiguration(ctx context.Conte addawsAwsjson11_serdeOpDeleteApplicationInputProcessingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_DeleteApplicationOutput.go b/service/kinesisanalytics/api_op_DeleteApplicationOutput.go index d823ac2abb3..ffecb26c85a 100644 --- a/service/kinesisanalytics/api_op_DeleteApplicationOutput.go +++ b/service/kinesisanalytics/api_op_DeleteApplicationOutput.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DeleteApplicationOutput(ctx context.Context, params *DeleteAppl addawsAwsjson11_serdeOpDeleteApplicationOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_DeleteApplicationReferenceDataSource.go b/service/kinesisanalytics/api_op_DeleteApplicationReferenceDataSource.go index 2dab95f68d5..808c5bf8eaf 100644 --- a/service/kinesisanalytics/api_op_DeleteApplicationReferenceDataSource.go +++ b/service/kinesisanalytics/api_op_DeleteApplicationReferenceDataSource.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) DeleteApplicationReferenceDataSource(ctx context.Context, param addawsAwsjson11_serdeOpDeleteApplicationReferenceDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_DescribeApplication.go b/service/kinesisanalytics/api_op_DescribeApplication.go index b6b65e05f98..2f7e5f62308 100644 --- a/service/kinesisanalytics/api_op_DescribeApplication.go +++ b/service/kinesisanalytics/api_op_DescribeApplication.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) DescribeApplication(ctx context.Context, params *DescribeApplic addawsAwsjson11_serdeOpDescribeApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_DiscoverInputSchema.go b/service/kinesisanalytics/api_op_DiscoverInputSchema.go index 3ca1ba4a31c..ba705d79619 100644 --- a/service/kinesisanalytics/api_op_DiscoverInputSchema.go +++ b/service/kinesisanalytics/api_op_DiscoverInputSchema.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) DiscoverInputSchema(ctx context.Context, params *DiscoverInputS addawsAwsjson11_serdeOpDiscoverInputSchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_ListApplications.go b/service/kinesisanalytics/api_op_ListApplications.go index f14e866b4aa..00ad34aa366 100644 --- a/service/kinesisanalytics/api_op_ListApplications.go +++ b/service/kinesisanalytics/api_op_ListApplications.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) ListApplications(ctx context.Context, params *ListApplicationsI addawsAwsjson11_serdeOpListApplicationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_ListTagsForResource.go b/service/kinesisanalytics/api_op_ListTagsForResource.go index 0a75280ccb6..c3a479b73ef 100644 --- a/service/kinesisanalytics/api_op_ListTagsForResource.go +++ b/service/kinesisanalytics/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_StartApplication.go b/service/kinesisanalytics/api_op_StartApplication.go index 38aa2af2396..5ad1b7c8bbe 100644 --- a/service/kinesisanalytics/api_op_StartApplication.go +++ b/service/kinesisanalytics/api_op_StartApplication.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) StartApplication(ctx context.Context, params *StartApplicationI addawsAwsjson11_serdeOpStartApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_StopApplication.go b/service/kinesisanalytics/api_op_StopApplication.go index c792daff902..69c4e816895 100644 --- a/service/kinesisanalytics/api_op_StopApplication.go +++ b/service/kinesisanalytics/api_op_StopApplication.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) StopApplication(ctx context.Context, params *StopApplicationInp addawsAwsjson11_serdeOpStopApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_TagResource.go b/service/kinesisanalytics/api_op_TagResource.go index 83a929c0d48..bc3576f6dc5 100644 --- a/service/kinesisanalytics/api_op_TagResource.go +++ b/service/kinesisanalytics/api_op_TagResource.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_UntagResource.go b/service/kinesisanalytics/api_op_UntagResource.go index 553e79d2e80..79032165128 100644 --- a/service/kinesisanalytics/api_op_UntagResource.go +++ b/service/kinesisanalytics/api_op_UntagResource.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/api_op_UpdateApplication.go b/service/kinesisanalytics/api_op_UpdateApplication.go index 0cad0791828..bc6bec0ab16 100644 --- a/service/kinesisanalytics/api_op_UpdateApplication.go +++ b/service/kinesisanalytics/api_op_UpdateApplication.go @@ -5,7 +5,6 @@ package kinesisanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) UpdateApplication(ctx context.Context, params *UpdateApplicatio addawsAwsjson11_serdeOpUpdateApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalytics/endpoints.go b/service/kinesisanalytics/endpoints.go index d973a311bc0..ddf5afe37a6 100644 --- a/service/kinesisanalytics/endpoints.go +++ b/service/kinesisanalytics/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/kinesisanalyticsv2/api_client.go b/service/kinesisanalyticsv2/api_client.go index 9486200fbd6..9bdf64c2de2 100644 --- a/service/kinesisanalyticsv2/api_client.go +++ b/service/kinesisanalyticsv2/api_client.go @@ -80,30 +80,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -169,6 +145,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/kinesisanalyticsv2/api_op_AddApplicationCloudWatchLoggingOption.go b/service/kinesisanalyticsv2/api_op_AddApplicationCloudWatchLoggingOption.go index ecf6fe01a08..f4b02e71691 100644 --- a/service/kinesisanalyticsv2/api_op_AddApplicationCloudWatchLoggingOption.go +++ b/service/kinesisanalyticsv2/api_op_AddApplicationCloudWatchLoggingOption.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AddApplicationCloudWatchLoggingOption(ctx context.Context, para addawsAwsjson11_serdeOpAddApplicationCloudWatchLoggingOptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_AddApplicationInput.go b/service/kinesisanalyticsv2/api_op_AddApplicationInput.go index ce6ae9e6194..b507e8aff6d 100644 --- a/service/kinesisanalyticsv2/api_op_AddApplicationInput.go +++ b/service/kinesisanalyticsv2/api_op_AddApplicationInput.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) AddApplicationInput(ctx context.Context, params *AddApplication addawsAwsjson11_serdeOpAddApplicationInputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_AddApplicationInputProcessingConfiguration.go b/service/kinesisanalyticsv2/api_op_AddApplicationInputProcessingConfiguration.go index c676846831a..127434fa6a8 100644 --- a/service/kinesisanalyticsv2/api_op_AddApplicationInputProcessingConfiguration.go +++ b/service/kinesisanalyticsv2/api_op_AddApplicationInputProcessingConfiguration.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) AddApplicationInputProcessingConfiguration(ctx context.Context, addawsAwsjson11_serdeOpAddApplicationInputProcessingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_AddApplicationOutput.go b/service/kinesisanalyticsv2/api_op_AddApplicationOutput.go index f0f4b3c2446..19d2367400b 100644 --- a/service/kinesisanalyticsv2/api_op_AddApplicationOutput.go +++ b/service/kinesisanalyticsv2/api_op_AddApplicationOutput.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) AddApplicationOutput(ctx context.Context, params *AddApplicatio addawsAwsjson11_serdeOpAddApplicationOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_AddApplicationReferenceDataSource.go b/service/kinesisanalyticsv2/api_op_AddApplicationReferenceDataSource.go index 85cc53d5aa5..35cfcb6129c 100644 --- a/service/kinesisanalyticsv2/api_op_AddApplicationReferenceDataSource.go +++ b/service/kinesisanalyticsv2/api_op_AddApplicationReferenceDataSource.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) AddApplicationReferenceDataSource(ctx context.Context, params * addawsAwsjson11_serdeOpAddApplicationReferenceDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_AddApplicationVpcConfiguration.go b/service/kinesisanalyticsv2/api_op_AddApplicationVpcConfiguration.go index a544bddc8bc..8bf813ccd51 100644 --- a/service/kinesisanalyticsv2/api_op_AddApplicationVpcConfiguration.go +++ b/service/kinesisanalyticsv2/api_op_AddApplicationVpcConfiguration.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) AddApplicationVpcConfiguration(ctx context.Context, params *Add addawsAwsjson11_serdeOpAddApplicationVpcConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_CreateApplication.go b/service/kinesisanalyticsv2/api_op_CreateApplication.go index a46847056fd..4660612078c 100644 --- a/service/kinesisanalyticsv2/api_op_CreateApplication.go +++ b/service/kinesisanalyticsv2/api_op_CreateApplication.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateApplication(ctx context.Context, params *CreateApplicatio addawsAwsjson11_serdeOpCreateApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_CreateApplicationSnapshot.go b/service/kinesisanalyticsv2/api_op_CreateApplicationSnapshot.go index 60254b77117..4954eb93c91 100644 --- a/service/kinesisanalyticsv2/api_op_CreateApplicationSnapshot.go +++ b/service/kinesisanalyticsv2/api_op_CreateApplicationSnapshot.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateApplicationSnapshot(ctx context.Context, params *CreateAp addawsAwsjson11_serdeOpCreateApplicationSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_DeleteApplication.go b/service/kinesisanalyticsv2/api_op_DeleteApplication.go index ef46a750f59..b5195682a77 100644 --- a/service/kinesisanalyticsv2/api_op_DeleteApplication.go +++ b/service/kinesisanalyticsv2/api_op_DeleteApplication.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteApplication(ctx context.Context, params *DeleteApplicatio addawsAwsjson11_serdeOpDeleteApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_DeleteApplicationCloudWatchLoggingOption.go b/service/kinesisanalyticsv2/api_op_DeleteApplicationCloudWatchLoggingOption.go index 695b5200b31..1384d851e45 100644 --- a/service/kinesisanalyticsv2/api_op_DeleteApplicationCloudWatchLoggingOption.go +++ b/service/kinesisanalyticsv2/api_op_DeleteApplicationCloudWatchLoggingOption.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteApplicationCloudWatchLoggingOption(ctx context.Context, p addawsAwsjson11_serdeOpDeleteApplicationCloudWatchLoggingOptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_DeleteApplicationInputProcessingConfiguration.go b/service/kinesisanalyticsv2/api_op_DeleteApplicationInputProcessingConfiguration.go index 28e335e15e3..e8446f1bacf 100644 --- a/service/kinesisanalyticsv2/api_op_DeleteApplicationInputProcessingConfiguration.go +++ b/service/kinesisanalyticsv2/api_op_DeleteApplicationInputProcessingConfiguration.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteApplicationInputProcessingConfiguration(ctx context.Conte addawsAwsjson11_serdeOpDeleteApplicationInputProcessingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_DeleteApplicationOutput.go b/service/kinesisanalyticsv2/api_op_DeleteApplicationOutput.go index 034e278f56e..cdbaa2b05c2 100644 --- a/service/kinesisanalyticsv2/api_op_DeleteApplicationOutput.go +++ b/service/kinesisanalyticsv2/api_op_DeleteApplicationOutput.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteApplicationOutput(ctx context.Context, params *DeleteAppl addawsAwsjson11_serdeOpDeleteApplicationOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_DeleteApplicationReferenceDataSource.go b/service/kinesisanalyticsv2/api_op_DeleteApplicationReferenceDataSource.go index 2ffbc2ae999..3d32bab3b68 100644 --- a/service/kinesisanalyticsv2/api_op_DeleteApplicationReferenceDataSource.go +++ b/service/kinesisanalyticsv2/api_op_DeleteApplicationReferenceDataSource.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteApplicationReferenceDataSource(ctx context.Context, param addawsAwsjson11_serdeOpDeleteApplicationReferenceDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_DeleteApplicationSnapshot.go b/service/kinesisanalyticsv2/api_op_DeleteApplicationSnapshot.go index 8327b745e9a..d5ede17f29f 100644 --- a/service/kinesisanalyticsv2/api_op_DeleteApplicationSnapshot.go +++ b/service/kinesisanalyticsv2/api_op_DeleteApplicationSnapshot.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteApplicationSnapshot(ctx context.Context, params *DeleteAp addawsAwsjson11_serdeOpDeleteApplicationSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_DeleteApplicationVpcConfiguration.go b/service/kinesisanalyticsv2/api_op_DeleteApplicationVpcConfiguration.go index 7bce1522a52..8e00be39d1e 100644 --- a/service/kinesisanalyticsv2/api_op_DeleteApplicationVpcConfiguration.go +++ b/service/kinesisanalyticsv2/api_op_DeleteApplicationVpcConfiguration.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteApplicationVpcConfiguration(ctx context.Context, params * addawsAwsjson11_serdeOpDeleteApplicationVpcConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_DescribeApplication.go b/service/kinesisanalyticsv2/api_op_DescribeApplication.go index 201face4232..9264e3b2c5a 100644 --- a/service/kinesisanalyticsv2/api_op_DescribeApplication.go +++ b/service/kinesisanalyticsv2/api_op_DescribeApplication.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeApplication(ctx context.Context, params *DescribeApplic addawsAwsjson11_serdeOpDescribeApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_DescribeApplicationSnapshot.go b/service/kinesisanalyticsv2/api_op_DescribeApplicationSnapshot.go index 5488f639f9a..fb8f18c4e03 100644 --- a/service/kinesisanalyticsv2/api_op_DescribeApplicationSnapshot.go +++ b/service/kinesisanalyticsv2/api_op_DescribeApplicationSnapshot.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeApplicationSnapshot(ctx context.Context, params *Descri addawsAwsjson11_serdeOpDescribeApplicationSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_DiscoverInputSchema.go b/service/kinesisanalyticsv2/api_op_DiscoverInputSchema.go index 9f731b42361..3d7dc2d8b4d 100644 --- a/service/kinesisanalyticsv2/api_op_DiscoverInputSchema.go +++ b/service/kinesisanalyticsv2/api_op_DiscoverInputSchema.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DiscoverInputSchema(ctx context.Context, params *DiscoverInputS addawsAwsjson11_serdeOpDiscoverInputSchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_ListApplicationSnapshots.go b/service/kinesisanalyticsv2/api_op_ListApplicationSnapshots.go index 2897ac8dddc..b59363d8f63 100644 --- a/service/kinesisanalyticsv2/api_op_ListApplicationSnapshots.go +++ b/service/kinesisanalyticsv2/api_op_ListApplicationSnapshots.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListApplicationSnapshots(ctx context.Context, params *ListAppli addawsAwsjson11_serdeOpListApplicationSnapshotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_ListApplications.go b/service/kinesisanalyticsv2/api_op_ListApplications.go index f54967bb0dd..8188a256572 100644 --- a/service/kinesisanalyticsv2/api_op_ListApplications.go +++ b/service/kinesisanalyticsv2/api_op_ListApplications.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListApplications(ctx context.Context, params *ListApplicationsI addawsAwsjson11_serdeOpListApplicationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_ListTagsForResource.go b/service/kinesisanalyticsv2/api_op_ListTagsForResource.go index 16ad1d3309f..8f7917d7ee8 100644 --- a/service/kinesisanalyticsv2/api_op_ListTagsForResource.go +++ b/service/kinesisanalyticsv2/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_StartApplication.go b/service/kinesisanalyticsv2/api_op_StartApplication.go index c17026d8642..7c91446c4c5 100644 --- a/service/kinesisanalyticsv2/api_op_StartApplication.go +++ b/service/kinesisanalyticsv2/api_op_StartApplication.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) StartApplication(ctx context.Context, params *StartApplicationI addawsAwsjson11_serdeOpStartApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_StopApplication.go b/service/kinesisanalyticsv2/api_op_StopApplication.go index 4d7cb414010..60d09cf1528 100644 --- a/service/kinesisanalyticsv2/api_op_StopApplication.go +++ b/service/kinesisanalyticsv2/api_op_StopApplication.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) StopApplication(ctx context.Context, params *StopApplicationInp addawsAwsjson11_serdeOpStopApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_TagResource.go b/service/kinesisanalyticsv2/api_op_TagResource.go index f8ee9b5cd2f..cb4308743c3 100644 --- a/service/kinesisanalyticsv2/api_op_TagResource.go +++ b/service/kinesisanalyticsv2/api_op_TagResource.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_UntagResource.go b/service/kinesisanalyticsv2/api_op_UntagResource.go index 07db0cde666..4f686506553 100644 --- a/service/kinesisanalyticsv2/api_op_UntagResource.go +++ b/service/kinesisanalyticsv2/api_op_UntagResource.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/api_op_UpdateApplication.go b/service/kinesisanalyticsv2/api_op_UpdateApplication.go index ddb36a074d5..ecfc5e77a54 100644 --- a/service/kinesisanalyticsv2/api_op_UpdateApplication.go +++ b/service/kinesisanalyticsv2/api_op_UpdateApplication.go @@ -5,7 +5,6 @@ package kinesisanalyticsv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateApplication(ctx context.Context, params *UpdateApplicatio addawsAwsjson11_serdeOpUpdateApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisanalyticsv2/endpoints.go b/service/kinesisanalyticsv2/endpoints.go index 4797de81f15..13a69f8001a 100644 --- a/service/kinesisanalyticsv2/endpoints.go +++ b/service/kinesisanalyticsv2/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/kinesisvideo/api_client.go b/service/kinesisvideo/api_client.go index 1d2378b341c..1ebcbb801da 100644 --- a/service/kinesisvideo/api_client.go +++ b/service/kinesisvideo/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/kinesisvideo/api_op_CreateSignalingChannel.go b/service/kinesisvideo/api_op_CreateSignalingChannel.go index c5f5d80a4c3..558b97f98fe 100644 --- a/service/kinesisvideo/api_op_CreateSignalingChannel.go +++ b/service/kinesisvideo/api_op_CreateSignalingChannel.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisvideo/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateSignalingChannel(ctx context.Context, params *CreateSigna addawsRestjson1_serdeOpCreateSignalingChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/api_op_CreateStream.go b/service/kinesisvideo/api_op_CreateStream.go index eecf7e0a982..b603dcc4a4b 100644 --- a/service/kinesisvideo/api_op_CreateStream.go +++ b/service/kinesisvideo/api_op_CreateStream.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) CreateStream(ctx context.Context, params *CreateStreamInput, op addawsRestjson1_serdeOpCreateStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/api_op_DeleteSignalingChannel.go b/service/kinesisvideo/api_op_DeleteSignalingChannel.go index ad1f711b892..502676a760f 100644 --- a/service/kinesisvideo/api_op_DeleteSignalingChannel.go +++ b/service/kinesisvideo/api_op_DeleteSignalingChannel.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteSignalingChannel(ctx context.Context, params *DeleteSigna addawsRestjson1_serdeOpDeleteSignalingChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/api_op_DeleteStream.go b/service/kinesisvideo/api_op_DeleteStream.go index d0ab07741c0..14283cfb288 100644 --- a/service/kinesisvideo/api_op_DeleteStream.go +++ b/service/kinesisvideo/api_op_DeleteStream.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DeleteStream(ctx context.Context, params *DeleteStreamInput, op addawsRestjson1_serdeOpDeleteStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/api_op_DescribeSignalingChannel.go b/service/kinesisvideo/api_op_DescribeSignalingChannel.go index 394f6c3edf7..14f82b05fbd 100644 --- a/service/kinesisvideo/api_op_DescribeSignalingChannel.go +++ b/service/kinesisvideo/api_op_DescribeSignalingChannel.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisvideo/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeSignalingChannel(ctx context.Context, params *DescribeS addawsRestjson1_serdeOpDescribeSignalingChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/api_op_DescribeStream.go b/service/kinesisvideo/api_op_DescribeStream.go index c2b5112606e..9e70360010e 100644 --- a/service/kinesisvideo/api_op_DescribeStream.go +++ b/service/kinesisvideo/api_op_DescribeStream.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisvideo/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeStream(ctx context.Context, params *DescribeStreamInput addawsRestjson1_serdeOpDescribeStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/api_op_GetDataEndpoint.go b/service/kinesisvideo/api_op_GetDataEndpoint.go index ef8f7f7653f..4d2d405cd00 100644 --- a/service/kinesisvideo/api_op_GetDataEndpoint.go +++ b/service/kinesisvideo/api_op_GetDataEndpoint.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisvideo/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetDataEndpoint(ctx context.Context, params *GetDataEndpointInp addawsRestjson1_serdeOpGetDataEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/api_op_GetSignalingChannelEndpoint.go b/service/kinesisvideo/api_op_GetSignalingChannelEndpoint.go index 3318c06cfd4..7430ac0cba2 100644 --- a/service/kinesisvideo/api_op_GetSignalingChannelEndpoint.go +++ b/service/kinesisvideo/api_op_GetSignalingChannelEndpoint.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisvideo/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) GetSignalingChannelEndpoint(ctx context.Context, params *GetSig addawsRestjson1_serdeOpGetSignalingChannelEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/api_op_ListSignalingChannels.go b/service/kinesisvideo/api_op_ListSignalingChannels.go index c7b4759ae52..a7439f276cf 100644 --- a/service/kinesisvideo/api_op_ListSignalingChannels.go +++ b/service/kinesisvideo/api_op_ListSignalingChannels.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisvideo/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListSignalingChannels(ctx context.Context, params *ListSignalin addawsRestjson1_serdeOpListSignalingChannelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/api_op_ListStreams.go b/service/kinesisvideo/api_op_ListStreams.go index d697a6a7b14..229853cf4ea 100644 --- a/service/kinesisvideo/api_op_ListStreams.go +++ b/service/kinesisvideo/api_op_ListStreams.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisvideo/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListStreams(ctx context.Context, params *ListStreamsInput, optF addawsRestjson1_serdeOpListStreamsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/api_op_ListTagsForResource.go b/service/kinesisvideo/api_op_ListTagsForResource.go index b4880276446..d341af21b55 100644 --- a/service/kinesisvideo/api_op_ListTagsForResource.go +++ b/service/kinesisvideo/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/api_op_ListTagsForStream.go b/service/kinesisvideo/api_op_ListTagsForStream.go index 646b0e15fb5..a0c845bca73 100644 --- a/service/kinesisvideo/api_op_ListTagsForStream.go +++ b/service/kinesisvideo/api_op_ListTagsForStream.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForStream(ctx context.Context, params *ListTagsForStrea addawsRestjson1_serdeOpListTagsForStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/api_op_TagResource.go b/service/kinesisvideo/api_op_TagResource.go index c50f119c0d8..8fc326ab33a 100644 --- a/service/kinesisvideo/api_op_TagResource.go +++ b/service/kinesisvideo/api_op_TagResource.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisvideo/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/api_op_TagStream.go b/service/kinesisvideo/api_op_TagStream.go index 94fb4114271..9872ecc3da7 100644 --- a/service/kinesisvideo/api_op_TagStream.go +++ b/service/kinesisvideo/api_op_TagStream.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) TagStream(ctx context.Context, params *TagStreamInput, optFns . addawsRestjson1_serdeOpTagStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/api_op_UntagResource.go b/service/kinesisvideo/api_op_UntagResource.go index d333d39746f..858286cfd37 100644 --- a/service/kinesisvideo/api_op_UntagResource.go +++ b/service/kinesisvideo/api_op_UntagResource.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/api_op_UntagStream.go b/service/kinesisvideo/api_op_UntagStream.go index 5734c6b6ca0..e7d2f55430a 100644 --- a/service/kinesisvideo/api_op_UntagStream.go +++ b/service/kinesisvideo/api_op_UntagStream.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) UntagStream(ctx context.Context, params *UntagStreamInput, optF addawsRestjson1_serdeOpUntagStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/api_op_UpdateDataRetention.go b/service/kinesisvideo/api_op_UpdateDataRetention.go index 3498923fcf6..7223f85c852 100644 --- a/service/kinesisvideo/api_op_UpdateDataRetention.go +++ b/service/kinesisvideo/api_op_UpdateDataRetention.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisvideo/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) UpdateDataRetention(ctx context.Context, params *UpdateDataRete addawsRestjson1_serdeOpUpdateDataRetentionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/api_op_UpdateSignalingChannel.go b/service/kinesisvideo/api_op_UpdateSignalingChannel.go index b962607a552..9152de345a5 100644 --- a/service/kinesisvideo/api_op_UpdateSignalingChannel.go +++ b/service/kinesisvideo/api_op_UpdateSignalingChannel.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisvideo/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateSignalingChannel(ctx context.Context, params *UpdateSigna addawsRestjson1_serdeOpUpdateSignalingChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/api_op_UpdateStream.go b/service/kinesisvideo/api_op_UpdateStream.go index 10b90c76567..9971fe97886 100644 --- a/service/kinesisvideo/api_op_UpdateStream.go +++ b/service/kinesisvideo/api_op_UpdateStream.go @@ -5,7 +5,6 @@ package kinesisvideo import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) UpdateStream(ctx context.Context, params *UpdateStreamInput, op addawsRestjson1_serdeOpUpdateStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideo/endpoints.go b/service/kinesisvideo/endpoints.go index 1ba9e6bb766..a7d70effc63 100644 --- a/service/kinesisvideo/endpoints.go +++ b/service/kinesisvideo/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/kinesisvideoarchivedmedia/api_client.go b/service/kinesisvideoarchivedmedia/api_client.go index 482e99c0b51..e6d94ac57a7 100644 --- a/service/kinesisvideoarchivedmedia/api_client.go +++ b/service/kinesisvideoarchivedmedia/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/kinesisvideoarchivedmedia/api_op_GetClip.go b/service/kinesisvideoarchivedmedia/api_op_GetClip.go index 9c8b94a9eda..a23fb68e1fd 100644 --- a/service/kinesisvideoarchivedmedia/api_op_GetClip.go +++ b/service/kinesisvideoarchivedmedia/api_op_GetClip.go @@ -5,7 +5,6 @@ package kinesisvideoarchivedmedia import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisvideoarchivedmedia/types" smithy "github.com/awslabs/smithy-go" @@ -56,9 +55,9 @@ func (c *Client) GetClip(ctx context.Context, params *GetClipInput, optFns ...fu addawsRestjson1_serdeOpGetClipMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideoarchivedmedia/api_op_GetDASHStreamingSessionURL.go b/service/kinesisvideoarchivedmedia/api_op_GetDASHStreamingSessionURL.go index 6d900dec6b6..8b857b75da0 100644 --- a/service/kinesisvideoarchivedmedia/api_op_GetDASHStreamingSessionURL.go +++ b/service/kinesisvideoarchivedmedia/api_op_GetDASHStreamingSessionURL.go @@ -5,7 +5,6 @@ package kinesisvideoarchivedmedia import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisvideoarchivedmedia/types" smithy "github.com/awslabs/smithy-go" @@ -130,9 +129,9 @@ func (c *Client) GetDASHStreamingSessionURL(ctx context.Context, params *GetDASH addawsRestjson1_serdeOpGetDASHStreamingSessionURLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideoarchivedmedia/api_op_GetHLSStreamingSessionURL.go b/service/kinesisvideoarchivedmedia/api_op_GetHLSStreamingSessionURL.go index 76126ac1cfa..18bbf30d226 100644 --- a/service/kinesisvideoarchivedmedia/api_op_GetHLSStreamingSessionURL.go +++ b/service/kinesisvideoarchivedmedia/api_op_GetHLSStreamingSessionURL.go @@ -5,7 +5,6 @@ package kinesisvideoarchivedmedia import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisvideoarchivedmedia/types" smithy "github.com/awslabs/smithy-go" @@ -174,9 +173,9 @@ func (c *Client) GetHLSStreamingSessionURL(ctx context.Context, params *GetHLSSt addawsRestjson1_serdeOpGetHLSStreamingSessionURLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideoarchivedmedia/api_op_GetMediaForFragmentList.go b/service/kinesisvideoarchivedmedia/api_op_GetMediaForFragmentList.go index c3f5099581b..6df17e69c4a 100644 --- a/service/kinesisvideoarchivedmedia/api_op_GetMediaForFragmentList.go +++ b/service/kinesisvideoarchivedmedia/api_op_GetMediaForFragmentList.go @@ -5,7 +5,6 @@ package kinesisvideoarchivedmedia import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -47,9 +46,9 @@ func (c *Client) GetMediaForFragmentList(ctx context.Context, params *GetMediaFo addawsRestjson1_serdeOpGetMediaForFragmentListMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideoarchivedmedia/api_op_ListFragments.go b/service/kinesisvideoarchivedmedia/api_op_ListFragments.go index 33ad411f492..9b11cb892bb 100644 --- a/service/kinesisvideoarchivedmedia/api_op_ListFragments.go +++ b/service/kinesisvideoarchivedmedia/api_op_ListFragments.go @@ -5,7 +5,6 @@ package kinesisvideoarchivedmedia import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisvideoarchivedmedia/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) ListFragments(ctx context.Context, params *ListFragmentsInput, addawsRestjson1_serdeOpListFragmentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideoarchivedmedia/endpoints.go b/service/kinesisvideoarchivedmedia/endpoints.go index c99d02554eb..408d2ff7b69 100644 --- a/service/kinesisvideoarchivedmedia/endpoints.go +++ b/service/kinesisvideoarchivedmedia/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/kinesisvideomedia/api_client.go b/service/kinesisvideomedia/api_client.go index bdf963eb964..beac4268eb9 100644 --- a/service/kinesisvideomedia/api_client.go +++ b/service/kinesisvideomedia/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/kinesisvideomedia/api_op_GetMedia.go b/service/kinesisvideomedia/api_op_GetMedia.go index 3db28965ce4..fc9805518f2 100644 --- a/service/kinesisvideomedia/api_op_GetMedia.go +++ b/service/kinesisvideomedia/api_op_GetMedia.go @@ -5,7 +5,6 @@ package kinesisvideomedia import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisvideomedia/types" smithy "github.com/awslabs/smithy-go" @@ -58,9 +57,9 @@ func (c *Client) GetMedia(ctx context.Context, params *GetMediaInput, optFns ... addawsRestjson1_serdeOpGetMediaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideomedia/endpoints.go b/service/kinesisvideomedia/endpoints.go index 719588d705c..cbb976ef3d2 100644 --- a/service/kinesisvideomedia/endpoints.go +++ b/service/kinesisvideomedia/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/kinesisvideosignaling/api_client.go b/service/kinesisvideosignaling/api_client.go index b612c5fd447..0f88464d96c 100644 --- a/service/kinesisvideosignaling/api_client.go +++ b/service/kinesisvideosignaling/api_client.go @@ -79,30 +79,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -168,6 +144,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/kinesisvideosignaling/api_op_GetIceServerConfig.go b/service/kinesisvideosignaling/api_op_GetIceServerConfig.go index 9ca6abbb9bd..663835de88a 100644 --- a/service/kinesisvideosignaling/api_op_GetIceServerConfig.go +++ b/service/kinesisvideosignaling/api_op_GetIceServerConfig.go @@ -5,7 +5,6 @@ package kinesisvideosignaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kinesisvideosignaling/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) GetIceServerConfig(ctx context.Context, params *GetIceServerCon addawsRestjson1_serdeOpGetIceServerConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideosignaling/api_op_SendAlexaOfferToMaster.go b/service/kinesisvideosignaling/api_op_SendAlexaOfferToMaster.go index 8098ad13695..afccd7d3fa5 100644 --- a/service/kinesisvideosignaling/api_op_SendAlexaOfferToMaster.go +++ b/service/kinesisvideosignaling/api_op_SendAlexaOfferToMaster.go @@ -5,7 +5,6 @@ package kinesisvideosignaling import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) SendAlexaOfferToMaster(ctx context.Context, params *SendAlexaOf addawsRestjson1_serdeOpSendAlexaOfferToMasterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kinesisvideosignaling/endpoints.go b/service/kinesisvideosignaling/endpoints.go index 3300fb1e1b9..10da038db14 100644 --- a/service/kinesisvideosignaling/endpoints.go +++ b/service/kinesisvideosignaling/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/kms/api_client.go b/service/kms/api_client.go index 53cdcb7de96..1904c82ff40 100644 --- a/service/kms/api_client.go +++ b/service/kms/api_client.go @@ -138,30 +138,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -227,6 +203,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/kms/api_op_CancelKeyDeletion.go b/service/kms/api_op_CancelKeyDeletion.go index e60e13d96c5..5aef2922bb3 100644 --- a/service/kms/api_op_CancelKeyDeletion.go +++ b/service/kms/api_op_CancelKeyDeletion.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) CancelKeyDeletion(ctx context.Context, params *CancelKeyDeletio addawsAwsjson11_serdeOpCancelKeyDeletionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_ConnectCustomKeyStore.go b/service/kms/api_op_ConnectCustomKeyStore.go index 04705dcc8d5..2b191b8aa81 100644 --- a/service/kms/api_op_ConnectCustomKeyStore.go +++ b/service/kms/api_op_ConnectCustomKeyStore.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -55,9 +54,9 @@ func (c *Client) ConnectCustomKeyStore(ctx context.Context, params *ConnectCusto addawsAwsjson11_serdeOpConnectCustomKeyStoreMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_CreateAlias.go b/service/kms/api_op_CreateAlias.go index 08c47944ba2..de51fd1acf1 100644 --- a/service/kms/api_op_CreateAlias.go +++ b/service/kms/api_op_CreateAlias.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -81,9 +80,9 @@ func (c *Client) CreateAlias(ctx context.Context, params *CreateAliasInput, optF addawsAwsjson11_serdeOpCreateAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_CreateCustomKeyStore.go b/service/kms/api_op_CreateCustomKeyStore.go index a6f0e9c7750..3ce2bafc3b0 100644 --- a/service/kms/api_op_CreateCustomKeyStore.go +++ b/service/kms/api_op_CreateCustomKeyStore.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -43,9 +42,9 @@ func (c *Client) CreateCustomKeyStore(ctx context.Context, params *CreateCustomK addawsAwsjson11_serdeOpCreateCustomKeyStoreMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_CreateGrant.go b/service/kms/api_op_CreateGrant.go index 016911b6363..41a68dd6614 100644 --- a/service/kms/api_op_CreateGrant.go +++ b/service/kms/api_op_CreateGrant.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -67,9 +66,9 @@ func (c *Client) CreateGrant(ctx context.Context, params *CreateGrantInput, optF addawsAwsjson11_serdeOpCreateGrantMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_CreateKey.go b/service/kms/api_op_CreateKey.go index f401f76742d..dff4877b3f0 100644 --- a/service/kms/api_op_CreateKey.go +++ b/service/kms/api_op_CreateKey.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -77,9 +76,9 @@ func (c *Client) CreateKey(ctx context.Context, params *CreateKeyInput, optFns . addawsAwsjson11_serdeOpCreateKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_Decrypt.go b/service/kms/api_op_Decrypt.go index e365eb2b9f2..b4e8ff65741 100644 --- a/service/kms/api_op_Decrypt.go +++ b/service/kms/api_op_Decrypt.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -67,9 +66,9 @@ func (c *Client) Decrypt(ctx context.Context, params *DecryptInput, optFns ...fu addawsAwsjson11_serdeOpDecryptMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_DeleteAlias.go b/service/kms/api_op_DeleteAlias.go index 527a25c3b4f..fa7e3aa8e89 100644 --- a/service/kms/api_op_DeleteAlias.go +++ b/service/kms/api_op_DeleteAlias.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DeleteAlias(ctx context.Context, params *DeleteAliasInput, optF addawsAwsjson11_serdeOpDeleteAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_DeleteCustomKeyStore.go b/service/kms/api_op_DeleteCustomKeyStore.go index e3b151f67f0..f3cadef995d 100644 --- a/service/kms/api_op_DeleteCustomKeyStore.go +++ b/service/kms/api_op_DeleteCustomKeyStore.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -48,9 +47,9 @@ func (c *Client) DeleteCustomKeyStore(ctx context.Context, params *DeleteCustomK addawsAwsjson11_serdeOpDeleteCustomKeyStoreMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_DeleteImportedKeyMaterial.go b/service/kms/api_op_DeleteImportedKeyMaterial.go index f923bef0a7e..8c455898c62 100644 --- a/service/kms/api_op_DeleteImportedKeyMaterial.go +++ b/service/kms/api_op_DeleteImportedKeyMaterial.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -34,9 +33,9 @@ func (c *Client) DeleteImportedKeyMaterial(ctx context.Context, params *DeleteIm addawsAwsjson11_serdeOpDeleteImportedKeyMaterialMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_DescribeCustomKeyStores.go b/service/kms/api_op_DescribeCustomKeyStores.go index bbfa87bdf76..6b4c9799ab1 100644 --- a/service/kms/api_op_DescribeCustomKeyStores.go +++ b/service/kms/api_op_DescribeCustomKeyStores.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) DescribeCustomKeyStores(ctx context.Context, params *DescribeCu addawsAwsjson11_serdeOpDescribeCustomKeyStoresMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_DescribeKey.go b/service/kms/api_op_DescribeKey.go index 799f47300d5..71e1502a01b 100644 --- a/service/kms/api_op_DescribeKey.go +++ b/service/kms/api_op_DescribeKey.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -61,9 +60,9 @@ func (c *Client) DescribeKey(ctx context.Context, params *DescribeKeyInput, optF addawsAwsjson11_serdeOpDescribeKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_DisableKey.go b/service/kms/api_op_DisableKey.go index a9cc12d48a9..07df19e7a91 100644 --- a/service/kms/api_op_DisableKey.go +++ b/service/kms/api_op_DisableKey.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) DisableKey(ctx context.Context, params *DisableKeyInput, optFns addawsAwsjson11_serdeOpDisableKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_DisableKeyRotation.go b/service/kms/api_op_DisableKeyRotation.go index 3f50a17919b..2e2db49a53f 100644 --- a/service/kms/api_op_DisableKeyRotation.go +++ b/service/kms/api_op_DisableKeyRotation.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) DisableKeyRotation(ctx context.Context, params *DisableKeyRotat addawsAwsjson11_serdeOpDisableKeyRotationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_DisconnectCustomKeyStore.go b/service/kms/api_op_DisconnectCustomKeyStore.go index 892441d79bb..353a643f0ed 100644 --- a/service/kms/api_op_DisconnectCustomKeyStore.go +++ b/service/kms/api_op_DisconnectCustomKeyStore.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -39,9 +38,9 @@ func (c *Client) DisconnectCustomKeyStore(ctx context.Context, params *Disconnec addawsAwsjson11_serdeOpDisconnectCustomKeyStoreMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_EnableKey.go b/service/kms/api_op_EnableKey.go index 5c6a7e16b7f..5d6bbfdadcd 100644 --- a/service/kms/api_op_EnableKey.go +++ b/service/kms/api_op_EnableKey.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) EnableKey(ctx context.Context, params *EnableKeyInput, optFns . addawsAwsjson11_serdeOpEnableKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_EnableKeyRotation.go b/service/kms/api_op_EnableKeyRotation.go index 05e1d5f2eba..ef90bb0cfbc 100644 --- a/service/kms/api_op_EnableKeyRotation.go +++ b/service/kms/api_op_EnableKeyRotation.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) EnableKeyRotation(ctx context.Context, params *EnableKeyRotatio addawsAwsjson11_serdeOpEnableKeyRotationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_Encrypt.go b/service/kms/api_op_Encrypt.go index 6dd8efd6773..be4b79c9036 100644 --- a/service/kms/api_op_Encrypt.go +++ b/service/kms/api_op_Encrypt.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -80,9 +79,9 @@ func (c *Client) Encrypt(ctx context.Context, params *EncryptInput, optFns ...fu addawsAwsjson11_serdeOpEncryptMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_GenerateDataKey.go b/service/kms/api_op_GenerateDataKey.go index 65368968c77..0673b1ab4df 100644 --- a/service/kms/api_op_GenerateDataKey.go +++ b/service/kms/api_op_GenerateDataKey.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -79,9 +78,9 @@ func (c *Client) GenerateDataKey(ctx context.Context, params *GenerateDataKeyInp addawsAwsjson11_serdeOpGenerateDataKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_GenerateDataKeyPair.go b/service/kms/api_op_GenerateDataKeyPair.go index cd8ba35d726..e7f9ac3e819 100644 --- a/service/kms/api_op_GenerateDataKeyPair.go +++ b/service/kms/api_op_GenerateDataKeyPair.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -55,9 +54,9 @@ func (c *Client) GenerateDataKeyPair(ctx context.Context, params *GenerateDataKe addawsAwsjson11_serdeOpGenerateDataKeyPairMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_GenerateDataKeyPairWithoutPlaintext.go b/service/kms/api_op_GenerateDataKeyPairWithoutPlaintext.go index 88b14e7de11..953fa0041fa 100644 --- a/service/kms/api_op_GenerateDataKeyPairWithoutPlaintext.go +++ b/service/kms/api_op_GenerateDataKeyPairWithoutPlaintext.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -48,9 +47,9 @@ func (c *Client) GenerateDataKeyPairWithoutPlaintext(ctx context.Context, params addawsAwsjson11_serdeOpGenerateDataKeyPairWithoutPlaintextMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_GenerateDataKeyWithoutPlaintext.go b/service/kms/api_op_GenerateDataKeyWithoutPlaintext.go index 95da45114fd..a4b04c097e8 100644 --- a/service/kms/api_op_GenerateDataKeyWithoutPlaintext.go +++ b/service/kms/api_op_GenerateDataKeyWithoutPlaintext.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -56,9 +55,9 @@ func (c *Client) GenerateDataKeyWithoutPlaintext(ctx context.Context, params *Ge addawsAwsjson11_serdeOpGenerateDataKeyWithoutPlaintextMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_GenerateRandom.go b/service/kms/api_op_GenerateRandom.go index bd6a9e4f50e..b2e4c0b598b 100644 --- a/service/kms/api_op_GenerateRandom.go +++ b/service/kms/api_op_GenerateRandom.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) GenerateRandom(ctx context.Context, params *GenerateRandomInput addawsAwsjson11_serdeOpGenerateRandomMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_GetKeyPolicy.go b/service/kms/api_op_GetKeyPolicy.go index 56eda6fc5a9..4456f0a5f52 100644 --- a/service/kms/api_op_GetKeyPolicy.go +++ b/service/kms/api_op_GetKeyPolicy.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetKeyPolicy(ctx context.Context, params *GetKeyPolicyInput, op addawsAwsjson11_serdeOpGetKeyPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_GetKeyRotationStatus.go b/service/kms/api_op_GetKeyRotationStatus.go index e40be4d48d8..ab9371bd47b 100644 --- a/service/kms/api_op_GetKeyRotationStatus.go +++ b/service/kms/api_op_GetKeyRotationStatus.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -45,9 +44,9 @@ func (c *Client) GetKeyRotationStatus(ctx context.Context, params *GetKeyRotatio addawsAwsjson11_serdeOpGetKeyRotationStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_GetParametersForImport.go b/service/kms/api_op_GetParametersForImport.go index be468433a02..e99f35e489b 100644 --- a/service/kms/api_op_GetParametersForImport.go +++ b/service/kms/api_op_GetParametersForImport.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) GetParametersForImport(ctx context.Context, params *GetParamete addawsAwsjson11_serdeOpGetParametersForImportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_GetPublicKey.go b/service/kms/api_op_GetPublicKey.go index a35681896ce..43149c6be64 100644 --- a/service/kms/api_op_GetPublicKey.go +++ b/service/kms/api_op_GetPublicKey.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -61,9 +60,9 @@ func (c *Client) GetPublicKey(ctx context.Context, params *GetPublicKeyInput, op addawsAwsjson11_serdeOpGetPublicKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_ImportKeyMaterial.go b/service/kms/api_op_ImportKeyMaterial.go index 9c0bf1fe892..9b29ef71cf7 100644 --- a/service/kms/api_op_ImportKeyMaterial.go +++ b/service/kms/api_op_ImportKeyMaterial.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -70,9 +69,9 @@ func (c *Client) ImportKeyMaterial(ctx context.Context, params *ImportKeyMateria addawsAwsjson11_serdeOpImportKeyMaterialMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_ListAliases.go b/service/kms/api_op_ListAliases.go index 0e5ecf03f6a..426d53341d7 100644 --- a/service/kms/api_op_ListAliases.go +++ b/service/kms/api_op_ListAliases.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) ListAliases(ctx context.Context, params *ListAliasesInput, optF addawsAwsjson11_serdeOpListAliasesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_ListGrants.go b/service/kms/api_op_ListGrants.go index 2b16459eca9..af06c7b0b08 100644 --- a/service/kms/api_op_ListGrants.go +++ b/service/kms/api_op_ListGrants.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListGrants(ctx context.Context, params *ListGrantsInput, optFns addawsAwsjson11_serdeOpListGrantsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_ListKeyPolicies.go b/service/kms/api_op_ListKeyPolicies.go index 48b0ab0c8d4..1157e97b979 100644 --- a/service/kms/api_op_ListKeyPolicies.go +++ b/service/kms/api_op_ListKeyPolicies.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) ListKeyPolicies(ctx context.Context, params *ListKeyPoliciesInp addawsAwsjson11_serdeOpListKeyPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_ListKeys.go b/service/kms/api_op_ListKeys.go index ce3c1cc66ee..f0b66a57e8b 100644 --- a/service/kms/api_op_ListKeys.go +++ b/service/kms/api_op_ListKeys.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListKeys(ctx context.Context, params *ListKeysInput, optFns ... addawsAwsjson11_serdeOpListKeysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_ListResourceTags.go b/service/kms/api_op_ListResourceTags.go index 9a5f03fc248..c304b8c3384 100644 --- a/service/kms/api_op_ListResourceTags.go +++ b/service/kms/api_op_ListResourceTags.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListResourceTags(ctx context.Context, params *ListResourceTagsI addawsAwsjson11_serdeOpListResourceTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_ListRetirableGrants.go b/service/kms/api_op_ListRetirableGrants.go index 2662c4ae315..98f128cfb51 100644 --- a/service/kms/api_op_ListRetirableGrants.go +++ b/service/kms/api_op_ListRetirableGrants.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListRetirableGrants(ctx context.Context, params *ListRetirableG addawsAwsjson11_serdeOpListRetirableGrantsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_PutKeyPolicy.go b/service/kms/api_op_PutKeyPolicy.go index a976f258cfe..2c6b63bb9c8 100644 --- a/service/kms/api_op_PutKeyPolicy.go +++ b/service/kms/api_op_PutKeyPolicy.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) PutKeyPolicy(ctx context.Context, params *PutKeyPolicyInput, op addawsAwsjson11_serdeOpPutKeyPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_ReEncrypt.go b/service/kms/api_op_ReEncrypt.go index 4ab9d8fa63f..e4097762c26 100644 --- a/service/kms/api_op_ReEncrypt.go +++ b/service/kms/api_op_ReEncrypt.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -83,9 +82,9 @@ func (c *Client) ReEncrypt(ctx context.Context, params *ReEncryptInput, optFns . addawsAwsjson11_serdeOpReEncryptMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_RetireGrant.go b/service/kms/api_op_RetireGrant.go index f23530f3edb..c6ba0380904 100644 --- a/service/kms/api_op_RetireGrant.go +++ b/service/kms/api_op_RetireGrant.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -39,9 +38,9 @@ func (c *Client) RetireGrant(ctx context.Context, params *RetireGrantInput, optF addawsAwsjson11_serdeOpRetireGrantMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_RevokeGrant.go b/service/kms/api_op_RevokeGrant.go index 97b74b993d3..7c9a9136070 100644 --- a/service/kms/api_op_RevokeGrant.go +++ b/service/kms/api_op_RevokeGrant.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) RevokeGrant(ctx context.Context, params *RevokeGrantInput, optF addawsAwsjson11_serdeOpRevokeGrantMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_ScheduleKeyDeletion.go b/service/kms/api_op_ScheduleKeyDeletion.go index ce434517000..748c83c9d3b 100644 --- a/service/kms/api_op_ScheduleKeyDeletion.go +++ b/service/kms/api_op_ScheduleKeyDeletion.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -48,9 +47,9 @@ func (c *Client) ScheduleKeyDeletion(ctx context.Context, params *ScheduleKeyDel addawsAwsjson11_serdeOpScheduleKeyDeletionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_Sign.go b/service/kms/api_op_Sign.go index 84c8414f833..2f98dd081f4 100644 --- a/service/kms/api_op_Sign.go +++ b/service/kms/api_op_Sign.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -60,9 +59,9 @@ func (c *Client) Sign(ctx context.Context, params *SignInput, optFns ...func(*Op addawsAwsjson11_serdeOpSignMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_TagResource.go b/service/kms/api_op_TagResource.go index a2dd07940b5..70d6d348d3a 100644 --- a/service/kms/api_op_TagResource.go +++ b/service/kms/api_op_TagResource.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_UntagResource.go b/service/kms/api_op_UntagResource.go index 86cf5e56de9..f74efa20094 100644 --- a/service/kms/api_op_UntagResource.go +++ b/service/kms/api_op_UntagResource.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_UpdateAlias.go b/service/kms/api_op_UpdateAlias.go index b2229559ea5..01b1a94de90 100644 --- a/service/kms/api_op_UpdateAlias.go +++ b/service/kms/api_op_UpdateAlias.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -40,9 +39,9 @@ func (c *Client) UpdateAlias(ctx context.Context, params *UpdateAliasInput, optF addawsAwsjson11_serdeOpUpdateAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_UpdateCustomKeyStore.go b/service/kms/api_op_UpdateCustomKeyStore.go index 4db728a01e4..f1286923107 100644 --- a/service/kms/api_op_UpdateCustomKeyStore.go +++ b/service/kms/api_op_UpdateCustomKeyStore.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -55,9 +54,9 @@ func (c *Client) UpdateCustomKeyStore(ctx context.Context, params *UpdateCustomK addawsAwsjson11_serdeOpUpdateCustomKeyStoreMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_UpdateKeyDescription.go b/service/kms/api_op_UpdateKeyDescription.go index 594a6f5c182..1b0acf16be0 100644 --- a/service/kms/api_op_UpdateKeyDescription.go +++ b/service/kms/api_op_UpdateKeyDescription.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) UpdateKeyDescription(ctx context.Context, params *UpdateKeyDesc addawsAwsjson11_serdeOpUpdateKeyDescriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/api_op_Verify.go b/service/kms/api_op_Verify.go index 163c6ffd416..cdeccc55faf 100644 --- a/service/kms/api_op_Verify.go +++ b/service/kms/api_op_Verify.go @@ -5,7 +5,6 @@ package kms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/kms/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) Verify(ctx context.Context, params *VerifyInput, optFns ...func addawsAwsjson11_serdeOpVerifyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/kms/endpoints.go b/service/kms/endpoints.go index 4bb68b8bbc1..9e45b0dbbdd 100644 --- a/service/kms/endpoints.go +++ b/service/kms/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/lakeformation/api_client.go b/service/lakeformation/api_client.go index 0f908434612..02d4bb088d9 100644 --- a/service/lakeformation/api_client.go +++ b/service/lakeformation/api_client.go @@ -78,30 +78,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -167,6 +143,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/lakeformation/api_op_BatchGrantPermissions.go b/service/lakeformation/api_op_BatchGrantPermissions.go index 38303c9f08e..4bfca2c0c6a 100644 --- a/service/lakeformation/api_op_BatchGrantPermissions.go +++ b/service/lakeformation/api_op_BatchGrantPermissions.go @@ -5,7 +5,6 @@ package lakeformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lakeformation/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchGrantPermissions(ctx context.Context, params *BatchGrantPe addawsAwsjson11_serdeOpBatchGrantPermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lakeformation/api_op_BatchRevokePermissions.go b/service/lakeformation/api_op_BatchRevokePermissions.go index 59392395e8d..2330153aec4 100644 --- a/service/lakeformation/api_op_BatchRevokePermissions.go +++ b/service/lakeformation/api_op_BatchRevokePermissions.go @@ -5,7 +5,6 @@ package lakeformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lakeformation/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchRevokePermissions(ctx context.Context, params *BatchRevoke addawsAwsjson11_serdeOpBatchRevokePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lakeformation/api_op_DeregisterResource.go b/service/lakeformation/api_op_DeregisterResource.go index c0bb846d9b8..94d120938d5 100644 --- a/service/lakeformation/api_op_DeregisterResource.go +++ b/service/lakeformation/api_op_DeregisterResource.go @@ -5,7 +5,6 @@ package lakeformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeregisterResource(ctx context.Context, params *DeregisterResou addawsAwsjson11_serdeOpDeregisterResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lakeformation/api_op_DescribeResource.go b/service/lakeformation/api_op_DescribeResource.go index 2c797e3e0bf..447c2c2bff7 100644 --- a/service/lakeformation/api_op_DescribeResource.go +++ b/service/lakeformation/api_op_DescribeResource.go @@ -5,7 +5,6 @@ package lakeformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lakeformation/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeResource(ctx context.Context, params *DescribeResourceI addawsAwsjson11_serdeOpDescribeResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lakeformation/api_op_GetDataLakeSettings.go b/service/lakeformation/api_op_GetDataLakeSettings.go index 1013c92c7c4..e10aeb37e45 100644 --- a/service/lakeformation/api_op_GetDataLakeSettings.go +++ b/service/lakeformation/api_op_GetDataLakeSettings.go @@ -5,7 +5,6 @@ package lakeformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lakeformation/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetDataLakeSettings(ctx context.Context, params *GetDataLakeSet addawsAwsjson11_serdeOpGetDataLakeSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lakeformation/api_op_GetEffectivePermissionsForPath.go b/service/lakeformation/api_op_GetEffectivePermissionsForPath.go index 0ead500d2c7..bdc9fa2284b 100644 --- a/service/lakeformation/api_op_GetEffectivePermissionsForPath.go +++ b/service/lakeformation/api_op_GetEffectivePermissionsForPath.go @@ -5,7 +5,6 @@ package lakeformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lakeformation/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetEffectivePermissionsForPath(ctx context.Context, params *Get addawsAwsjson11_serdeOpGetEffectivePermissionsForPathMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lakeformation/api_op_GrantPermissions.go b/service/lakeformation/api_op_GrantPermissions.go index f2f15621104..7dc47042c01 100644 --- a/service/lakeformation/api_op_GrantPermissions.go +++ b/service/lakeformation/api_op_GrantPermissions.go @@ -5,7 +5,6 @@ package lakeformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lakeformation/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GrantPermissions(ctx context.Context, params *GrantPermissionsI addawsAwsjson11_serdeOpGrantPermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lakeformation/api_op_ListPermissions.go b/service/lakeformation/api_op_ListPermissions.go index 283b8a7c1b0..97b1d25ffee 100644 --- a/service/lakeformation/api_op_ListPermissions.go +++ b/service/lakeformation/api_op_ListPermissions.go @@ -5,7 +5,6 @@ package lakeformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lakeformation/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListPermissions(ctx context.Context, params *ListPermissionsInp addawsAwsjson11_serdeOpListPermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lakeformation/api_op_ListResources.go b/service/lakeformation/api_op_ListResources.go index 1e559f8c75f..762438506c9 100644 --- a/service/lakeformation/api_op_ListResources.go +++ b/service/lakeformation/api_op_ListResources.go @@ -5,7 +5,6 @@ package lakeformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lakeformation/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListResources(ctx context.Context, params *ListResourcesInput, addawsAwsjson11_serdeOpListResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lakeformation/api_op_PutDataLakeSettings.go b/service/lakeformation/api_op_PutDataLakeSettings.go index e6a428b4d5f..b7bdb28872e 100644 --- a/service/lakeformation/api_op_PutDataLakeSettings.go +++ b/service/lakeformation/api_op_PutDataLakeSettings.go @@ -5,7 +5,6 @@ package lakeformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lakeformation/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) PutDataLakeSettings(ctx context.Context, params *PutDataLakeSet addawsAwsjson11_serdeOpPutDataLakeSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lakeformation/api_op_RegisterResource.go b/service/lakeformation/api_op_RegisterResource.go index 67f8791d5e0..01f603e9425 100644 --- a/service/lakeformation/api_op_RegisterResource.go +++ b/service/lakeformation/api_op_RegisterResource.go @@ -5,7 +5,6 @@ package lakeformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) RegisterResource(ctx context.Context, params *RegisterResourceI addawsAwsjson11_serdeOpRegisterResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lakeformation/api_op_RevokePermissions.go b/service/lakeformation/api_op_RevokePermissions.go index 60fcf3f4011..fb8fe41e705 100644 --- a/service/lakeformation/api_op_RevokePermissions.go +++ b/service/lakeformation/api_op_RevokePermissions.go @@ -5,7 +5,6 @@ package lakeformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lakeformation/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) RevokePermissions(ctx context.Context, params *RevokePermission addawsAwsjson11_serdeOpRevokePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lakeformation/api_op_UpdateResource.go b/service/lakeformation/api_op_UpdateResource.go index f2bd01abb7c..91104615413 100644 --- a/service/lakeformation/api_op_UpdateResource.go +++ b/service/lakeformation/api_op_UpdateResource.go @@ -5,7 +5,6 @@ package lakeformation import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpdateResource(ctx context.Context, params *UpdateResourceInput addawsAwsjson11_serdeOpUpdateResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lakeformation/endpoints.go b/service/lakeformation/endpoints.go index ef4d0ee16c6..b3309b3e190 100644 --- a/service/lakeformation/endpoints.go +++ b/service/lakeformation/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/lambda/api_client.go b/service/lambda/api_client.go index b6365bffcb6..b017e12ac81 100644 --- a/service/lambda/api_client.go +++ b/service/lambda/api_client.go @@ -82,30 +82,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -171,6 +147,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/lambda/api_op_AddLayerVersionPermission.go b/service/lambda/api_op_AddLayerVersionPermission.go index 98af6cd0637..2d13e156794 100644 --- a/service/lambda/api_op_AddLayerVersionPermission.go +++ b/service/lambda/api_op_AddLayerVersionPermission.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) AddLayerVersionPermission(ctx context.Context, params *AddLayer addawsRestjson1_serdeOpAddLayerVersionPermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_AddPermission.go b/service/lambda/api_op_AddPermission.go index 81797fb2f1c..836fadc2020 100644 --- a/service/lambda/api_op_AddPermission.go +++ b/service/lambda/api_op_AddPermission.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -36,9 +35,9 @@ func (c *Client) AddPermission(ctx context.Context, params *AddPermissionInput, addawsRestjson1_serdeOpAddPermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_CreateAlias.go b/service/lambda/api_op_CreateAlias.go index 70e69809f20..5a14b7d3385 100644 --- a/service/lambda/api_op_CreateAlias.go +++ b/service/lambda/api_op_CreateAlias.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateAlias(ctx context.Context, params *CreateAliasInput, optF addawsRestjson1_serdeOpCreateAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_CreateEventSourceMapping.go b/service/lambda/api_op_CreateEventSourceMapping.go index 5e7cbaf4bd8..6f6fdf320b7 100644 --- a/service/lambda/api_op_CreateEventSourceMapping.go +++ b/service/lambda/api_op_CreateEventSourceMapping.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -56,9 +55,9 @@ func (c *Client) CreateEventSourceMapping(ctx context.Context, params *CreateEve addawsRestjson1_serdeOpCreateEventSourceMappingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_CreateFunction.go b/service/lambda/api_op_CreateFunction.go index cc5c76a4d20..8dfd1bfe017 100644 --- a/service/lambda/api_op_CreateFunction.go +++ b/service/lambda/api_op_CreateFunction.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -56,9 +55,9 @@ func (c *Client) CreateFunction(ctx context.Context, params *CreateFunctionInput addawsRestjson1_serdeOpCreateFunctionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_DeleteAlias.go b/service/lambda/api_op_DeleteAlias.go index 1c7a3c94afa..ea488ba7eae 100644 --- a/service/lambda/api_op_DeleteAlias.go +++ b/service/lambda/api_op_DeleteAlias.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteAlias(ctx context.Context, params *DeleteAliasInput, optF addawsRestjson1_serdeOpDeleteAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_DeleteEventSourceMapping.go b/service/lambda/api_op_DeleteEventSourceMapping.go index a7cb1b80f0b..d7bdb03a88e 100644 --- a/service/lambda/api_op_DeleteEventSourceMapping.go +++ b/service/lambda/api_op_DeleteEventSourceMapping.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DeleteEventSourceMapping(ctx context.Context, params *DeleteEve addawsRestjson1_serdeOpDeleteEventSourceMappingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_DeleteFunction.go b/service/lambda/api_op_DeleteFunction.go index b900697161a..32e6e4e8716 100644 --- a/service/lambda/api_op_DeleteFunction.go +++ b/service/lambda/api_op_DeleteFunction.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteFunction(ctx context.Context, params *DeleteFunctionInput addawsRestjson1_serdeOpDeleteFunctionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_DeleteFunctionConcurrency.go b/service/lambda/api_op_DeleteFunctionConcurrency.go index b84ef0c88ad..032819b80c8 100644 --- a/service/lambda/api_op_DeleteFunctionConcurrency.go +++ b/service/lambda/api_op_DeleteFunctionConcurrency.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteFunctionConcurrency(ctx context.Context, params *DeleteFu addawsRestjson1_serdeOpDeleteFunctionConcurrencyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_DeleteFunctionEventInvokeConfig.go b/service/lambda/api_op_DeleteFunctionEventInvokeConfig.go index 33c820c4549..5068371e819 100644 --- a/service/lambda/api_op_DeleteFunctionEventInvokeConfig.go +++ b/service/lambda/api_op_DeleteFunctionEventInvokeConfig.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteFunctionEventInvokeConfig(ctx context.Context, params *De addawsRestjson1_serdeOpDeleteFunctionEventInvokeConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_DeleteLayerVersion.go b/service/lambda/api_op_DeleteLayerVersion.go index d8b50929081..041dcc5688c 100644 --- a/service/lambda/api_op_DeleteLayerVersion.go +++ b/service/lambda/api_op_DeleteLayerVersion.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteLayerVersion(ctx context.Context, params *DeleteLayerVers addawsRestjson1_serdeOpDeleteLayerVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_DeleteProvisionedConcurrencyConfig.go b/service/lambda/api_op_DeleteProvisionedConcurrencyConfig.go index 7e75fe7c910..26ac50ac22f 100644 --- a/service/lambda/api_op_DeleteProvisionedConcurrencyConfig.go +++ b/service/lambda/api_op_DeleteProvisionedConcurrencyConfig.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteProvisionedConcurrencyConfig(ctx context.Context, params addawsRestjson1_serdeOpDeleteProvisionedConcurrencyConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_GetAccountSettings.go b/service/lambda/api_op_GetAccountSettings.go index 9a66a1c706f..bdf2598b721 100644 --- a/service/lambda/api_op_GetAccountSettings.go +++ b/service/lambda/api_op_GetAccountSettings.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetAccountSettings(ctx context.Context, params *GetAccountSetti addawsRestjson1_serdeOpGetAccountSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_GetAlias.go b/service/lambda/api_op_GetAlias.go index 6c3139b12d6..3779a04d46d 100644 --- a/service/lambda/api_op_GetAlias.go +++ b/service/lambda/api_op_GetAlias.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetAlias(ctx context.Context, params *GetAliasInput, optFns ... addawsRestjson1_serdeOpGetAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_GetEventSourceMapping.go b/service/lambda/api_op_GetEventSourceMapping.go index e097c9b8bf8..76ff2239ddf 100644 --- a/service/lambda/api_op_GetEventSourceMapping.go +++ b/service/lambda/api_op_GetEventSourceMapping.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetEventSourceMapping(ctx context.Context, params *GetEventSour addawsRestjson1_serdeOpGetEventSourceMappingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_GetFunction.go b/service/lambda/api_op_GetFunction.go index 49e189e5baa..e830c39df69 100644 --- a/service/lambda/api_op_GetFunction.go +++ b/service/lambda/api_op_GetFunction.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetFunction(ctx context.Context, params *GetFunctionInput, optF addawsRestjson1_serdeOpGetFunctionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_GetFunctionConcurrency.go b/service/lambda/api_op_GetFunctionConcurrency.go index ef3448ef4eb..130cc486861 100644 --- a/service/lambda/api_op_GetFunctionConcurrency.go +++ b/service/lambda/api_op_GetFunctionConcurrency.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetFunctionConcurrency(ctx context.Context, params *GetFunction addawsRestjson1_serdeOpGetFunctionConcurrencyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_GetFunctionConfiguration.go b/service/lambda/api_op_GetFunctionConfiguration.go index e675d347eaf..05645020aae 100644 --- a/service/lambda/api_op_GetFunctionConfiguration.go +++ b/service/lambda/api_op_GetFunctionConfiguration.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetFunctionConfiguration(ctx context.Context, params *GetFuncti addawsRestjson1_serdeOpGetFunctionConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_GetFunctionEventInvokeConfig.go b/service/lambda/api_op_GetFunctionEventInvokeConfig.go index 65531adacf9..6e79a60a6d8 100644 --- a/service/lambda/api_op_GetFunctionEventInvokeConfig.go +++ b/service/lambda/api_op_GetFunctionEventInvokeConfig.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetFunctionEventInvokeConfig(ctx context.Context, params *GetFu addawsRestjson1_serdeOpGetFunctionEventInvokeConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_GetLayerVersion.go b/service/lambda/api_op_GetLayerVersion.go index 208df37e97f..199a200c9f2 100644 --- a/service/lambda/api_op_GetLayerVersion.go +++ b/service/lambda/api_op_GetLayerVersion.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetLayerVersion(ctx context.Context, params *GetLayerVersionInp addawsRestjson1_serdeOpGetLayerVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_GetLayerVersionByArn.go b/service/lambda/api_op_GetLayerVersionByArn.go index 68dfee14623..874bb058d95 100644 --- a/service/lambda/api_op_GetLayerVersionByArn.go +++ b/service/lambda/api_op_GetLayerVersionByArn.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetLayerVersionByArn(ctx context.Context, params *GetLayerVersi addawsRestjson1_serdeOpGetLayerVersionByArnMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_GetLayerVersionPolicy.go b/service/lambda/api_op_GetLayerVersionPolicy.go index 3ec1b01340b..01e409becca 100644 --- a/service/lambda/api_op_GetLayerVersionPolicy.go +++ b/service/lambda/api_op_GetLayerVersionPolicy.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) GetLayerVersionPolicy(ctx context.Context, params *GetLayerVers addawsRestjson1_serdeOpGetLayerVersionPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_GetPolicy.go b/service/lambda/api_op_GetPolicy.go index 9e9e3b82de3..8a79a06f8d2 100644 --- a/service/lambda/api_op_GetPolicy.go +++ b/service/lambda/api_op_GetPolicy.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) GetPolicy(ctx context.Context, params *GetPolicyInput, optFns . addawsRestjson1_serdeOpGetPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_GetProvisionedConcurrencyConfig.go b/service/lambda/api_op_GetProvisionedConcurrencyConfig.go index b65e4a8fed9..1613397432a 100644 --- a/service/lambda/api_op_GetProvisionedConcurrencyConfig.go +++ b/service/lambda/api_op_GetProvisionedConcurrencyConfig.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetProvisionedConcurrencyConfig(ctx context.Context, params *Ge addawsRestjson1_serdeOpGetProvisionedConcurrencyConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_Invoke.go b/service/lambda/api_op_Invoke.go index 27d7b0d48c9..a221fb5a6b1 100644 --- a/service/lambda/api_op_Invoke.go +++ b/service/lambda/api_op_Invoke.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -61,9 +60,9 @@ func (c *Client) Invoke(ctx context.Context, params *InvokeInput, optFns ...func addawsRestjson1_serdeOpInvokeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_InvokeAsync.go b/service/lambda/api_op_InvokeAsync.go index 95b2fcb6fdc..d6d83f15d41 100644 --- a/service/lambda/api_op_InvokeAsync.go +++ b/service/lambda/api_op_InvokeAsync.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) InvokeAsync(ctx context.Context, params *InvokeAsyncInput, optF addawsRestjson1_serdeOpInvokeAsyncMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_ListAliases.go b/service/lambda/api_op_ListAliases.go index a431dccb349..6151536916d 100644 --- a/service/lambda/api_op_ListAliases.go +++ b/service/lambda/api_op_ListAliases.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListAliases(ctx context.Context, params *ListAliasesInput, optF addawsRestjson1_serdeOpListAliasesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_ListEventSourceMappings.go b/service/lambda/api_op_ListEventSourceMappings.go index d0cb67307e9..49ae9516448 100644 --- a/service/lambda/api_op_ListEventSourceMappings.go +++ b/service/lambda/api_op_ListEventSourceMappings.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListEventSourceMappings(ctx context.Context, params *ListEventS addawsRestjson1_serdeOpListEventSourceMappingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_ListFunctionEventInvokeConfigs.go b/service/lambda/api_op_ListFunctionEventInvokeConfigs.go index 96bf75d7a09..9e73813ae06 100644 --- a/service/lambda/api_op_ListFunctionEventInvokeConfigs.go +++ b/service/lambda/api_op_ListFunctionEventInvokeConfigs.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListFunctionEventInvokeConfigs(ctx context.Context, params *Lis addawsRestjson1_serdeOpListFunctionEventInvokeConfigsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_ListFunctions.go b/service/lambda/api_op_ListFunctions.go index 1aab9c42cca..5fed8e8682d 100644 --- a/service/lambda/api_op_ListFunctions.go +++ b/service/lambda/api_op_ListFunctions.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListFunctions(ctx context.Context, params *ListFunctionsInput, addawsRestjson1_serdeOpListFunctionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_ListLayerVersions.go b/service/lambda/api_op_ListLayerVersions.go index 9e743998cd4..24c26dc43f5 100644 --- a/service/lambda/api_op_ListLayerVersions.go +++ b/service/lambda/api_op_ListLayerVersions.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListLayerVersions(ctx context.Context, params *ListLayerVersion addawsRestjson1_serdeOpListLayerVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_ListLayers.go b/service/lambda/api_op_ListLayers.go index bfef32c0f4f..c3d2b323c36 100644 --- a/service/lambda/api_op_ListLayers.go +++ b/service/lambda/api_op_ListLayers.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListLayers(ctx context.Context, params *ListLayersInput, optFns addawsRestjson1_serdeOpListLayersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_ListProvisionedConcurrencyConfigs.go b/service/lambda/api_op_ListProvisionedConcurrencyConfigs.go index e69bd018ade..306ede6560f 100644 --- a/service/lambda/api_op_ListProvisionedConcurrencyConfigs.go +++ b/service/lambda/api_op_ListProvisionedConcurrencyConfigs.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListProvisionedConcurrencyConfigs(ctx context.Context, params * addawsRestjson1_serdeOpListProvisionedConcurrencyConfigsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_ListTags.go b/service/lambda/api_op_ListTags.go index 262183215c8..345fe697ea1 100644 --- a/service/lambda/api_op_ListTags.go +++ b/service/lambda/api_op_ListTags.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ListTags(ctx context.Context, params *ListTagsInput, optFns ... addawsRestjson1_serdeOpListTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_ListVersionsByFunction.go b/service/lambda/api_op_ListVersionsByFunction.go index 58df76e58c6..5e47e4b487d 100644 --- a/service/lambda/api_op_ListVersionsByFunction.go +++ b/service/lambda/api_op_ListVersionsByFunction.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListVersionsByFunction(ctx context.Context, params *ListVersion addawsRestjson1_serdeOpListVersionsByFunctionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_PublishLayerVersion.go b/service/lambda/api_op_PublishLayerVersion.go index cd142736107..4aa5e912f21 100644 --- a/service/lambda/api_op_PublishLayerVersion.go +++ b/service/lambda/api_op_PublishLayerVersion.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) PublishLayerVersion(ctx context.Context, params *PublishLayerVe addawsRestjson1_serdeOpPublishLayerVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_PublishVersion.go b/service/lambda/api_op_PublishVersion.go index 74b3f12beda..5dafbbac718 100644 --- a/service/lambda/api_op_PublishVersion.go +++ b/service/lambda/api_op_PublishVersion.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) PublishVersion(ctx context.Context, params *PublishVersionInput addawsRestjson1_serdeOpPublishVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_PutFunctionConcurrency.go b/service/lambda/api_op_PutFunctionConcurrency.go index 79e2de3f913..ca6f998ec05 100644 --- a/service/lambda/api_op_PutFunctionConcurrency.go +++ b/service/lambda/api_op_PutFunctionConcurrency.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) PutFunctionConcurrency(ctx context.Context, params *PutFunction addawsRestjson1_serdeOpPutFunctionConcurrencyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_PutFunctionEventInvokeConfig.go b/service/lambda/api_op_PutFunctionEventInvokeConfig.go index 17d4993abcf..af1714b9b4b 100644 --- a/service/lambda/api_op_PutFunctionEventInvokeConfig.go +++ b/service/lambda/api_op_PutFunctionEventInvokeConfig.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) PutFunctionEventInvokeConfig(ctx context.Context, params *PutFu addawsRestjson1_serdeOpPutFunctionEventInvokeConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_PutProvisionedConcurrencyConfig.go b/service/lambda/api_op_PutProvisionedConcurrencyConfig.go index 06f15f369fc..9900a8529d3 100644 --- a/service/lambda/api_op_PutProvisionedConcurrencyConfig.go +++ b/service/lambda/api_op_PutProvisionedConcurrencyConfig.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutProvisionedConcurrencyConfig(ctx context.Context, params *Pu addawsRestjson1_serdeOpPutProvisionedConcurrencyConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_RemoveLayerVersionPermission.go b/service/lambda/api_op_RemoveLayerVersionPermission.go index d5079d85fc5..b46633f02df 100644 --- a/service/lambda/api_op_RemoveLayerVersionPermission.go +++ b/service/lambda/api_op_RemoveLayerVersionPermission.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) RemoveLayerVersionPermission(ctx context.Context, params *Remov addawsRestjson1_serdeOpRemoveLayerVersionPermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_RemovePermission.go b/service/lambda/api_op_RemovePermission.go index 12822e861ae..439c609985c 100644 --- a/service/lambda/api_op_RemovePermission.go +++ b/service/lambda/api_op_RemovePermission.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) RemovePermission(ctx context.Context, params *RemovePermissionI addawsRestjson1_serdeOpRemovePermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_TagResource.go b/service/lambda/api_op_TagResource.go index 33835bc4a42..c5f4c8c12df 100644 --- a/service/lambda/api_op_TagResource.go +++ b/service/lambda/api_op_TagResource.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_UntagResource.go b/service/lambda/api_op_UntagResource.go index b1beea3b462..dd287f7f601 100644 --- a/service/lambda/api_op_UntagResource.go +++ b/service/lambda/api_op_UntagResource.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_UpdateAlias.go b/service/lambda/api_op_UpdateAlias.go index 1732d3f7b42..b5c4eae5f57 100644 --- a/service/lambda/api_op_UpdateAlias.go +++ b/service/lambda/api_op_UpdateAlias.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateAlias(ctx context.Context, params *UpdateAliasInput, optF addawsRestjson1_serdeOpUpdateAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_UpdateEventSourceMapping.go b/service/lambda/api_op_UpdateEventSourceMapping.go index ddffc8daebb..685dd5e896e 100644 --- a/service/lambda/api_op_UpdateEventSourceMapping.go +++ b/service/lambda/api_op_UpdateEventSourceMapping.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) UpdateEventSourceMapping(ctx context.Context, params *UpdateEve addawsRestjson1_serdeOpUpdateEventSourceMappingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_UpdateFunctionCode.go b/service/lambda/api_op_UpdateFunctionCode.go index 5348e45911d..4a3da6b210b 100644 --- a/service/lambda/api_op_UpdateFunctionCode.go +++ b/service/lambda/api_op_UpdateFunctionCode.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateFunctionCode(ctx context.Context, params *UpdateFunctionC addawsRestjson1_serdeOpUpdateFunctionCodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_UpdateFunctionConfiguration.go b/service/lambda/api_op_UpdateFunctionConfiguration.go index e65d376f4e3..bfb0061d981 100644 --- a/service/lambda/api_op_UpdateFunctionConfiguration.go +++ b/service/lambda/api_op_UpdateFunctionConfiguration.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) UpdateFunctionConfiguration(ctx context.Context, params *Update addawsRestjson1_serdeOpUpdateFunctionConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/api_op_UpdateFunctionEventInvokeConfig.go b/service/lambda/api_op_UpdateFunctionEventInvokeConfig.go index e35ebc7c81f..02995bec5a0 100644 --- a/service/lambda/api_op_UpdateFunctionEventInvokeConfig.go +++ b/service/lambda/api_op_UpdateFunctionEventInvokeConfig.go @@ -5,7 +5,6 @@ package lambda import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lambda/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateFunctionEventInvokeConfig(ctx context.Context, params *Up addawsRestjson1_serdeOpUpdateFunctionEventInvokeConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lambda/endpoints.go b/service/lambda/endpoints.go index c9168c2c3cd..87262305fdf 100644 --- a/service/lambda/endpoints.go +++ b/service/lambda/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/lexmodelbuildingservice/api_client.go b/service/lexmodelbuildingservice/api_client.go index 9446e555316..39b53d94482 100644 --- a/service/lexmodelbuildingservice/api_client.go +++ b/service/lexmodelbuildingservice/api_client.go @@ -79,30 +79,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -168,6 +144,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/lexmodelbuildingservice/api_op_CreateBotVersion.go b/service/lexmodelbuildingservice/api_op_CreateBotVersion.go index e5adae93182..ee67648e78f 100644 --- a/service/lexmodelbuildingservice/api_op_CreateBotVersion.go +++ b/service/lexmodelbuildingservice/api_op_CreateBotVersion.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateBotVersion(ctx context.Context, params *CreateBotVersionI addawsRestjson1_serdeOpCreateBotVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_CreateIntentVersion.go b/service/lexmodelbuildingservice/api_op_CreateIntentVersion.go index 7f5d2c81c93..8eb467654dd 100644 --- a/service/lexmodelbuildingservice/api_op_CreateIntentVersion.go +++ b/service/lexmodelbuildingservice/api_op_CreateIntentVersion.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) CreateIntentVersion(ctx context.Context, params *CreateIntentVe addawsRestjson1_serdeOpCreateIntentVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_CreateSlotTypeVersion.go b/service/lexmodelbuildingservice/api_op_CreateSlotTypeVersion.go index 09a37c4bb1e..75abff9a0e1 100644 --- a/service/lexmodelbuildingservice/api_op_CreateSlotTypeVersion.go +++ b/service/lexmodelbuildingservice/api_op_CreateSlotTypeVersion.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) CreateSlotTypeVersion(ctx context.Context, params *CreateSlotTy addawsRestjson1_serdeOpCreateSlotTypeVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_DeleteBot.go b/service/lexmodelbuildingservice/api_op_DeleteBot.go index e26ce84a00a..2aba164fa4c 100644 --- a/service/lexmodelbuildingservice/api_op_DeleteBot.go +++ b/service/lexmodelbuildingservice/api_op_DeleteBot.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) DeleteBot(ctx context.Context, params *DeleteBotInput, optFns . addawsRestjson1_serdeOpDeleteBotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_DeleteBotAlias.go b/service/lexmodelbuildingservice/api_op_DeleteBotAlias.go index e6f94b7190f..d59bcbb6c15 100644 --- a/service/lexmodelbuildingservice/api_op_DeleteBotAlias.go +++ b/service/lexmodelbuildingservice/api_op_DeleteBotAlias.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeleteBotAlias(ctx context.Context, params *DeleteBotAliasInput addawsRestjson1_serdeOpDeleteBotAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_DeleteBotChannelAssociation.go b/service/lexmodelbuildingservice/api_op_DeleteBotChannelAssociation.go index 601759d01e4..d355d57a365 100644 --- a/service/lexmodelbuildingservice/api_op_DeleteBotChannelAssociation.go +++ b/service/lexmodelbuildingservice/api_op_DeleteBotChannelAssociation.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteBotChannelAssociation(ctx context.Context, params *Delete addawsRestjson1_serdeOpDeleteBotChannelAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_DeleteBotVersion.go b/service/lexmodelbuildingservice/api_op_DeleteBotVersion.go index 63b68a1b35c..5bc71f66dbe 100644 --- a/service/lexmodelbuildingservice/api_op_DeleteBotVersion.go +++ b/service/lexmodelbuildingservice/api_op_DeleteBotVersion.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteBotVersion(ctx context.Context, params *DeleteBotVersionI addawsRestjson1_serdeOpDeleteBotVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_DeleteIntent.go b/service/lexmodelbuildingservice/api_op_DeleteIntent.go index f4d410644d6..10cf3a06fcc 100644 --- a/service/lexmodelbuildingservice/api_op_DeleteIntent.go +++ b/service/lexmodelbuildingservice/api_op_DeleteIntent.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) DeleteIntent(ctx context.Context, params *DeleteIntentInput, op addawsRestjson1_serdeOpDeleteIntentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_DeleteIntentVersion.go b/service/lexmodelbuildingservice/api_op_DeleteIntentVersion.go index 57b4beb802a..d7f87bde55b 100644 --- a/service/lexmodelbuildingservice/api_op_DeleteIntentVersion.go +++ b/service/lexmodelbuildingservice/api_op_DeleteIntentVersion.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteIntentVersion(ctx context.Context, params *DeleteIntentVe addawsRestjson1_serdeOpDeleteIntentVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_DeleteSlotType.go b/service/lexmodelbuildingservice/api_op_DeleteSlotType.go index 29ab992cf8b..a8baff0a0ec 100644 --- a/service/lexmodelbuildingservice/api_op_DeleteSlotType.go +++ b/service/lexmodelbuildingservice/api_op_DeleteSlotType.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) DeleteSlotType(ctx context.Context, params *DeleteSlotTypeInput addawsRestjson1_serdeOpDeleteSlotTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_DeleteSlotTypeVersion.go b/service/lexmodelbuildingservice/api_op_DeleteSlotTypeVersion.go index 932abb5f91c..d405886be89 100644 --- a/service/lexmodelbuildingservice/api_op_DeleteSlotTypeVersion.go +++ b/service/lexmodelbuildingservice/api_op_DeleteSlotTypeVersion.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteSlotTypeVersion(ctx context.Context, params *DeleteSlotTy addawsRestjson1_serdeOpDeleteSlotTypeVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_DeleteUtterances.go b/service/lexmodelbuildingservice/api_op_DeleteUtterances.go index ffff44e44bd..7b2627dbe98 100644 --- a/service/lexmodelbuildingservice/api_op_DeleteUtterances.go +++ b/service/lexmodelbuildingservice/api_op_DeleteUtterances.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) DeleteUtterances(ctx context.Context, params *DeleteUtterancesI addawsRestjson1_serdeOpDeleteUtterancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetBot.go b/service/lexmodelbuildingservice/api_op_GetBot.go index 176a0c51f90..0b1a536d5c6 100644 --- a/service/lexmodelbuildingservice/api_op_GetBot.go +++ b/service/lexmodelbuildingservice/api_op_GetBot.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetBot(ctx context.Context, params *GetBotInput, optFns ...func addawsRestjson1_serdeOpGetBotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetBotAlias.go b/service/lexmodelbuildingservice/api_op_GetBotAlias.go index 9801bcb71be..8c101091e62 100644 --- a/service/lexmodelbuildingservice/api_op_GetBotAlias.go +++ b/service/lexmodelbuildingservice/api_op_GetBotAlias.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetBotAlias(ctx context.Context, params *GetBotAliasInput, optF addawsRestjson1_serdeOpGetBotAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetBotAliases.go b/service/lexmodelbuildingservice/api_op_GetBotAliases.go index f91d90126ce..3341a898636 100644 --- a/service/lexmodelbuildingservice/api_op_GetBotAliases.go +++ b/service/lexmodelbuildingservice/api_op_GetBotAliases.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetBotAliases(ctx context.Context, params *GetBotAliasesInput, addawsRestjson1_serdeOpGetBotAliasesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetBotChannelAssociation.go b/service/lexmodelbuildingservice/api_op_GetBotChannelAssociation.go index dee532ad8f4..beb0db9fde8 100644 --- a/service/lexmodelbuildingservice/api_op_GetBotChannelAssociation.go +++ b/service/lexmodelbuildingservice/api_op_GetBotChannelAssociation.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetBotChannelAssociation(ctx context.Context, params *GetBotCha addawsRestjson1_serdeOpGetBotChannelAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetBotChannelAssociations.go b/service/lexmodelbuildingservice/api_op_GetBotChannelAssociations.go index 62a2e9655bc..983ebb86d1f 100644 --- a/service/lexmodelbuildingservice/api_op_GetBotChannelAssociations.go +++ b/service/lexmodelbuildingservice/api_op_GetBotChannelAssociations.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetBotChannelAssociations(ctx context.Context, params *GetBotCh addawsRestjson1_serdeOpGetBotChannelAssociationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetBotVersions.go b/service/lexmodelbuildingservice/api_op_GetBotVersions.go index 1da39571f49..2ece7f4cd35 100644 --- a/service/lexmodelbuildingservice/api_op_GetBotVersions.go +++ b/service/lexmodelbuildingservice/api_op_GetBotVersions.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetBotVersions(ctx context.Context, params *GetBotVersionsInput addawsRestjson1_serdeOpGetBotVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetBots.go b/service/lexmodelbuildingservice/api_op_GetBots.go index 79d487e031a..e0136fb4843 100644 --- a/service/lexmodelbuildingservice/api_op_GetBots.go +++ b/service/lexmodelbuildingservice/api_op_GetBots.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) GetBots(ctx context.Context, params *GetBotsInput, optFns ...fu addawsRestjson1_serdeOpGetBotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetBuiltinIntent.go b/service/lexmodelbuildingservice/api_op_GetBuiltinIntent.go index 9a10801bf85..32659835f0a 100644 --- a/service/lexmodelbuildingservice/api_op_GetBuiltinIntent.go +++ b/service/lexmodelbuildingservice/api_op_GetBuiltinIntent.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetBuiltinIntent(ctx context.Context, params *GetBuiltinIntentI addawsRestjson1_serdeOpGetBuiltinIntentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetBuiltinIntents.go b/service/lexmodelbuildingservice/api_op_GetBuiltinIntents.go index afe78c973fe..dfdb5c781cc 100644 --- a/service/lexmodelbuildingservice/api_op_GetBuiltinIntents.go +++ b/service/lexmodelbuildingservice/api_op_GetBuiltinIntents.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetBuiltinIntents(ctx context.Context, params *GetBuiltinIntent addawsRestjson1_serdeOpGetBuiltinIntentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetBuiltinSlotTypes.go b/service/lexmodelbuildingservice/api_op_GetBuiltinSlotTypes.go index bb4312fe630..63c5cb1945e 100644 --- a/service/lexmodelbuildingservice/api_op_GetBuiltinSlotTypes.go +++ b/service/lexmodelbuildingservice/api_op_GetBuiltinSlotTypes.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetBuiltinSlotTypes(ctx context.Context, params *GetBuiltinSlot addawsRestjson1_serdeOpGetBuiltinSlotTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetExport.go b/service/lexmodelbuildingservice/api_op_GetExport.go index 2519fab6060..069acfefad1 100644 --- a/service/lexmodelbuildingservice/api_op_GetExport.go +++ b/service/lexmodelbuildingservice/api_op_GetExport.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetExport(ctx context.Context, params *GetExportInput, optFns . addawsRestjson1_serdeOpGetExportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetImport.go b/service/lexmodelbuildingservice/api_op_GetImport.go index 3abaa3fd1af..18e108e41b8 100644 --- a/service/lexmodelbuildingservice/api_op_GetImport.go +++ b/service/lexmodelbuildingservice/api_op_GetImport.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetImport(ctx context.Context, params *GetImportInput, optFns . addawsRestjson1_serdeOpGetImportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetIntent.go b/service/lexmodelbuildingservice/api_op_GetIntent.go index e6ddae14712..2a95201a2bf 100644 --- a/service/lexmodelbuildingservice/api_op_GetIntent.go +++ b/service/lexmodelbuildingservice/api_op_GetIntent.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetIntent(ctx context.Context, params *GetIntentInput, optFns . addawsRestjson1_serdeOpGetIntentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetIntentVersions.go b/service/lexmodelbuildingservice/api_op_GetIntentVersions.go index 3d4a7c9f421..a6fb0e1870b 100644 --- a/service/lexmodelbuildingservice/api_op_GetIntentVersions.go +++ b/service/lexmodelbuildingservice/api_op_GetIntentVersions.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetIntentVersions(ctx context.Context, params *GetIntentVersion addawsRestjson1_serdeOpGetIntentVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetIntents.go b/service/lexmodelbuildingservice/api_op_GetIntents.go index 4590da1f3c7..969b57bfc5d 100644 --- a/service/lexmodelbuildingservice/api_op_GetIntents.go +++ b/service/lexmodelbuildingservice/api_op_GetIntents.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) GetIntents(ctx context.Context, params *GetIntentsInput, optFns addawsRestjson1_serdeOpGetIntentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetSlotType.go b/service/lexmodelbuildingservice/api_op_GetSlotType.go index 68aa5aab3dc..0285a1e8d00 100644 --- a/service/lexmodelbuildingservice/api_op_GetSlotType.go +++ b/service/lexmodelbuildingservice/api_op_GetSlotType.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetSlotType(ctx context.Context, params *GetSlotTypeInput, optF addawsRestjson1_serdeOpGetSlotTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetSlotTypeVersions.go b/service/lexmodelbuildingservice/api_op_GetSlotTypeVersions.go index 4ce65d8e56b..27da4c54791 100644 --- a/service/lexmodelbuildingservice/api_op_GetSlotTypeVersions.go +++ b/service/lexmodelbuildingservice/api_op_GetSlotTypeVersions.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetSlotTypeVersions(ctx context.Context, params *GetSlotTypeVer addawsRestjson1_serdeOpGetSlotTypeVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetSlotTypes.go b/service/lexmodelbuildingservice/api_op_GetSlotTypes.go index 6fb5958be7e..fd7d39276ea 100644 --- a/service/lexmodelbuildingservice/api_op_GetSlotTypes.go +++ b/service/lexmodelbuildingservice/api_op_GetSlotTypes.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) GetSlotTypes(ctx context.Context, params *GetSlotTypesInput, op addawsRestjson1_serdeOpGetSlotTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_GetUtterancesView.go b/service/lexmodelbuildingservice/api_op_GetUtterancesView.go index 413359868dc..48be9b7c08b 100644 --- a/service/lexmodelbuildingservice/api_op_GetUtterancesView.go +++ b/service/lexmodelbuildingservice/api_op_GetUtterancesView.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) GetUtterancesView(ctx context.Context, params *GetUtterancesVie addawsRestjson1_serdeOpGetUtterancesViewMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_ListTagsForResource.go b/service/lexmodelbuildingservice/api_op_ListTagsForResource.go index 46f3e247052..ba9d088574a 100644 --- a/service/lexmodelbuildingservice/api_op_ListTagsForResource.go +++ b/service/lexmodelbuildingservice/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_PutBot.go b/service/lexmodelbuildingservice/api_op_PutBot.go index 2b1286a58e0..b934b8e279a 100644 --- a/service/lexmodelbuildingservice/api_op_PutBot.go +++ b/service/lexmodelbuildingservice/api_op_PutBot.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) PutBot(ctx context.Context, params *PutBotInput, optFns ...func addawsRestjson1_serdeOpPutBotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_PutBotAlias.go b/service/lexmodelbuildingservice/api_op_PutBotAlias.go index d7bf183b222..cee3a192bd5 100644 --- a/service/lexmodelbuildingservice/api_op_PutBotAlias.go +++ b/service/lexmodelbuildingservice/api_op_PutBotAlias.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) PutBotAlias(ctx context.Context, params *PutBotAliasInput, optF addawsRestjson1_serdeOpPutBotAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_PutIntent.go b/service/lexmodelbuildingservice/api_op_PutIntent.go index 7d4a85d1f7b..bdce076e9d0 100644 --- a/service/lexmodelbuildingservice/api_op_PutIntent.go +++ b/service/lexmodelbuildingservice/api_op_PutIntent.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -62,9 +61,9 @@ func (c *Client) PutIntent(ctx context.Context, params *PutIntentInput, optFns . addawsRestjson1_serdeOpPutIntentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_PutSlotType.go b/service/lexmodelbuildingservice/api_op_PutSlotType.go index a80690cff76..1e323cf23d9 100644 --- a/service/lexmodelbuildingservice/api_op_PutSlotType.go +++ b/service/lexmodelbuildingservice/api_op_PutSlotType.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) PutSlotType(ctx context.Context, params *PutSlotTypeInput, optF addawsRestjson1_serdeOpPutSlotTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_StartImport.go b/service/lexmodelbuildingservice/api_op_StartImport.go index 4ae618a7ab7..4083b927e92 100644 --- a/service/lexmodelbuildingservice/api_op_StartImport.go +++ b/service/lexmodelbuildingservice/api_op_StartImport.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) StartImport(ctx context.Context, params *StartImportInput, optF addawsRestjson1_serdeOpStartImportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_TagResource.go b/service/lexmodelbuildingservice/api_op_TagResource.go index d4799a52799..cc4a9ef170c 100644 --- a/service/lexmodelbuildingservice/api_op_TagResource.go +++ b/service/lexmodelbuildingservice/api_op_TagResource.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/api_op_UntagResource.go b/service/lexmodelbuildingservice/api_op_UntagResource.go index 0dd23c978f9..551ba4cd6b1 100644 --- a/service/lexmodelbuildingservice/api_op_UntagResource.go +++ b/service/lexmodelbuildingservice/api_op_UntagResource.go @@ -5,7 +5,6 @@ package lexmodelbuildingservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexmodelbuildingservice/endpoints.go b/service/lexmodelbuildingservice/endpoints.go index 9c1a74b862b..148ad9d54c3 100644 --- a/service/lexmodelbuildingservice/endpoints.go +++ b/service/lexmodelbuildingservice/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/lexruntimeservice/api_client.go b/service/lexruntimeservice/api_client.go index 24403ef5a5c..13dd9e1ce13 100644 --- a/service/lexruntimeservice/api_client.go +++ b/service/lexruntimeservice/api_client.go @@ -87,30 +87,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -176,6 +152,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/lexruntimeservice/api_op_DeleteSession.go b/service/lexruntimeservice/api_op_DeleteSession.go index 007381ab2f4..220da581db0 100644 --- a/service/lexruntimeservice/api_op_DeleteSession.go +++ b/service/lexruntimeservice/api_op_DeleteSession.go @@ -5,7 +5,6 @@ package lexruntimeservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSession(ctx context.Context, params *DeleteSessionInput, addawsRestjson1_serdeOpDeleteSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexruntimeservice/api_op_GetSession.go b/service/lexruntimeservice/api_op_GetSession.go index 4d354670135..9f480358880 100644 --- a/service/lexruntimeservice/api_op_GetSession.go +++ b/service/lexruntimeservice/api_op_GetSession.go @@ -5,7 +5,6 @@ package lexruntimeservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexruntimeservice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetSession(ctx context.Context, params *GetSessionInput, optFns addawsRestjson1_serdeOpGetSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexruntimeservice/api_op_PostContent.go b/service/lexruntimeservice/api_op_PostContent.go index 4401d2bcb31..3a297f551a9 100644 --- a/service/lexruntimeservice/api_op_PostContent.go +++ b/service/lexruntimeservice/api_op_PostContent.go @@ -5,7 +5,6 @@ package lexruntimeservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexruntimeservice/types" smithy "github.com/awslabs/smithy-go" @@ -80,10 +79,10 @@ func (c *Client) PostContent(ctx context.Context, params *PostContentInput, optF addawsRestjson1_serdeOpPostContentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddUnsignedPayloadMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexruntimeservice/api_op_PostText.go b/service/lexruntimeservice/api_op_PostText.go index 3b64cc5a369..cc8f2f4fd3b 100644 --- a/service/lexruntimeservice/api_op_PostText.go +++ b/service/lexruntimeservice/api_op_PostText.go @@ -5,7 +5,6 @@ package lexruntimeservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexruntimeservice/types" smithy "github.com/awslabs/smithy-go" @@ -65,9 +64,9 @@ func (c *Client) PostText(ctx context.Context, params *PostTextInput, optFns ... addawsRestjson1_serdeOpPostTextMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexruntimeservice/api_op_PutSession.go b/service/lexruntimeservice/api_op_PutSession.go index d8e6079a269..341e680f500 100644 --- a/service/lexruntimeservice/api_op_PutSession.go +++ b/service/lexruntimeservice/api_op_PutSession.go @@ -5,7 +5,6 @@ package lexruntimeservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lexruntimeservice/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) PutSession(ctx context.Context, params *PutSessionInput, optFns addawsRestjson1_serdeOpPutSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lexruntimeservice/endpoints.go b/service/lexruntimeservice/endpoints.go index dcd3db6cb6b..1432d702b92 100644 --- a/service/lexruntimeservice/endpoints.go +++ b/service/lexruntimeservice/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/licensemanager/api_client.go b/service/licensemanager/api_client.go index ae1f4613919..0164de8c0f1 100644 --- a/service/licensemanager/api_client.go +++ b/service/licensemanager/api_client.go @@ -78,30 +78,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -167,6 +143,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/licensemanager/api_op_CreateLicenseConfiguration.go b/service/licensemanager/api_op_CreateLicenseConfiguration.go index 0c213f32dc7..53602da26b8 100644 --- a/service/licensemanager/api_op_CreateLicenseConfiguration.go +++ b/service/licensemanager/api_op_CreateLicenseConfiguration.go @@ -5,7 +5,6 @@ package licensemanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/licensemanager/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateLicenseConfiguration(ctx context.Context, params *CreateL addawsAwsjson11_serdeOpCreateLicenseConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/licensemanager/api_op_DeleteLicenseConfiguration.go b/service/licensemanager/api_op_DeleteLicenseConfiguration.go index 93f039dda7d..a9842ff8fce 100644 --- a/service/licensemanager/api_op_DeleteLicenseConfiguration.go +++ b/service/licensemanager/api_op_DeleteLicenseConfiguration.go @@ -5,7 +5,6 @@ package licensemanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteLicenseConfiguration(ctx context.Context, params *DeleteL addawsAwsjson11_serdeOpDeleteLicenseConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/licensemanager/api_op_GetLicenseConfiguration.go b/service/licensemanager/api_op_GetLicenseConfiguration.go index 8a7ca3368f2..ae0049e461d 100644 --- a/service/licensemanager/api_op_GetLicenseConfiguration.go +++ b/service/licensemanager/api_op_GetLicenseConfiguration.go @@ -5,7 +5,6 @@ package licensemanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/licensemanager/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetLicenseConfiguration(ctx context.Context, params *GetLicense addawsAwsjson11_serdeOpGetLicenseConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/licensemanager/api_op_GetServiceSettings.go b/service/licensemanager/api_op_GetServiceSettings.go index 89126b4cd97..b8543ee1911 100644 --- a/service/licensemanager/api_op_GetServiceSettings.go +++ b/service/licensemanager/api_op_GetServiceSettings.go @@ -5,7 +5,6 @@ package licensemanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/licensemanager/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetServiceSettings(ctx context.Context, params *GetServiceSetti addawsAwsjson11_serdeOpGetServiceSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/licensemanager/api_op_ListAssociationsForLicenseConfiguration.go b/service/licensemanager/api_op_ListAssociationsForLicenseConfiguration.go index f1ff6107efc..0796b80d413 100644 --- a/service/licensemanager/api_op_ListAssociationsForLicenseConfiguration.go +++ b/service/licensemanager/api_op_ListAssociationsForLicenseConfiguration.go @@ -5,7 +5,6 @@ package licensemanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/licensemanager/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListAssociationsForLicenseConfiguration(ctx context.Context, pa addawsAwsjson11_serdeOpListAssociationsForLicenseConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/licensemanager/api_op_ListFailuresForLicenseConfigurationOperations.go b/service/licensemanager/api_op_ListFailuresForLicenseConfigurationOperations.go index 0e455702605..cbb3f0ec0b4 100644 --- a/service/licensemanager/api_op_ListFailuresForLicenseConfigurationOperations.go +++ b/service/licensemanager/api_op_ListFailuresForLicenseConfigurationOperations.go @@ -5,7 +5,6 @@ package licensemanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/licensemanager/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListFailuresForLicenseConfigurationOperations(ctx context.Conte addawsAwsjson11_serdeOpListFailuresForLicenseConfigurationOperationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/licensemanager/api_op_ListLicenseConfigurations.go b/service/licensemanager/api_op_ListLicenseConfigurations.go index a581be68ccb..af4097f0816 100644 --- a/service/licensemanager/api_op_ListLicenseConfigurations.go +++ b/service/licensemanager/api_op_ListLicenseConfigurations.go @@ -5,7 +5,6 @@ package licensemanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/licensemanager/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListLicenseConfigurations(ctx context.Context, params *ListLice addawsAwsjson11_serdeOpListLicenseConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/licensemanager/api_op_ListLicenseSpecificationsForResource.go b/service/licensemanager/api_op_ListLicenseSpecificationsForResource.go index 7703708d53f..f5938bbc435 100644 --- a/service/licensemanager/api_op_ListLicenseSpecificationsForResource.go +++ b/service/licensemanager/api_op_ListLicenseSpecificationsForResource.go @@ -5,7 +5,6 @@ package licensemanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/licensemanager/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListLicenseSpecificationsForResource(ctx context.Context, param addawsAwsjson11_serdeOpListLicenseSpecificationsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/licensemanager/api_op_ListResourceInventory.go b/service/licensemanager/api_op_ListResourceInventory.go index 485a29d0e9e..0d8d6007ecc 100644 --- a/service/licensemanager/api_op_ListResourceInventory.go +++ b/service/licensemanager/api_op_ListResourceInventory.go @@ -5,7 +5,6 @@ package licensemanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/licensemanager/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListResourceInventory(ctx context.Context, params *ListResource addawsAwsjson11_serdeOpListResourceInventoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/licensemanager/api_op_ListTagsForResource.go b/service/licensemanager/api_op_ListTagsForResource.go index 49115ebb189..f668f0f50f4 100644 --- a/service/licensemanager/api_op_ListTagsForResource.go +++ b/service/licensemanager/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package licensemanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/licensemanager/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/licensemanager/api_op_ListUsageForLicenseConfiguration.go b/service/licensemanager/api_op_ListUsageForLicenseConfiguration.go index 70a2da2261e..14f6a141fcf 100644 --- a/service/licensemanager/api_op_ListUsageForLicenseConfiguration.go +++ b/service/licensemanager/api_op_ListUsageForLicenseConfiguration.go @@ -5,7 +5,6 @@ package licensemanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/licensemanager/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListUsageForLicenseConfiguration(ctx context.Context, params *L addawsAwsjson11_serdeOpListUsageForLicenseConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/licensemanager/api_op_TagResource.go b/service/licensemanager/api_op_TagResource.go index ca2da3f21a0..1106c5aa465 100644 --- a/service/licensemanager/api_op_TagResource.go +++ b/service/licensemanager/api_op_TagResource.go @@ -5,7 +5,6 @@ package licensemanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/licensemanager/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/licensemanager/api_op_UntagResource.go b/service/licensemanager/api_op_UntagResource.go index ada59049fd1..feccd7d8882 100644 --- a/service/licensemanager/api_op_UntagResource.go +++ b/service/licensemanager/api_op_UntagResource.go @@ -5,7 +5,6 @@ package licensemanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/licensemanager/api_op_UpdateLicenseConfiguration.go b/service/licensemanager/api_op_UpdateLicenseConfiguration.go index 90b7d3c09ee..12c6c58fa3e 100644 --- a/service/licensemanager/api_op_UpdateLicenseConfiguration.go +++ b/service/licensemanager/api_op_UpdateLicenseConfiguration.go @@ -5,7 +5,6 @@ package licensemanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/licensemanager/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) UpdateLicenseConfiguration(ctx context.Context, params *UpdateL addawsAwsjson11_serdeOpUpdateLicenseConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/licensemanager/api_op_UpdateLicenseSpecificationsForResource.go b/service/licensemanager/api_op_UpdateLicenseSpecificationsForResource.go index 01dff5c5986..c1fbae787b6 100644 --- a/service/licensemanager/api_op_UpdateLicenseSpecificationsForResource.go +++ b/service/licensemanager/api_op_UpdateLicenseSpecificationsForResource.go @@ -5,7 +5,6 @@ package licensemanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/licensemanager/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateLicenseSpecificationsForResource(ctx context.Context, par addawsAwsjson11_serdeOpUpdateLicenseSpecificationsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/licensemanager/api_op_UpdateServiceSettings.go b/service/licensemanager/api_op_UpdateServiceSettings.go index 5c43f8b9489..a008569e189 100644 --- a/service/licensemanager/api_op_UpdateServiceSettings.go +++ b/service/licensemanager/api_op_UpdateServiceSettings.go @@ -5,7 +5,6 @@ package licensemanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/licensemanager/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateServiceSettings(ctx context.Context, params *UpdateServic addawsAwsjson11_serdeOpUpdateServiceSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/licensemanager/endpoints.go b/service/licensemanager/endpoints.go index 974249e9b8c..dea485ef9a9 100644 --- a/service/licensemanager/endpoints.go +++ b/service/licensemanager/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/lightsail/api_client.go b/service/lightsail/api_client.go index 9750cd3c782..bd813ae1119 100644 --- a/service/lightsail/api_client.go +++ b/service/lightsail/api_client.go @@ -92,30 +92,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -181,6 +157,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/lightsail/api_op_AllocateStaticIp.go b/service/lightsail/api_op_AllocateStaticIp.go index 910f4e7b43c..dcf94d04aba 100644 --- a/service/lightsail/api_op_AllocateStaticIp.go +++ b/service/lightsail/api_op_AllocateStaticIp.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) AllocateStaticIp(ctx context.Context, params *AllocateStaticIpI addawsAwsjson11_serdeOpAllocateStaticIpMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_AttachCertificateToDistribution.go b/service/lightsail/api_op_AttachCertificateToDistribution.go index 9811b6cbcc8..fa23c2d5259 100644 --- a/service/lightsail/api_op_AttachCertificateToDistribution.go +++ b/service/lightsail/api_op_AttachCertificateToDistribution.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) AttachCertificateToDistribution(ctx context.Context, params *At addawsAwsjson11_serdeOpAttachCertificateToDistributionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_AttachDisk.go b/service/lightsail/api_op_AttachDisk.go index 67962ca5d3c..f7abee14254 100644 --- a/service/lightsail/api_op_AttachDisk.go +++ b/service/lightsail/api_op_AttachDisk.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) AttachDisk(ctx context.Context, params *AttachDiskInput, optFns addawsAwsjson11_serdeOpAttachDiskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_AttachInstancesToLoadBalancer.go b/service/lightsail/api_op_AttachInstancesToLoadBalancer.go index 8c802141223..c5bb9e2ec69 100644 --- a/service/lightsail/api_op_AttachInstancesToLoadBalancer.go +++ b/service/lightsail/api_op_AttachInstancesToLoadBalancer.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) AttachInstancesToLoadBalancer(ctx context.Context, params *Atta addawsAwsjson11_serdeOpAttachInstancesToLoadBalancerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_AttachLoadBalancerTlsCertificate.go b/service/lightsail/api_op_AttachLoadBalancerTlsCertificate.go index d2aed2735e5..06a23e5d40d 100644 --- a/service/lightsail/api_op_AttachLoadBalancerTlsCertificate.go +++ b/service/lightsail/api_op_AttachLoadBalancerTlsCertificate.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) AttachLoadBalancerTlsCertificate(ctx context.Context, params *A addawsAwsjson11_serdeOpAttachLoadBalancerTlsCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_AttachStaticIp.go b/service/lightsail/api_op_AttachStaticIp.go index 84c9e00e1fe..57adfe445d3 100644 --- a/service/lightsail/api_op_AttachStaticIp.go +++ b/service/lightsail/api_op_AttachStaticIp.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) AttachStaticIp(ctx context.Context, params *AttachStaticIpInput addawsAwsjson11_serdeOpAttachStaticIpMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CloseInstancePublicPorts.go b/service/lightsail/api_op_CloseInstancePublicPorts.go index 7c841d9efea..d4231fef161 100644 --- a/service/lightsail/api_op_CloseInstancePublicPorts.go +++ b/service/lightsail/api_op_CloseInstancePublicPorts.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CloseInstancePublicPorts(ctx context.Context, params *CloseInst addawsAwsjson11_serdeOpCloseInstancePublicPortsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CopySnapshot.go b/service/lightsail/api_op_CopySnapshot.go index 98b12b09e7c..884df0715b4 100644 --- a/service/lightsail/api_op_CopySnapshot.go +++ b/service/lightsail/api_op_CopySnapshot.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CopySnapshot(ctx context.Context, params *CopySnapshotInput, op addawsAwsjson11_serdeOpCopySnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CreateCertificate.go b/service/lightsail/api_op_CreateCertificate.go index 80adfc53830..001f9f284ff 100644 --- a/service/lightsail/api_op_CreateCertificate.go +++ b/service/lightsail/api_op_CreateCertificate.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateCertificate(ctx context.Context, params *CreateCertificat addawsAwsjson11_serdeOpCreateCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CreateCloudFormationStack.go b/service/lightsail/api_op_CreateCloudFormationStack.go index d42433ab4d0..4a24faed8b3 100644 --- a/service/lightsail/api_op_CreateCloudFormationStack.go +++ b/service/lightsail/api_op_CreateCloudFormationStack.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateCloudFormationStack(ctx context.Context, params *CreateCl addawsAwsjson11_serdeOpCreateCloudFormationStackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CreateContactMethod.go b/service/lightsail/api_op_CreateContactMethod.go index 0596244e0c7..af00b323fed 100644 --- a/service/lightsail/api_op_CreateContactMethod.go +++ b/service/lightsail/api_op_CreateContactMethod.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateContactMethod(ctx context.Context, params *CreateContactM addawsAwsjson11_serdeOpCreateContactMethodMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CreateDisk.go b/service/lightsail/api_op_CreateDisk.go index b06d19ceac8..e19c4ca3031 100644 --- a/service/lightsail/api_op_CreateDisk.go +++ b/service/lightsail/api_op_CreateDisk.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateDisk(ctx context.Context, params *CreateDiskInput, optFns addawsAwsjson11_serdeOpCreateDiskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CreateDiskFromSnapshot.go b/service/lightsail/api_op_CreateDiskFromSnapshot.go index 2a38139c188..79e82740426 100644 --- a/service/lightsail/api_op_CreateDiskFromSnapshot.go +++ b/service/lightsail/api_op_CreateDiskFromSnapshot.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateDiskFromSnapshot(ctx context.Context, params *CreateDiskF addawsAwsjson11_serdeOpCreateDiskFromSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CreateDiskSnapshot.go b/service/lightsail/api_op_CreateDiskSnapshot.go index 82f811e73e9..3cf24f0d33e 100644 --- a/service/lightsail/api_op_CreateDiskSnapshot.go +++ b/service/lightsail/api_op_CreateDiskSnapshot.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) CreateDiskSnapshot(ctx context.Context, params *CreateDiskSnaps addawsAwsjson11_serdeOpCreateDiskSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CreateDistribution.go b/service/lightsail/api_op_CreateDistribution.go index 3bc8b81b274..239260aa12e 100644 --- a/service/lightsail/api_op_CreateDistribution.go +++ b/service/lightsail/api_op_CreateDistribution.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateDistribution(ctx context.Context, params *CreateDistribut addawsAwsjson11_serdeOpCreateDistributionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CreateDomain.go b/service/lightsail/api_op_CreateDomain.go index 12215a2f8d6..e1462592b08 100644 --- a/service/lightsail/api_op_CreateDomain.go +++ b/service/lightsail/api_op_CreateDomain.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateDomain(ctx context.Context, params *CreateDomainInput, op addawsAwsjson11_serdeOpCreateDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CreateDomainEntry.go b/service/lightsail/api_op_CreateDomainEntry.go index 64116ec610d..8baaabfc43c 100644 --- a/service/lightsail/api_op_CreateDomainEntry.go +++ b/service/lightsail/api_op_CreateDomainEntry.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateDomainEntry(ctx context.Context, params *CreateDomainEntr addawsAwsjson11_serdeOpCreateDomainEntryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CreateInstanceSnapshot.go b/service/lightsail/api_op_CreateInstanceSnapshot.go index 46cda6dae3e..28862a8e9c3 100644 --- a/service/lightsail/api_op_CreateInstanceSnapshot.go +++ b/service/lightsail/api_op_CreateInstanceSnapshot.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateInstanceSnapshot(ctx context.Context, params *CreateInsta addawsAwsjson11_serdeOpCreateInstanceSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CreateInstances.go b/service/lightsail/api_op_CreateInstances.go index 6cf2dbaa129..6e087474919 100644 --- a/service/lightsail/api_op_CreateInstances.go +++ b/service/lightsail/api_op_CreateInstances.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateInstances(ctx context.Context, params *CreateInstancesInp addawsAwsjson11_serdeOpCreateInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CreateInstancesFromSnapshot.go b/service/lightsail/api_op_CreateInstancesFromSnapshot.go index 276de930779..66037dc7623 100644 --- a/service/lightsail/api_op_CreateInstancesFromSnapshot.go +++ b/service/lightsail/api_op_CreateInstancesFromSnapshot.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateInstancesFromSnapshot(ctx context.Context, params *Create addawsAwsjson11_serdeOpCreateInstancesFromSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CreateKeyPair.go b/service/lightsail/api_op_CreateKeyPair.go index 8bc7b314ce3..bfc4728ffa4 100644 --- a/service/lightsail/api_op_CreateKeyPair.go +++ b/service/lightsail/api_op_CreateKeyPair.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateKeyPair(ctx context.Context, params *CreateKeyPairInput, addawsAwsjson11_serdeOpCreateKeyPairMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CreateLoadBalancer.go b/service/lightsail/api_op_CreateLoadBalancer.go index c56b12a0976..c90be1c2843 100644 --- a/service/lightsail/api_op_CreateLoadBalancer.go +++ b/service/lightsail/api_op_CreateLoadBalancer.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) CreateLoadBalancer(ctx context.Context, params *CreateLoadBalan addawsAwsjson11_serdeOpCreateLoadBalancerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CreateLoadBalancerTlsCertificate.go b/service/lightsail/api_op_CreateLoadBalancerTlsCertificate.go index 0ca0720059c..08d123e874c 100644 --- a/service/lightsail/api_op_CreateLoadBalancerTlsCertificate.go +++ b/service/lightsail/api_op_CreateLoadBalancerTlsCertificate.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateLoadBalancerTlsCertificate(ctx context.Context, params *C addawsAwsjson11_serdeOpCreateLoadBalancerTlsCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CreateRelationalDatabase.go b/service/lightsail/api_op_CreateRelationalDatabase.go index 871167d59e2..bbc7591d0c9 100644 --- a/service/lightsail/api_op_CreateRelationalDatabase.go +++ b/service/lightsail/api_op_CreateRelationalDatabase.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateRelationalDatabase(ctx context.Context, params *CreateRel addawsAwsjson11_serdeOpCreateRelationalDatabaseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CreateRelationalDatabaseFromSnapshot.go b/service/lightsail/api_op_CreateRelationalDatabaseFromSnapshot.go index 0da287c06f3..d42e733889f 100644 --- a/service/lightsail/api_op_CreateRelationalDatabaseFromSnapshot.go +++ b/service/lightsail/api_op_CreateRelationalDatabaseFromSnapshot.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateRelationalDatabaseFromSnapshot(ctx context.Context, param addawsAwsjson11_serdeOpCreateRelationalDatabaseFromSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_CreateRelationalDatabaseSnapshot.go b/service/lightsail/api_op_CreateRelationalDatabaseSnapshot.go index f2b74a8929c..684197a7a10 100644 --- a/service/lightsail/api_op_CreateRelationalDatabaseSnapshot.go +++ b/service/lightsail/api_op_CreateRelationalDatabaseSnapshot.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateRelationalDatabaseSnapshot(ctx context.Context, params *C addawsAwsjson11_serdeOpCreateRelationalDatabaseSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DeleteAlarm.go b/service/lightsail/api_op_DeleteAlarm.go index cb0e2675f75..02c4c7697f2 100644 --- a/service/lightsail/api_op_DeleteAlarm.go +++ b/service/lightsail/api_op_DeleteAlarm.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeleteAlarm(ctx context.Context, params *DeleteAlarmInput, optF addawsAwsjson11_serdeOpDeleteAlarmMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DeleteAutoSnapshot.go b/service/lightsail/api_op_DeleteAutoSnapshot.go index 10a7483273c..b28bfa007e4 100644 --- a/service/lightsail/api_op_DeleteAutoSnapshot.go +++ b/service/lightsail/api_op_DeleteAutoSnapshot.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DeleteAutoSnapshot(ctx context.Context, params *DeleteAutoSnaps addawsAwsjson11_serdeOpDeleteAutoSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DeleteCertificate.go b/service/lightsail/api_op_DeleteCertificate.go index 9200c71f8fb..e7cdc37efe9 100644 --- a/service/lightsail/api_op_DeleteCertificate.go +++ b/service/lightsail/api_op_DeleteCertificate.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeleteCertificate(ctx context.Context, params *DeleteCertificat addawsAwsjson11_serdeOpDeleteCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DeleteContactMethod.go b/service/lightsail/api_op_DeleteContactMethod.go index cf1b4a522f8..2da37a63f2b 100644 --- a/service/lightsail/api_op_DeleteContactMethod.go +++ b/service/lightsail/api_op_DeleteContactMethod.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DeleteContactMethod(ctx context.Context, params *DeleteContactM addawsAwsjson11_serdeOpDeleteContactMethodMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DeleteDisk.go b/service/lightsail/api_op_DeleteDisk.go index 0054e02039c..dc7c3b571ad 100644 --- a/service/lightsail/api_op_DeleteDisk.go +++ b/service/lightsail/api_op_DeleteDisk.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DeleteDisk(ctx context.Context, params *DeleteDiskInput, optFns addawsAwsjson11_serdeOpDeleteDiskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DeleteDiskSnapshot.go b/service/lightsail/api_op_DeleteDiskSnapshot.go index 3911fe37a59..8c005de6154 100644 --- a/service/lightsail/api_op_DeleteDiskSnapshot.go +++ b/service/lightsail/api_op_DeleteDiskSnapshot.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) DeleteDiskSnapshot(ctx context.Context, params *DeleteDiskSnaps addawsAwsjson11_serdeOpDeleteDiskSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DeleteDistribution.go b/service/lightsail/api_op_DeleteDistribution.go index 99c0df4a4ff..6941d7c7311 100644 --- a/service/lightsail/api_op_DeleteDistribution.go +++ b/service/lightsail/api_op_DeleteDistribution.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteDistribution(ctx context.Context, params *DeleteDistribut addawsAwsjson11_serdeOpDeleteDistributionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DeleteDomain.go b/service/lightsail/api_op_DeleteDomain.go index 80ebd6c02db..395131f9e27 100644 --- a/service/lightsail/api_op_DeleteDomain.go +++ b/service/lightsail/api_op_DeleteDomain.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeleteDomain(ctx context.Context, params *DeleteDomainInput, op addawsAwsjson11_serdeOpDeleteDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DeleteDomainEntry.go b/service/lightsail/api_op_DeleteDomainEntry.go index bb332df7808..501c6963fb0 100644 --- a/service/lightsail/api_op_DeleteDomainEntry.go +++ b/service/lightsail/api_op_DeleteDomainEntry.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteDomainEntry(ctx context.Context, params *DeleteDomainEntr addawsAwsjson11_serdeOpDeleteDomainEntryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DeleteInstance.go b/service/lightsail/api_op_DeleteInstance.go index 42c7bcb3ee4..04d26e29002 100644 --- a/service/lightsail/api_op_DeleteInstance.go +++ b/service/lightsail/api_op_DeleteInstance.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteInstance(ctx context.Context, params *DeleteInstanceInput addawsAwsjson11_serdeOpDeleteInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DeleteInstanceSnapshot.go b/service/lightsail/api_op_DeleteInstanceSnapshot.go index 8a9c3dda6dc..8c997a48f31 100644 --- a/service/lightsail/api_op_DeleteInstanceSnapshot.go +++ b/service/lightsail/api_op_DeleteInstanceSnapshot.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeleteInstanceSnapshot(ctx context.Context, params *DeleteInsta addawsAwsjson11_serdeOpDeleteInstanceSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DeleteKeyPair.go b/service/lightsail/api_op_DeleteKeyPair.go index 575c8e5ce5c..aa4fadcc234 100644 --- a/service/lightsail/api_op_DeleteKeyPair.go +++ b/service/lightsail/api_op_DeleteKeyPair.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteKeyPair(ctx context.Context, params *DeleteKeyPairInput, addawsAwsjson11_serdeOpDeleteKeyPairMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DeleteKnownHostKeys.go b/service/lightsail/api_op_DeleteKnownHostKeys.go index 79ff5d9f0bc..a1c0c1d486f 100644 --- a/service/lightsail/api_op_DeleteKnownHostKeys.go +++ b/service/lightsail/api_op_DeleteKnownHostKeys.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DeleteKnownHostKeys(ctx context.Context, params *DeleteKnownHos addawsAwsjson11_serdeOpDeleteKnownHostKeysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DeleteLoadBalancer.go b/service/lightsail/api_op_DeleteLoadBalancer.go index fd8cdf66b3e..7b0252ebec2 100644 --- a/service/lightsail/api_op_DeleteLoadBalancer.go +++ b/service/lightsail/api_op_DeleteLoadBalancer.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DeleteLoadBalancer(ctx context.Context, params *DeleteLoadBalan addawsAwsjson11_serdeOpDeleteLoadBalancerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DeleteLoadBalancerTlsCertificate.go b/service/lightsail/api_op_DeleteLoadBalancerTlsCertificate.go index dd0fef1bdbb..848daa38fa9 100644 --- a/service/lightsail/api_op_DeleteLoadBalancerTlsCertificate.go +++ b/service/lightsail/api_op_DeleteLoadBalancerTlsCertificate.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeleteLoadBalancerTlsCertificate(ctx context.Context, params *D addawsAwsjson11_serdeOpDeleteLoadBalancerTlsCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DeleteRelationalDatabase.go b/service/lightsail/api_op_DeleteRelationalDatabase.go index 5a3236ca2b1..b1b14a4e44a 100644 --- a/service/lightsail/api_op_DeleteRelationalDatabase.go +++ b/service/lightsail/api_op_DeleteRelationalDatabase.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeleteRelationalDatabase(ctx context.Context, params *DeleteRel addawsAwsjson11_serdeOpDeleteRelationalDatabaseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DeleteRelationalDatabaseSnapshot.go b/service/lightsail/api_op_DeleteRelationalDatabaseSnapshot.go index 6e25a7ce453..3648c30bd18 100644 --- a/service/lightsail/api_op_DeleteRelationalDatabaseSnapshot.go +++ b/service/lightsail/api_op_DeleteRelationalDatabaseSnapshot.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeleteRelationalDatabaseSnapshot(ctx context.Context, params *D addawsAwsjson11_serdeOpDeleteRelationalDatabaseSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DetachCertificateFromDistribution.go b/service/lightsail/api_op_DetachCertificateFromDistribution.go index b256705866e..0f94e3dd9df 100644 --- a/service/lightsail/api_op_DetachCertificateFromDistribution.go +++ b/service/lightsail/api_op_DetachCertificateFromDistribution.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DetachCertificateFromDistribution(ctx context.Context, params * addawsAwsjson11_serdeOpDetachCertificateFromDistributionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DetachDisk.go b/service/lightsail/api_op_DetachDisk.go index 30e63892069..cd0da3ebf92 100644 --- a/service/lightsail/api_op_DetachDisk.go +++ b/service/lightsail/api_op_DetachDisk.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DetachDisk(ctx context.Context, params *DetachDiskInput, optFns addawsAwsjson11_serdeOpDetachDiskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DetachInstancesFromLoadBalancer.go b/service/lightsail/api_op_DetachInstancesFromLoadBalancer.go index 8b723ed5d6d..b9c621375c2 100644 --- a/service/lightsail/api_op_DetachInstancesFromLoadBalancer.go +++ b/service/lightsail/api_op_DetachInstancesFromLoadBalancer.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DetachInstancesFromLoadBalancer(ctx context.Context, params *De addawsAwsjson11_serdeOpDetachInstancesFromLoadBalancerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DetachStaticIp.go b/service/lightsail/api_op_DetachStaticIp.go index 044d1fe63d4..4d6d901fc35 100644 --- a/service/lightsail/api_op_DetachStaticIp.go +++ b/service/lightsail/api_op_DetachStaticIp.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DetachStaticIp(ctx context.Context, params *DetachStaticIpInput addawsAwsjson11_serdeOpDetachStaticIpMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DisableAddOn.go b/service/lightsail/api_op_DisableAddOn.go index 35225664211..c0f8ac06c00 100644 --- a/service/lightsail/api_op_DisableAddOn.go +++ b/service/lightsail/api_op_DisableAddOn.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DisableAddOn(ctx context.Context, params *DisableAddOnInput, op addawsAwsjson11_serdeOpDisableAddOnMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_DownloadDefaultKeyPair.go b/service/lightsail/api_op_DownloadDefaultKeyPair.go index 8a116169790..6c5ff9343c2 100644 --- a/service/lightsail/api_op_DownloadDefaultKeyPair.go +++ b/service/lightsail/api_op_DownloadDefaultKeyPair.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DownloadDefaultKeyPair(ctx context.Context, params *DownloadDef addawsAwsjson11_serdeOpDownloadDefaultKeyPairMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_EnableAddOn.go b/service/lightsail/api_op_EnableAddOn.go index 24ce3bfed79..d36a6c809ac 100644 --- a/service/lightsail/api_op_EnableAddOn.go +++ b/service/lightsail/api_op_EnableAddOn.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) EnableAddOn(ctx context.Context, params *EnableAddOnInput, optF addawsAwsjson11_serdeOpEnableAddOnMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_ExportSnapshot.go b/service/lightsail/api_op_ExportSnapshot.go index 99c570afd4e..21c7f3e0e72 100644 --- a/service/lightsail/api_op_ExportSnapshot.go +++ b/service/lightsail/api_op_ExportSnapshot.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) ExportSnapshot(ctx context.Context, params *ExportSnapshotInput addawsAwsjson11_serdeOpExportSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetActiveNames.go b/service/lightsail/api_op_GetActiveNames.go index ea35f69793c..f458d6dbf78 100644 --- a/service/lightsail/api_op_GetActiveNames.go +++ b/service/lightsail/api_op_GetActiveNames.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetActiveNames(ctx context.Context, params *GetActiveNamesInput addawsAwsjson11_serdeOpGetActiveNamesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetAlarms.go b/service/lightsail/api_op_GetAlarms.go index 31ff7ae8521..3a3ac78cae8 100644 --- a/service/lightsail/api_op_GetAlarms.go +++ b/service/lightsail/api_op_GetAlarms.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetAlarms(ctx context.Context, params *GetAlarmsInput, optFns . addawsAwsjson11_serdeOpGetAlarmsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetAutoSnapshots.go b/service/lightsail/api_op_GetAutoSnapshots.go index 675581553dd..46734f72daa 100644 --- a/service/lightsail/api_op_GetAutoSnapshots.go +++ b/service/lightsail/api_op_GetAutoSnapshots.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetAutoSnapshots(ctx context.Context, params *GetAutoSnapshotsI addawsAwsjson11_serdeOpGetAutoSnapshotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetBlueprints.go b/service/lightsail/api_op_GetBlueprints.go index 36fc4b1c08d..9e2d7f17b9a 100644 --- a/service/lightsail/api_op_GetBlueprints.go +++ b/service/lightsail/api_op_GetBlueprints.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetBlueprints(ctx context.Context, params *GetBlueprintsInput, addawsAwsjson11_serdeOpGetBlueprintsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetBundles.go b/service/lightsail/api_op_GetBundles.go index 08b183d0376..431d80641c6 100644 --- a/service/lightsail/api_op_GetBundles.go +++ b/service/lightsail/api_op_GetBundles.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetBundles(ctx context.Context, params *GetBundlesInput, optFns addawsAwsjson11_serdeOpGetBundlesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetCertificates.go b/service/lightsail/api_op_GetCertificates.go index 712b25d484b..2328294a1b3 100644 --- a/service/lightsail/api_op_GetCertificates.go +++ b/service/lightsail/api_op_GetCertificates.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetCertificates(ctx context.Context, params *GetCertificatesInp addawsAwsjson11_serdeOpGetCertificatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetCloudFormationStackRecords.go b/service/lightsail/api_op_GetCloudFormationStackRecords.go index 3baa433ffc7..756d4d004bf 100644 --- a/service/lightsail/api_op_GetCloudFormationStackRecords.go +++ b/service/lightsail/api_op_GetCloudFormationStackRecords.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetCloudFormationStackRecords(ctx context.Context, params *GetC addawsAwsjson11_serdeOpGetCloudFormationStackRecordsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetContactMethods.go b/service/lightsail/api_op_GetContactMethods.go index 8f13a4b6cf0..67b3e3ac2c5 100644 --- a/service/lightsail/api_op_GetContactMethods.go +++ b/service/lightsail/api_op_GetContactMethods.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetContactMethods(ctx context.Context, params *GetContactMethod addawsAwsjson11_serdeOpGetContactMethodsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetDisk.go b/service/lightsail/api_op_GetDisk.go index 15621fc71e3..9d3376567d4 100644 --- a/service/lightsail/api_op_GetDisk.go +++ b/service/lightsail/api_op_GetDisk.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDisk(ctx context.Context, params *GetDiskInput, optFns ...fu addawsAwsjson11_serdeOpGetDiskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetDiskSnapshot.go b/service/lightsail/api_op_GetDiskSnapshot.go index c0905c5214a..4facf242543 100644 --- a/service/lightsail/api_op_GetDiskSnapshot.go +++ b/service/lightsail/api_op_GetDiskSnapshot.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDiskSnapshot(ctx context.Context, params *GetDiskSnapshotInp addawsAwsjson11_serdeOpGetDiskSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetDiskSnapshots.go b/service/lightsail/api_op_GetDiskSnapshots.go index 879eec9e264..2553803195e 100644 --- a/service/lightsail/api_op_GetDiskSnapshots.go +++ b/service/lightsail/api_op_GetDiskSnapshots.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetDiskSnapshots(ctx context.Context, params *GetDiskSnapshotsI addawsAwsjson11_serdeOpGetDiskSnapshotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetDisks.go b/service/lightsail/api_op_GetDisks.go index b01b63f2384..3340e3984dc 100644 --- a/service/lightsail/api_op_GetDisks.go +++ b/service/lightsail/api_op_GetDisks.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetDisks(ctx context.Context, params *GetDisksInput, optFns ... addawsAwsjson11_serdeOpGetDisksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetDistributionBundles.go b/service/lightsail/api_op_GetDistributionBundles.go index 4af0b4789fa..6306ba6dada 100644 --- a/service/lightsail/api_op_GetDistributionBundles.go +++ b/service/lightsail/api_op_GetDistributionBundles.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetDistributionBundles(ctx context.Context, params *GetDistribu addawsAwsjson11_serdeOpGetDistributionBundlesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetDistributionLatestCacheReset.go b/service/lightsail/api_op_GetDistributionLatestCacheReset.go index fea24a818f1..6a8544e9941 100644 --- a/service/lightsail/api_op_GetDistributionLatestCacheReset.go +++ b/service/lightsail/api_op_GetDistributionLatestCacheReset.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) GetDistributionLatestCacheReset(ctx context.Context, params *Ge addawsAwsjson11_serdeOpGetDistributionLatestCacheResetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetDistributionMetricData.go b/service/lightsail/api_op_GetDistributionMetricData.go index a0e88991f32..5371b91e4ea 100644 --- a/service/lightsail/api_op_GetDistributionMetricData.go +++ b/service/lightsail/api_op_GetDistributionMetricData.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetDistributionMetricData(ctx context.Context, params *GetDistr addawsAwsjson11_serdeOpGetDistributionMetricDataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetDistributions.go b/service/lightsail/api_op_GetDistributions.go index 5a08eb2f3a7..3a98aa5e4a0 100644 --- a/service/lightsail/api_op_GetDistributions.go +++ b/service/lightsail/api_op_GetDistributions.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetDistributions(ctx context.Context, params *GetDistributionsI addawsAwsjson11_serdeOpGetDistributionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetDomain.go b/service/lightsail/api_op_GetDomain.go index 19b4a884178..c1c0107da8e 100644 --- a/service/lightsail/api_op_GetDomain.go +++ b/service/lightsail/api_op_GetDomain.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDomain(ctx context.Context, params *GetDomainInput, optFns . addawsAwsjson11_serdeOpGetDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetDomains.go b/service/lightsail/api_op_GetDomains.go index 079332dd1ce..24c72ffc723 100644 --- a/service/lightsail/api_op_GetDomains.go +++ b/service/lightsail/api_op_GetDomains.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDomains(ctx context.Context, params *GetDomainsInput, optFns addawsAwsjson11_serdeOpGetDomainsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetExportSnapshotRecords.go b/service/lightsail/api_op_GetExportSnapshotRecords.go index f86372866ad..15bb6a40ef3 100644 --- a/service/lightsail/api_op_GetExportSnapshotRecords.go +++ b/service/lightsail/api_op_GetExportSnapshotRecords.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetExportSnapshotRecords(ctx context.Context, params *GetExport addawsAwsjson11_serdeOpGetExportSnapshotRecordsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetInstance.go b/service/lightsail/api_op_GetInstance.go index 070281e68f0..19a9b0844a4 100644 --- a/service/lightsail/api_op_GetInstance.go +++ b/service/lightsail/api_op_GetInstance.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetInstance(ctx context.Context, params *GetInstanceInput, optF addawsAwsjson11_serdeOpGetInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetInstanceAccessDetails.go b/service/lightsail/api_op_GetInstanceAccessDetails.go index d472efcac7c..f63c538ac62 100644 --- a/service/lightsail/api_op_GetInstanceAccessDetails.go +++ b/service/lightsail/api_op_GetInstanceAccessDetails.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetInstanceAccessDetails(ctx context.Context, params *GetInstan addawsAwsjson11_serdeOpGetInstanceAccessDetailsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetInstanceMetricData.go b/service/lightsail/api_op_GetInstanceMetricData.go index e2d4344b457..89618221304 100644 --- a/service/lightsail/api_op_GetInstanceMetricData.go +++ b/service/lightsail/api_op_GetInstanceMetricData.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetInstanceMetricData(ctx context.Context, params *GetInstanceM addawsAwsjson11_serdeOpGetInstanceMetricDataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetInstancePortStates.go b/service/lightsail/api_op_GetInstancePortStates.go index 26532e1fecb..9543153cf5d 100644 --- a/service/lightsail/api_op_GetInstancePortStates.go +++ b/service/lightsail/api_op_GetInstancePortStates.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetInstancePortStates(ctx context.Context, params *GetInstanceP addawsAwsjson11_serdeOpGetInstancePortStatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetInstanceSnapshot.go b/service/lightsail/api_op_GetInstanceSnapshot.go index ec00004080c..fe9437f15e3 100644 --- a/service/lightsail/api_op_GetInstanceSnapshot.go +++ b/service/lightsail/api_op_GetInstanceSnapshot.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetInstanceSnapshot(ctx context.Context, params *GetInstanceSna addawsAwsjson11_serdeOpGetInstanceSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetInstanceSnapshots.go b/service/lightsail/api_op_GetInstanceSnapshots.go index 443c023b5f0..ce89c6ab656 100644 --- a/service/lightsail/api_op_GetInstanceSnapshots.go +++ b/service/lightsail/api_op_GetInstanceSnapshots.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetInstanceSnapshots(ctx context.Context, params *GetInstanceSn addawsAwsjson11_serdeOpGetInstanceSnapshotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetInstanceState.go b/service/lightsail/api_op_GetInstanceState.go index d6a78b5b9e7..12312781e51 100644 --- a/service/lightsail/api_op_GetInstanceState.go +++ b/service/lightsail/api_op_GetInstanceState.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetInstanceState(ctx context.Context, params *GetInstanceStateI addawsAwsjson11_serdeOpGetInstanceStateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetInstances.go b/service/lightsail/api_op_GetInstances.go index 77539bb926b..14e312be8c0 100644 --- a/service/lightsail/api_op_GetInstances.go +++ b/service/lightsail/api_op_GetInstances.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetInstances(ctx context.Context, params *GetInstancesInput, op addawsAwsjson11_serdeOpGetInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetKeyPair.go b/service/lightsail/api_op_GetKeyPair.go index afdd3ac141c..30651fb2c65 100644 --- a/service/lightsail/api_op_GetKeyPair.go +++ b/service/lightsail/api_op_GetKeyPair.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetKeyPair(ctx context.Context, params *GetKeyPairInput, optFns addawsAwsjson11_serdeOpGetKeyPairMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetKeyPairs.go b/service/lightsail/api_op_GetKeyPairs.go index 2f2a5dad9b2..402469d2542 100644 --- a/service/lightsail/api_op_GetKeyPairs.go +++ b/service/lightsail/api_op_GetKeyPairs.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetKeyPairs(ctx context.Context, params *GetKeyPairsInput, optF addawsAwsjson11_serdeOpGetKeyPairsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetLoadBalancer.go b/service/lightsail/api_op_GetLoadBalancer.go index 7047d733798..599bde0e4ac 100644 --- a/service/lightsail/api_op_GetLoadBalancer.go +++ b/service/lightsail/api_op_GetLoadBalancer.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetLoadBalancer(ctx context.Context, params *GetLoadBalancerInp addawsAwsjson11_serdeOpGetLoadBalancerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetLoadBalancerMetricData.go b/service/lightsail/api_op_GetLoadBalancerMetricData.go index 6eb5ceae5f5..07a6e19eee0 100644 --- a/service/lightsail/api_op_GetLoadBalancerMetricData.go +++ b/service/lightsail/api_op_GetLoadBalancerMetricData.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetLoadBalancerMetricData(ctx context.Context, params *GetLoadB addawsAwsjson11_serdeOpGetLoadBalancerMetricDataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetLoadBalancerTlsCertificates.go b/service/lightsail/api_op_GetLoadBalancerTlsCertificates.go index 2e0b80d364c..46ed08ddaba 100644 --- a/service/lightsail/api_op_GetLoadBalancerTlsCertificates.go +++ b/service/lightsail/api_op_GetLoadBalancerTlsCertificates.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetLoadBalancerTlsCertificates(ctx context.Context, params *Get addawsAwsjson11_serdeOpGetLoadBalancerTlsCertificatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetLoadBalancers.go b/service/lightsail/api_op_GetLoadBalancers.go index 00d800ee3a0..32f3dd7a407 100644 --- a/service/lightsail/api_op_GetLoadBalancers.go +++ b/service/lightsail/api_op_GetLoadBalancers.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetLoadBalancers(ctx context.Context, params *GetLoadBalancersI addawsAwsjson11_serdeOpGetLoadBalancersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetOperation.go b/service/lightsail/api_op_GetOperation.go index f72c5b4e2fb..ada89532dba 100644 --- a/service/lightsail/api_op_GetOperation.go +++ b/service/lightsail/api_op_GetOperation.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetOperation(ctx context.Context, params *GetOperationInput, op addawsAwsjson11_serdeOpGetOperationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetOperations.go b/service/lightsail/api_op_GetOperations.go index 170d68062ed..fab6f995a3c 100644 --- a/service/lightsail/api_op_GetOperations.go +++ b/service/lightsail/api_op_GetOperations.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetOperations(ctx context.Context, params *GetOperationsInput, addawsAwsjson11_serdeOpGetOperationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetOperationsForResource.go b/service/lightsail/api_op_GetOperationsForResource.go index 54cc007b74d..6beb395ae04 100644 --- a/service/lightsail/api_op_GetOperationsForResource.go +++ b/service/lightsail/api_op_GetOperationsForResource.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetOperationsForResource(ctx context.Context, params *GetOperat addawsAwsjson11_serdeOpGetOperationsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetRegions.go b/service/lightsail/api_op_GetRegions.go index 268980e25a5..af6b2b59480 100644 --- a/service/lightsail/api_op_GetRegions.go +++ b/service/lightsail/api_op_GetRegions.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetRegions(ctx context.Context, params *GetRegionsInput, optFns addawsAwsjson11_serdeOpGetRegionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetRelationalDatabase.go b/service/lightsail/api_op_GetRelationalDatabase.go index 8d8763a8644..10f814d8dd5 100644 --- a/service/lightsail/api_op_GetRelationalDatabase.go +++ b/service/lightsail/api_op_GetRelationalDatabase.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetRelationalDatabase(ctx context.Context, params *GetRelationa addawsAwsjson11_serdeOpGetRelationalDatabaseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetRelationalDatabaseBlueprints.go b/service/lightsail/api_op_GetRelationalDatabaseBlueprints.go index 14904e50f6f..5f8c5493a30 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseBlueprints.go +++ b/service/lightsail/api_op_GetRelationalDatabaseBlueprints.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetRelationalDatabaseBlueprints(ctx context.Context, params *Ge addawsAwsjson11_serdeOpGetRelationalDatabaseBlueprintsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetRelationalDatabaseBundles.go b/service/lightsail/api_op_GetRelationalDatabaseBundles.go index 2d3311c9fb3..8661c4881f5 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseBundles.go +++ b/service/lightsail/api_op_GetRelationalDatabaseBundles.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetRelationalDatabaseBundles(ctx context.Context, params *GetRe addawsAwsjson11_serdeOpGetRelationalDatabaseBundlesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetRelationalDatabaseEvents.go b/service/lightsail/api_op_GetRelationalDatabaseEvents.go index 6e015fa429d..c6b02e21edc 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseEvents.go +++ b/service/lightsail/api_op_GetRelationalDatabaseEvents.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetRelationalDatabaseEvents(ctx context.Context, params *GetRel addawsAwsjson11_serdeOpGetRelationalDatabaseEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetRelationalDatabaseLogEvents.go b/service/lightsail/api_op_GetRelationalDatabaseLogEvents.go index fccd2da1f27..a66157301b2 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseLogEvents.go +++ b/service/lightsail/api_op_GetRelationalDatabaseLogEvents.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetRelationalDatabaseLogEvents(ctx context.Context, params *Get addawsAwsjson11_serdeOpGetRelationalDatabaseLogEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetRelationalDatabaseLogStreams.go b/service/lightsail/api_op_GetRelationalDatabaseLogStreams.go index 97a5d7d1b01..398b3eeb901 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseLogStreams.go +++ b/service/lightsail/api_op_GetRelationalDatabaseLogStreams.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetRelationalDatabaseLogStreams(ctx context.Context, params *Ge addawsAwsjson11_serdeOpGetRelationalDatabaseLogStreamsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetRelationalDatabaseMasterUserPassword.go b/service/lightsail/api_op_GetRelationalDatabaseMasterUserPassword.go index ff5c3dd2d88..bf84c6212da 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseMasterUserPassword.go +++ b/service/lightsail/api_op_GetRelationalDatabaseMasterUserPassword.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetRelationalDatabaseMasterUserPassword(ctx context.Context, pa addawsAwsjson11_serdeOpGetRelationalDatabaseMasterUserPasswordMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetRelationalDatabaseMetricData.go b/service/lightsail/api_op_GetRelationalDatabaseMetricData.go index 8c3f6aa4963..12b83007444 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseMetricData.go +++ b/service/lightsail/api_op_GetRelationalDatabaseMetricData.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetRelationalDatabaseMetricData(ctx context.Context, params *Ge addawsAwsjson11_serdeOpGetRelationalDatabaseMetricDataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetRelationalDatabaseParameters.go b/service/lightsail/api_op_GetRelationalDatabaseParameters.go index 7b288f9ddef..5355e911639 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseParameters.go +++ b/service/lightsail/api_op_GetRelationalDatabaseParameters.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetRelationalDatabaseParameters(ctx context.Context, params *Ge addawsAwsjson11_serdeOpGetRelationalDatabaseParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetRelationalDatabaseSnapshot.go b/service/lightsail/api_op_GetRelationalDatabaseSnapshot.go index 15d6d0990a1..a05bb1e38f9 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseSnapshot.go +++ b/service/lightsail/api_op_GetRelationalDatabaseSnapshot.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetRelationalDatabaseSnapshot(ctx context.Context, params *GetR addawsAwsjson11_serdeOpGetRelationalDatabaseSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetRelationalDatabaseSnapshots.go b/service/lightsail/api_op_GetRelationalDatabaseSnapshots.go index 9caf7e62322..ef1e96a8f94 100644 --- a/service/lightsail/api_op_GetRelationalDatabaseSnapshots.go +++ b/service/lightsail/api_op_GetRelationalDatabaseSnapshots.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetRelationalDatabaseSnapshots(ctx context.Context, params *Get addawsAwsjson11_serdeOpGetRelationalDatabaseSnapshotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetRelationalDatabases.go b/service/lightsail/api_op_GetRelationalDatabases.go index 3ba1b0a52ab..c353c3ebf07 100644 --- a/service/lightsail/api_op_GetRelationalDatabases.go +++ b/service/lightsail/api_op_GetRelationalDatabases.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetRelationalDatabases(ctx context.Context, params *GetRelation addawsAwsjson11_serdeOpGetRelationalDatabasesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetStaticIp.go b/service/lightsail/api_op_GetStaticIp.go index 1d135b3d1de..7f4b2054fb0 100644 --- a/service/lightsail/api_op_GetStaticIp.go +++ b/service/lightsail/api_op_GetStaticIp.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetStaticIp(ctx context.Context, params *GetStaticIpInput, optF addawsAwsjson11_serdeOpGetStaticIpMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_GetStaticIps.go b/service/lightsail/api_op_GetStaticIps.go index 1358cabbd56..a4af4809708 100644 --- a/service/lightsail/api_op_GetStaticIps.go +++ b/service/lightsail/api_op_GetStaticIps.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetStaticIps(ctx context.Context, params *GetStaticIpsInput, op addawsAwsjson11_serdeOpGetStaticIpsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_ImportKeyPair.go b/service/lightsail/api_op_ImportKeyPair.go index e07a2ebb8e2..6206f2a32d8 100644 --- a/service/lightsail/api_op_ImportKeyPair.go +++ b/service/lightsail/api_op_ImportKeyPair.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ImportKeyPair(ctx context.Context, params *ImportKeyPairInput, addawsAwsjson11_serdeOpImportKeyPairMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_IsVpcPeered.go b/service/lightsail/api_op_IsVpcPeered.go index 3388ab578cd..02ef81cefe1 100644 --- a/service/lightsail/api_op_IsVpcPeered.go +++ b/service/lightsail/api_op_IsVpcPeered.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) IsVpcPeered(ctx context.Context, params *IsVpcPeeredInput, optF addawsAwsjson11_serdeOpIsVpcPeeredMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_OpenInstancePublicPorts.go b/service/lightsail/api_op_OpenInstancePublicPorts.go index 5a8c2585a3d..b52f0c32aac 100644 --- a/service/lightsail/api_op_OpenInstancePublicPorts.go +++ b/service/lightsail/api_op_OpenInstancePublicPorts.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) OpenInstancePublicPorts(ctx context.Context, params *OpenInstan addawsAwsjson11_serdeOpOpenInstancePublicPortsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_PeerVpc.go b/service/lightsail/api_op_PeerVpc.go index 194bc42cc97..a8c58329133 100644 --- a/service/lightsail/api_op_PeerVpc.go +++ b/service/lightsail/api_op_PeerVpc.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PeerVpc(ctx context.Context, params *PeerVpcInput, optFns ...fu addawsAwsjson11_serdeOpPeerVpcMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_PutAlarm.go b/service/lightsail/api_op_PutAlarm.go index 23633b56468..cd5d9c5e40d 100644 --- a/service/lightsail/api_op_PutAlarm.go +++ b/service/lightsail/api_op_PutAlarm.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) PutAlarm(ctx context.Context, params *PutAlarmInput, optFns ... addawsAwsjson11_serdeOpPutAlarmMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_PutInstancePublicPorts.go b/service/lightsail/api_op_PutInstancePublicPorts.go index 49367662f40..7c47e89a2cb 100644 --- a/service/lightsail/api_op_PutInstancePublicPorts.go +++ b/service/lightsail/api_op_PutInstancePublicPorts.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) PutInstancePublicPorts(ctx context.Context, params *PutInstance addawsAwsjson11_serdeOpPutInstancePublicPortsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_RebootInstance.go b/service/lightsail/api_op_RebootInstance.go index 41a6206e98a..a603593cd06 100644 --- a/service/lightsail/api_op_RebootInstance.go +++ b/service/lightsail/api_op_RebootInstance.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) RebootInstance(ctx context.Context, params *RebootInstanceInput addawsAwsjson11_serdeOpRebootInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_RebootRelationalDatabase.go b/service/lightsail/api_op_RebootRelationalDatabase.go index 5f023155661..80b963cd418 100644 --- a/service/lightsail/api_op_RebootRelationalDatabase.go +++ b/service/lightsail/api_op_RebootRelationalDatabase.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) RebootRelationalDatabase(ctx context.Context, params *RebootRel addawsAwsjson11_serdeOpRebootRelationalDatabaseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_ReleaseStaticIp.go b/service/lightsail/api_op_ReleaseStaticIp.go index 68af7dc4789..c2476b23671 100644 --- a/service/lightsail/api_op_ReleaseStaticIp.go +++ b/service/lightsail/api_op_ReleaseStaticIp.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ReleaseStaticIp(ctx context.Context, params *ReleaseStaticIpInp addawsAwsjson11_serdeOpReleaseStaticIpMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_ResetDistributionCache.go b/service/lightsail/api_op_ResetDistributionCache.go index d9da2af71aa..95a31f8cdb1 100644 --- a/service/lightsail/api_op_ResetDistributionCache.go +++ b/service/lightsail/api_op_ResetDistributionCache.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ResetDistributionCache(ctx context.Context, params *ResetDistri addawsAwsjson11_serdeOpResetDistributionCacheMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_SendContactMethodVerification.go b/service/lightsail/api_op_SendContactMethodVerification.go index edb945eb5b1..1543bc59251 100644 --- a/service/lightsail/api_op_SendContactMethodVerification.go +++ b/service/lightsail/api_op_SendContactMethodVerification.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) SendContactMethodVerification(ctx context.Context, params *Send addawsAwsjson11_serdeOpSendContactMethodVerificationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_StartInstance.go b/service/lightsail/api_op_StartInstance.go index 41de8cda4e3..122e829162e 100644 --- a/service/lightsail/api_op_StartInstance.go +++ b/service/lightsail/api_op_StartInstance.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) StartInstance(ctx context.Context, params *StartInstanceInput, addawsAwsjson11_serdeOpStartInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_StartRelationalDatabase.go b/service/lightsail/api_op_StartRelationalDatabase.go index 44ccb9c5afe..de59e1bee40 100644 --- a/service/lightsail/api_op_StartRelationalDatabase.go +++ b/service/lightsail/api_op_StartRelationalDatabase.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) StartRelationalDatabase(ctx context.Context, params *StartRelat addawsAwsjson11_serdeOpStartRelationalDatabaseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_StopInstance.go b/service/lightsail/api_op_StopInstance.go index aafcac03bbd..757112b776c 100644 --- a/service/lightsail/api_op_StopInstance.go +++ b/service/lightsail/api_op_StopInstance.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) StopInstance(ctx context.Context, params *StopInstanceInput, op addawsAwsjson11_serdeOpStopInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_StopRelationalDatabase.go b/service/lightsail/api_op_StopRelationalDatabase.go index 630452a800b..6a6b7625333 100644 --- a/service/lightsail/api_op_StopRelationalDatabase.go +++ b/service/lightsail/api_op_StopRelationalDatabase.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) StopRelationalDatabase(ctx context.Context, params *StopRelatio addawsAwsjson11_serdeOpStopRelationalDatabaseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_TagResource.go b/service/lightsail/api_op_TagResource.go index 3b5f625bedf..02fc47a1a42 100644 --- a/service/lightsail/api_op_TagResource.go +++ b/service/lightsail/api_op_TagResource.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_TestAlarm.go b/service/lightsail/api_op_TestAlarm.go index 5991f3fd188..e1ec4a955d4 100644 --- a/service/lightsail/api_op_TestAlarm.go +++ b/service/lightsail/api_op_TestAlarm.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) TestAlarm(ctx context.Context, params *TestAlarmInput, optFns . addawsAwsjson11_serdeOpTestAlarmMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_UnpeerVpc.go b/service/lightsail/api_op_UnpeerVpc.go index 378e3bf2a6e..8043ddb2e95 100644 --- a/service/lightsail/api_op_UnpeerVpc.go +++ b/service/lightsail/api_op_UnpeerVpc.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UnpeerVpc(ctx context.Context, params *UnpeerVpcInput, optFns . addawsAwsjson11_serdeOpUnpeerVpcMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_UntagResource.go b/service/lightsail/api_op_UntagResource.go index e9bdc2ebb3d..2e215e3ad1b 100644 --- a/service/lightsail/api_op_UntagResource.go +++ b/service/lightsail/api_op_UntagResource.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_UpdateDistribution.go b/service/lightsail/api_op_UpdateDistribution.go index 6953f4f08f5..e94c729f6f9 100644 --- a/service/lightsail/api_op_UpdateDistribution.go +++ b/service/lightsail/api_op_UpdateDistribution.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateDistribution(ctx context.Context, params *UpdateDistribut addawsAwsjson11_serdeOpUpdateDistributionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_UpdateDistributionBundle.go b/service/lightsail/api_op_UpdateDistributionBundle.go index 07304c349c4..2e45b317bdf 100644 --- a/service/lightsail/api_op_UpdateDistributionBundle.go +++ b/service/lightsail/api_op_UpdateDistributionBundle.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) UpdateDistributionBundle(ctx context.Context, params *UpdateDis addawsAwsjson11_serdeOpUpdateDistributionBundleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_UpdateDomainEntry.go b/service/lightsail/api_op_UpdateDomainEntry.go index e805e17b89b..dbae2ac99ce 100644 --- a/service/lightsail/api_op_UpdateDomainEntry.go +++ b/service/lightsail/api_op_UpdateDomainEntry.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateDomainEntry(ctx context.Context, params *UpdateDomainEntr addawsAwsjson11_serdeOpUpdateDomainEntryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_UpdateLoadBalancerAttribute.go b/service/lightsail/api_op_UpdateLoadBalancerAttribute.go index f93a146381c..135259aac54 100644 --- a/service/lightsail/api_op_UpdateLoadBalancerAttribute.go +++ b/service/lightsail/api_op_UpdateLoadBalancerAttribute.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateLoadBalancerAttribute(ctx context.Context, params *Update addawsAwsjson11_serdeOpUpdateLoadBalancerAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_UpdateRelationalDatabase.go b/service/lightsail/api_op_UpdateRelationalDatabase.go index 39300f91c02..888582f0f64 100644 --- a/service/lightsail/api_op_UpdateRelationalDatabase.go +++ b/service/lightsail/api_op_UpdateRelationalDatabase.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) UpdateRelationalDatabase(ctx context.Context, params *UpdateRel addawsAwsjson11_serdeOpUpdateRelationalDatabaseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/api_op_UpdateRelationalDatabaseParameters.go b/service/lightsail/api_op_UpdateRelationalDatabaseParameters.go index 465a8afcfd3..10cacca3709 100644 --- a/service/lightsail/api_op_UpdateRelationalDatabaseParameters.go +++ b/service/lightsail/api_op_UpdateRelationalDatabaseParameters.go @@ -5,7 +5,6 @@ package lightsail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/lightsail/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) UpdateRelationalDatabaseParameters(ctx context.Context, params addawsAwsjson11_serdeOpUpdateRelationalDatabaseParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/lightsail/endpoints.go b/service/lightsail/endpoints.go index 5768b370bc5..c16fb376329 100644 --- a/service/lightsail/endpoints.go +++ b/service/lightsail/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/machinelearning/api_client.go b/service/machinelearning/api_client.go index 95d5f7d5863..4bb50995e9a 100644 --- a/service/machinelearning/api_client.go +++ b/service/machinelearning/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/machinelearning/api_op_AddTags.go b/service/machinelearning/api_op_AddTags.go index 6875597e97a..e5d4114b809 100644 --- a/service/machinelearning/api_op_AddTags.go +++ b/service/machinelearning/api_op_AddTags.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/machinelearning/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) AddTags(ctx context.Context, params *AddTagsInput, optFns ...fu addawsAwsjson11_serdeOpAddTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_CreateBatchPrediction.go b/service/machinelearning/api_op_CreateBatchPrediction.go index 86c9e2eed9a..1c49236a3c6 100644 --- a/service/machinelearning/api_op_CreateBatchPrediction.go +++ b/service/machinelearning/api_op_CreateBatchPrediction.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -34,9 +33,9 @@ func (c *Client) CreateBatchPrediction(ctx context.Context, params *CreateBatchP addawsAwsjson11_serdeOpCreateBatchPredictionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_CreateDataSourceFromRDS.go b/service/machinelearning/api_op_CreateDataSourceFromRDS.go index 3797463e06c..a4625939d34 100644 --- a/service/machinelearning/api_op_CreateDataSourceFromRDS.go +++ b/service/machinelearning/api_op_CreateDataSourceFromRDS.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/machinelearning/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) CreateDataSourceFromRDS(ctx context.Context, params *CreateData addawsAwsjson11_serdeOpCreateDataSourceFromRDSMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_CreateDataSourceFromRedshift.go b/service/machinelearning/api_op_CreateDataSourceFromRedshift.go index 2e2c8a61161..46c6c5ebd27 100644 --- a/service/machinelearning/api_op_CreateDataSourceFromRedshift.go +++ b/service/machinelearning/api_op_CreateDataSourceFromRedshift.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/machinelearning/types" smithy "github.com/awslabs/smithy-go" @@ -55,9 +54,9 @@ func (c *Client) CreateDataSourceFromRedshift(ctx context.Context, params *Creat addawsAwsjson11_serdeOpCreateDataSourceFromRedshiftMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_CreateDataSourceFromS3.go b/service/machinelearning/api_op_CreateDataSourceFromS3.go index ffb0116f9bb..85bb490e66d 100644 --- a/service/machinelearning/api_op_CreateDataSourceFromS3.go +++ b/service/machinelearning/api_op_CreateDataSourceFromS3.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/machinelearning/types" smithy "github.com/awslabs/smithy-go" @@ -50,9 +49,9 @@ func (c *Client) CreateDataSourceFromS3(ctx context.Context, params *CreateDataS addawsAwsjson11_serdeOpCreateDataSourceFromS3Middlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_CreateEvaluation.go b/service/machinelearning/api_op_CreateEvaluation.go index 2066f0d96a8..7d384ea3418 100644 --- a/service/machinelearning/api_op_CreateEvaluation.go +++ b/service/machinelearning/api_op_CreateEvaluation.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) CreateEvaluation(ctx context.Context, params *CreateEvaluationI addawsAwsjson11_serdeOpCreateEvaluationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_CreateMLModel.go b/service/machinelearning/api_op_CreateMLModel.go index 9d8099e289f..e69716a29c2 100644 --- a/service/machinelearning/api_op_CreateMLModel.go +++ b/service/machinelearning/api_op_CreateMLModel.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/machinelearning/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) CreateMLModel(ctx context.Context, params *CreateMLModelInput, addawsAwsjson11_serdeOpCreateMLModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_CreateRealtimeEndpoint.go b/service/machinelearning/api_op_CreateRealtimeEndpoint.go index 85287ddd527..08b74f8b538 100644 --- a/service/machinelearning/api_op_CreateRealtimeEndpoint.go +++ b/service/machinelearning/api_op_CreateRealtimeEndpoint.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/machinelearning/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateRealtimeEndpoint(ctx context.Context, params *CreateRealt addawsAwsjson11_serdeOpCreateRealtimeEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_DeleteBatchPrediction.go b/service/machinelearning/api_op_DeleteBatchPrediction.go index 2b6b22faca4..e360effa933 100644 --- a/service/machinelearning/api_op_DeleteBatchPrediction.go +++ b/service/machinelearning/api_op_DeleteBatchPrediction.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteBatchPrediction(ctx context.Context, params *DeleteBatchP addawsAwsjson11_serdeOpDeleteBatchPredictionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_DeleteDataSource.go b/service/machinelearning/api_op_DeleteDataSource.go index 70d8da468e7..fcb9ea8b3b1 100644 --- a/service/machinelearning/api_op_DeleteDataSource.go +++ b/service/machinelearning/api_op_DeleteDataSource.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteDataSource(ctx context.Context, params *DeleteDataSourceI addawsAwsjson11_serdeOpDeleteDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_DeleteEvaluation.go b/service/machinelearning/api_op_DeleteEvaluation.go index 25d680cc039..217c3e5e45c 100644 --- a/service/machinelearning/api_op_DeleteEvaluation.go +++ b/service/machinelearning/api_op_DeleteEvaluation.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteEvaluation(ctx context.Context, params *DeleteEvaluationI addawsAwsjson11_serdeOpDeleteEvaluationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_DeleteMLModel.go b/service/machinelearning/api_op_DeleteMLModel.go index 830bc14b031..b0d0d59f6d3 100644 --- a/service/machinelearning/api_op_DeleteMLModel.go +++ b/service/machinelearning/api_op_DeleteMLModel.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteMLModel(ctx context.Context, params *DeleteMLModelInput, addawsAwsjson11_serdeOpDeleteMLModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_DeleteRealtimeEndpoint.go b/service/machinelearning/api_op_DeleteRealtimeEndpoint.go index 66f28921148..6198d7a8256 100644 --- a/service/machinelearning/api_op_DeleteRealtimeEndpoint.go +++ b/service/machinelearning/api_op_DeleteRealtimeEndpoint.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/machinelearning/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteRealtimeEndpoint(ctx context.Context, params *DeleteRealt addawsAwsjson11_serdeOpDeleteRealtimeEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_DeleteTags.go b/service/machinelearning/api_op_DeleteTags.go index 0227f463913..7d7137103ff 100644 --- a/service/machinelearning/api_op_DeleteTags.go +++ b/service/machinelearning/api_op_DeleteTags.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/machinelearning/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DeleteTags(ctx context.Context, params *DeleteTagsInput, optFns addawsAwsjson11_serdeOpDeleteTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_DescribeBatchPredictions.go b/service/machinelearning/api_op_DescribeBatchPredictions.go index f0e94b1a6fa..7b23134ad35 100644 --- a/service/machinelearning/api_op_DescribeBatchPredictions.go +++ b/service/machinelearning/api_op_DescribeBatchPredictions.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/machinelearning/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeBatchPredictions(ctx context.Context, params *DescribeB addawsAwsjson11_serdeOpDescribeBatchPredictionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_DescribeDataSources.go b/service/machinelearning/api_op_DescribeDataSources.go index 91adf559e11..77471440648 100644 --- a/service/machinelearning/api_op_DescribeDataSources.go +++ b/service/machinelearning/api_op_DescribeDataSources.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/machinelearning/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDataSources(ctx context.Context, params *DescribeDataSo addawsAwsjson11_serdeOpDescribeDataSourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_DescribeEvaluations.go b/service/machinelearning/api_op_DescribeEvaluations.go index d03ff0f0923..03fcdff19b2 100644 --- a/service/machinelearning/api_op_DescribeEvaluations.go +++ b/service/machinelearning/api_op_DescribeEvaluations.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/machinelearning/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEvaluations(ctx context.Context, params *DescribeEvalua addawsAwsjson11_serdeOpDescribeEvaluationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_DescribeMLModels.go b/service/machinelearning/api_op_DescribeMLModels.go index 5e5e36e3b42..6518355c8c9 100644 --- a/service/machinelearning/api_op_DescribeMLModels.go +++ b/service/machinelearning/api_op_DescribeMLModels.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/machinelearning/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeMLModels(ctx context.Context, params *DescribeMLModelsI addawsAwsjson11_serdeOpDescribeMLModelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_DescribeTags.go b/service/machinelearning/api_op_DescribeTags.go index eae5f0f34ee..b1e8f7e2f8b 100644 --- a/service/machinelearning/api_op_DescribeTags.go +++ b/service/machinelearning/api_op_DescribeTags.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/machinelearning/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeTags(ctx context.Context, params *DescribeTagsInput, op addawsAwsjson11_serdeOpDescribeTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_GetBatchPrediction.go b/service/machinelearning/api_op_GetBatchPrediction.go index cb105bcea20..48011e35971 100644 --- a/service/machinelearning/api_op_GetBatchPrediction.go +++ b/service/machinelearning/api_op_GetBatchPrediction.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/machinelearning/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetBatchPrediction(ctx context.Context, params *GetBatchPredict addawsAwsjson11_serdeOpGetBatchPredictionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_GetDataSource.go b/service/machinelearning/api_op_GetDataSource.go index dcb2dd17fe9..7ae32feec6e 100644 --- a/service/machinelearning/api_op_GetDataSource.go +++ b/service/machinelearning/api_op_GetDataSource.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/machinelearning/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetDataSource(ctx context.Context, params *GetDataSourceInput, addawsAwsjson11_serdeOpGetDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_GetEvaluation.go b/service/machinelearning/api_op_GetEvaluation.go index b9a1b12cdb5..accdac8944e 100644 --- a/service/machinelearning/api_op_GetEvaluation.go +++ b/service/machinelearning/api_op_GetEvaluation.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/machinelearning/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetEvaluation(ctx context.Context, params *GetEvaluationInput, addawsAwsjson11_serdeOpGetEvaluationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_GetMLModel.go b/service/machinelearning/api_op_GetMLModel.go index b9b4089d35b..e193f5e2f6e 100644 --- a/service/machinelearning/api_op_GetMLModel.go +++ b/service/machinelearning/api_op_GetMLModel.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/machinelearning/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetMLModel(ctx context.Context, params *GetMLModelInput, optFns addawsAwsjson11_serdeOpGetMLModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_Predict.go b/service/machinelearning/api_op_Predict.go index ececec4de8e..3c94d3f6481 100644 --- a/service/machinelearning/api_op_Predict.go +++ b/service/machinelearning/api_op_Predict.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" mlcust "github.com/aws/aws-sdk-go-v2/service/machinelearning/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/machinelearning/types" @@ -27,9 +26,9 @@ func (c *Client) Predict(ctx context.Context, params *PredictInput, optFns ...fu addawsAwsjson11_serdeOpPredictMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_UpdateBatchPrediction.go b/service/machinelearning/api_op_UpdateBatchPrediction.go index 6ba394289d8..e6af69891a2 100644 --- a/service/machinelearning/api_op_UpdateBatchPrediction.go +++ b/service/machinelearning/api_op_UpdateBatchPrediction.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpdateBatchPrediction(ctx context.Context, params *UpdateBatchP addawsAwsjson11_serdeOpUpdateBatchPredictionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_UpdateDataSource.go b/service/machinelearning/api_op_UpdateDataSource.go index bdddc7e9d61..48b9b640666 100644 --- a/service/machinelearning/api_op_UpdateDataSource.go +++ b/service/machinelearning/api_op_UpdateDataSource.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpdateDataSource(ctx context.Context, params *UpdateDataSourceI addawsAwsjson11_serdeOpUpdateDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_UpdateEvaluation.go b/service/machinelearning/api_op_UpdateEvaluation.go index 8d013b65e65..1e3d4a54860 100644 --- a/service/machinelearning/api_op_UpdateEvaluation.go +++ b/service/machinelearning/api_op_UpdateEvaluation.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpdateEvaluation(ctx context.Context, params *UpdateEvaluationI addawsAwsjson11_serdeOpUpdateEvaluationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/api_op_UpdateMLModel.go b/service/machinelearning/api_op_UpdateMLModel.go index 03c9164b261..d64d8c2e531 100644 --- a/service/machinelearning/api_op_UpdateMLModel.go +++ b/service/machinelearning/api_op_UpdateMLModel.go @@ -5,7 +5,6 @@ package machinelearning import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpdateMLModel(ctx context.Context, params *UpdateMLModelInput, addawsAwsjson11_serdeOpUpdateMLModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/machinelearning/endpoints.go b/service/machinelearning/endpoints.go index f3199d05764..ac3f603d2f2 100644 --- a/service/machinelearning/endpoints.go +++ b/service/machinelearning/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/macie/api_client.go b/service/macie/api_client.go index dc90fc0f930..b4065bab4ac 100644 --- a/service/macie/api_client.go +++ b/service/macie/api_client.go @@ -88,30 +88,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -177,6 +153,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/macie/api_op_AssociateMemberAccount.go b/service/macie/api_op_AssociateMemberAccount.go index 0de852fcb5f..5434f621e24 100644 --- a/service/macie/api_op_AssociateMemberAccount.go +++ b/service/macie/api_op_AssociateMemberAccount.go @@ -5,7 +5,6 @@ package macie import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AssociateMemberAccount(ctx context.Context, params *AssociateMe addawsAwsjson11_serdeOpAssociateMemberAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie/api_op_AssociateS3Resources.go b/service/macie/api_op_AssociateS3Resources.go index 1dba1f52851..f90b18e85e1 100644 --- a/service/macie/api_op_AssociateS3Resources.go +++ b/service/macie/api_op_AssociateS3Resources.go @@ -5,7 +5,6 @@ package macie import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) AssociateS3Resources(ctx context.Context, params *AssociateS3Re addawsAwsjson11_serdeOpAssociateS3ResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie/api_op_DisassociateMemberAccount.go b/service/macie/api_op_DisassociateMemberAccount.go index 8946d4ab58c..d6a9d189c95 100644 --- a/service/macie/api_op_DisassociateMemberAccount.go +++ b/service/macie/api_op_DisassociateMemberAccount.go @@ -5,7 +5,6 @@ package macie import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisassociateMemberAccount(ctx context.Context, params *Disassoc addawsAwsjson11_serdeOpDisassociateMemberAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie/api_op_DisassociateS3Resources.go b/service/macie/api_op_DisassociateS3Resources.go index 3f8b1aef4fc..b39e4b5549c 100644 --- a/service/macie/api_op_DisassociateS3Resources.go +++ b/service/macie/api_op_DisassociateS3Resources.go @@ -5,7 +5,6 @@ package macie import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DisassociateS3Resources(ctx context.Context, params *Disassocia addawsAwsjson11_serdeOpDisassociateS3ResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie/api_op_ListMemberAccounts.go b/service/macie/api_op_ListMemberAccounts.go index f1003d669dc..115bc8984e7 100644 --- a/service/macie/api_op_ListMemberAccounts.go +++ b/service/macie/api_op_ListMemberAccounts.go @@ -5,7 +5,6 @@ package macie import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListMemberAccounts(ctx context.Context, params *ListMemberAccou addawsAwsjson11_serdeOpListMemberAccountsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie/api_op_ListS3Resources.go b/service/macie/api_op_ListS3Resources.go index d741ec3cd66..15600dd4289 100644 --- a/service/macie/api_op_ListS3Resources.go +++ b/service/macie/api_op_ListS3Resources.go @@ -5,7 +5,6 @@ package macie import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListS3Resources(ctx context.Context, params *ListS3ResourcesInp addawsAwsjson11_serdeOpListS3ResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie/api_op_UpdateS3Resources.go b/service/macie/api_op_UpdateS3Resources.go index 99a94f60a7f..8671f999749 100644 --- a/service/macie/api_op_UpdateS3Resources.go +++ b/service/macie/api_op_UpdateS3Resources.go @@ -5,7 +5,6 @@ package macie import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) UpdateS3Resources(ctx context.Context, params *UpdateS3Resource addawsAwsjson11_serdeOpUpdateS3ResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie/endpoints.go b/service/macie/endpoints.go index 0f9b430f74c..0019aa3b25c 100644 --- a/service/macie/endpoints.go +++ b/service/macie/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/macie2/api_client.go b/service/macie2/api_client.go index 9ba194119ef..41b5879da9d 100644 --- a/service/macie2/api_client.go +++ b/service/macie2/api_client.go @@ -92,34 +92,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -192,6 +164,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/macie2/api_op_AcceptInvitation.go b/service/macie2/api_op_AcceptInvitation.go index 9775ae67de6..d393f947501 100644 --- a/service/macie2/api_op_AcceptInvitation.go +++ b/service/macie2/api_op_AcceptInvitation.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AcceptInvitation(ctx context.Context, params *AcceptInvitationI addawsRestjson1_serdeOpAcceptInvitationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_BatchGetCustomDataIdentifiers.go b/service/macie2/api_op_BatchGetCustomDataIdentifiers.go index 03b6c3b9fc2..073d0fe7bb7 100644 --- a/service/macie2/api_op_BatchGetCustomDataIdentifiers.go +++ b/service/macie2/api_op_BatchGetCustomDataIdentifiers.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchGetCustomDataIdentifiers(ctx context.Context, params *Batc addawsRestjson1_serdeOpBatchGetCustomDataIdentifiersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_CreateClassificationJob.go b/service/macie2/api_op_CreateClassificationJob.go index 0ac0cb9e31f..8693d5b8ac0 100644 --- a/service/macie2/api_op_CreateClassificationJob.go +++ b/service/macie2/api_op_CreateClassificationJob.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateClassificationJob(ctx context.Context, params *CreateClas addawsRestjson1_serdeOpCreateClassificationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_CreateCustomDataIdentifier.go b/service/macie2/api_op_CreateCustomDataIdentifier.go index 2fb3d8fe0b2..a847255fd9a 100644 --- a/service/macie2/api_op_CreateCustomDataIdentifier.go +++ b/service/macie2/api_op_CreateCustomDataIdentifier.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CreateCustomDataIdentifier(ctx context.Context, params *CreateC addawsRestjson1_serdeOpCreateCustomDataIdentifierMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_CreateFindingsFilter.go b/service/macie2/api_op_CreateFindingsFilter.go index c9633504f8a..1e5d60ef6a6 100644 --- a/service/macie2/api_op_CreateFindingsFilter.go +++ b/service/macie2/api_op_CreateFindingsFilter.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateFindingsFilter(ctx context.Context, params *CreateFinding addawsRestjson1_serdeOpCreateFindingsFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_CreateInvitations.go b/service/macie2/api_op_CreateInvitations.go index f7629a60c97..093d8ac8d36 100644 --- a/service/macie2/api_op_CreateInvitations.go +++ b/service/macie2/api_op_CreateInvitations.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateInvitations(ctx context.Context, params *CreateInvitation addawsRestjson1_serdeOpCreateInvitationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_CreateMember.go b/service/macie2/api_op_CreateMember.go index 263689ee385..1d387f14ad1 100644 --- a/service/macie2/api_op_CreateMember.go +++ b/service/macie2/api_op_CreateMember.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateMember(ctx context.Context, params *CreateMemberInput, op addawsRestjson1_serdeOpCreateMemberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_CreateSampleFindings.go b/service/macie2/api_op_CreateSampleFindings.go index 812685bd1b8..30bfd17639d 100644 --- a/service/macie2/api_op_CreateSampleFindings.go +++ b/service/macie2/api_op_CreateSampleFindings.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateSampleFindings(ctx context.Context, params *CreateSampleF addawsRestjson1_serdeOpCreateSampleFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_DeclineInvitations.go b/service/macie2/api_op_DeclineInvitations.go index 29445c550f8..086d67b2633 100644 --- a/service/macie2/api_op_DeclineInvitations.go +++ b/service/macie2/api_op_DeclineInvitations.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeclineInvitations(ctx context.Context, params *DeclineInvitati addawsRestjson1_serdeOpDeclineInvitationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_DeleteCustomDataIdentifier.go b/service/macie2/api_op_DeleteCustomDataIdentifier.go index e8f8a298560..c47dd53a32f 100644 --- a/service/macie2/api_op_DeleteCustomDataIdentifier.go +++ b/service/macie2/api_op_DeleteCustomDataIdentifier.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteCustomDataIdentifier(ctx context.Context, params *DeleteC addawsRestjson1_serdeOpDeleteCustomDataIdentifierMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_DeleteFindingsFilter.go b/service/macie2/api_op_DeleteFindingsFilter.go index 817dce1c3cf..a33e6b7ba01 100644 --- a/service/macie2/api_op_DeleteFindingsFilter.go +++ b/service/macie2/api_op_DeleteFindingsFilter.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteFindingsFilter(ctx context.Context, params *DeleteFinding addawsRestjson1_serdeOpDeleteFindingsFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_DeleteInvitations.go b/service/macie2/api_op_DeleteInvitations.go index 5f67272e32a..158379dabd9 100644 --- a/service/macie2/api_op_DeleteInvitations.go +++ b/service/macie2/api_op_DeleteInvitations.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteInvitations(ctx context.Context, params *DeleteInvitation addawsRestjson1_serdeOpDeleteInvitationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_DeleteMember.go b/service/macie2/api_op_DeleteMember.go index 328bb1a7875..e81aa9b2b5d 100644 --- a/service/macie2/api_op_DeleteMember.go +++ b/service/macie2/api_op_DeleteMember.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteMember(ctx context.Context, params *DeleteMemberInput, op addawsRestjson1_serdeOpDeleteMemberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_DescribeBuckets.go b/service/macie2/api_op_DescribeBuckets.go index 6513824db05..4424ff78a92 100644 --- a/service/macie2/api_op_DescribeBuckets.go +++ b/service/macie2/api_op_DescribeBuckets.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeBuckets(ctx context.Context, params *DescribeBucketsInp addawsRestjson1_serdeOpDescribeBucketsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_DescribeClassificationJob.go b/service/macie2/api_op_DescribeClassificationJob.go index 6f578e7277d..520ab54c5dc 100644 --- a/service/macie2/api_op_DescribeClassificationJob.go +++ b/service/macie2/api_op_DescribeClassificationJob.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeClassificationJob(ctx context.Context, params *Describe addawsRestjson1_serdeOpDescribeClassificationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_DescribeOrganizationConfiguration.go b/service/macie2/api_op_DescribeOrganizationConfiguration.go index 5e1b76b7a13..7200387cc4e 100644 --- a/service/macie2/api_op_DescribeOrganizationConfiguration.go +++ b/service/macie2/api_op_DescribeOrganizationConfiguration.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DescribeOrganizationConfiguration(ctx context.Context, params * addawsRestjson1_serdeOpDescribeOrganizationConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_DisableMacie.go b/service/macie2/api_op_DisableMacie.go index feaa38c5949..a42fd4bb4a5 100644 --- a/service/macie2/api_op_DisableMacie.go +++ b/service/macie2/api_op_DisableMacie.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisableMacie(ctx context.Context, params *DisableMacieInput, op addawsRestjson1_serdeOpDisableMacieMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_DisableOrganizationAdminAccount.go b/service/macie2/api_op_DisableOrganizationAdminAccount.go index b860cb85e46..1e31fbeb01e 100644 --- a/service/macie2/api_op_DisableOrganizationAdminAccount.go +++ b/service/macie2/api_op_DisableOrganizationAdminAccount.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisableOrganizationAdminAccount(ctx context.Context, params *Di addawsRestjson1_serdeOpDisableOrganizationAdminAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_DisassociateFromMasterAccount.go b/service/macie2/api_op_DisassociateFromMasterAccount.go index 22882fde584..22bda5c9095 100644 --- a/service/macie2/api_op_DisassociateFromMasterAccount.go +++ b/service/macie2/api_op_DisassociateFromMasterAccount.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisassociateFromMasterAccount(ctx context.Context, params *Disa addawsRestjson1_serdeOpDisassociateFromMasterAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_DisassociateMember.go b/service/macie2/api_op_DisassociateMember.go index 2955df91ead..660284ab55a 100644 --- a/service/macie2/api_op_DisassociateMember.go +++ b/service/macie2/api_op_DisassociateMember.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisassociateMember(ctx context.Context, params *DisassociateMem addawsRestjson1_serdeOpDisassociateMemberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_EnableMacie.go b/service/macie2/api_op_EnableMacie.go index f56e6c973b5..0c6d8cb4334 100644 --- a/service/macie2/api_op_EnableMacie.go +++ b/service/macie2/api_op_EnableMacie.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) EnableMacie(ctx context.Context, params *EnableMacieInput, optF addawsRestjson1_serdeOpEnableMacieMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_EnableOrganizationAdminAccount.go b/service/macie2/api_op_EnableOrganizationAdminAccount.go index 233ccccac9c..d6a3c31c98e 100644 --- a/service/macie2/api_op_EnableOrganizationAdminAccount.go +++ b/service/macie2/api_op_EnableOrganizationAdminAccount.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) EnableOrganizationAdminAccount(ctx context.Context, params *Ena addawsRestjson1_serdeOpEnableOrganizationAdminAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_GetBucketStatistics.go b/service/macie2/api_op_GetBucketStatistics.go index f3e611201ab..7efe056a2cb 100644 --- a/service/macie2/api_op_GetBucketStatistics.go +++ b/service/macie2/api_op_GetBucketStatistics.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetBucketStatistics(ctx context.Context, params *GetBucketStati addawsRestjson1_serdeOpGetBucketStatisticsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_GetClassificationExportConfiguration.go b/service/macie2/api_op_GetClassificationExportConfiguration.go index 0119b7e9646..457561d2892 100644 --- a/service/macie2/api_op_GetClassificationExportConfiguration.go +++ b/service/macie2/api_op_GetClassificationExportConfiguration.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetClassificationExportConfiguration(ctx context.Context, param addawsRestjson1_serdeOpGetClassificationExportConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_GetCustomDataIdentifier.go b/service/macie2/api_op_GetCustomDataIdentifier.go index 9ef3d043a71..69430cfbb78 100644 --- a/service/macie2/api_op_GetCustomDataIdentifier.go +++ b/service/macie2/api_op_GetCustomDataIdentifier.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) GetCustomDataIdentifier(ctx context.Context, params *GetCustomD addawsRestjson1_serdeOpGetCustomDataIdentifierMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_GetFindingStatistics.go b/service/macie2/api_op_GetFindingStatistics.go index a6e81f9ac25..6f3cf604b8c 100644 --- a/service/macie2/api_op_GetFindingStatistics.go +++ b/service/macie2/api_op_GetFindingStatistics.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetFindingStatistics(ctx context.Context, params *GetFindingSta addawsRestjson1_serdeOpGetFindingStatisticsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_GetFindings.go b/service/macie2/api_op_GetFindings.go index a7a5f1cc7fc..707a7245fab 100644 --- a/service/macie2/api_op_GetFindings.go +++ b/service/macie2/api_op_GetFindings.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetFindings(ctx context.Context, params *GetFindingsInput, optF addawsRestjson1_serdeOpGetFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_GetFindingsFilter.go b/service/macie2/api_op_GetFindingsFilter.go index cc395751d1b..d3a32a8f40b 100644 --- a/service/macie2/api_op_GetFindingsFilter.go +++ b/service/macie2/api_op_GetFindingsFilter.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetFindingsFilter(ctx context.Context, params *GetFindingsFilte addawsRestjson1_serdeOpGetFindingsFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_GetInvitationsCount.go b/service/macie2/api_op_GetInvitationsCount.go index b38b305a700..9b493705731 100644 --- a/service/macie2/api_op_GetInvitationsCount.go +++ b/service/macie2/api_op_GetInvitationsCount.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetInvitationsCount(ctx context.Context, params *GetInvitations addawsRestjson1_serdeOpGetInvitationsCountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_GetMacieSession.go b/service/macie2/api_op_GetMacieSession.go index 7c8aca82153..c872f7ef87d 100644 --- a/service/macie2/api_op_GetMacieSession.go +++ b/service/macie2/api_op_GetMacieSession.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetMacieSession(ctx context.Context, params *GetMacieSessionInp addawsRestjson1_serdeOpGetMacieSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_GetMasterAccount.go b/service/macie2/api_op_GetMasterAccount.go index b9fc2898583..a1869ff3126 100644 --- a/service/macie2/api_op_GetMasterAccount.go +++ b/service/macie2/api_op_GetMasterAccount.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetMasterAccount(ctx context.Context, params *GetMasterAccountI addawsRestjson1_serdeOpGetMasterAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_GetMember.go b/service/macie2/api_op_GetMember.go index ec4b22eba96..b1bf5c66d82 100644 --- a/service/macie2/api_op_GetMember.go +++ b/service/macie2/api_op_GetMember.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetMember(ctx context.Context, params *GetMemberInput, optFns . addawsRestjson1_serdeOpGetMemberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_GetUsageStatistics.go b/service/macie2/api_op_GetUsageStatistics.go index 9260aa24f8c..ef76f5bfc79 100644 --- a/service/macie2/api_op_GetUsageStatistics.go +++ b/service/macie2/api_op_GetUsageStatistics.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetUsageStatistics(ctx context.Context, params *GetUsageStatist addawsRestjson1_serdeOpGetUsageStatisticsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_GetUsageTotals.go b/service/macie2/api_op_GetUsageTotals.go index 6b5d9e5d902..96fc3aa64dd 100644 --- a/service/macie2/api_op_GetUsageTotals.go +++ b/service/macie2/api_op_GetUsageTotals.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetUsageTotals(ctx context.Context, params *GetUsageTotalsInput addawsRestjson1_serdeOpGetUsageTotalsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_ListClassificationJobs.go b/service/macie2/api_op_ListClassificationJobs.go index 1d16fef4c53..050a7d924d9 100644 --- a/service/macie2/api_op_ListClassificationJobs.go +++ b/service/macie2/api_op_ListClassificationJobs.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListClassificationJobs(ctx context.Context, params *ListClassif addawsRestjson1_serdeOpListClassificationJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_ListCustomDataIdentifiers.go b/service/macie2/api_op_ListCustomDataIdentifiers.go index 077c3fab465..16285f72efb 100644 --- a/service/macie2/api_op_ListCustomDataIdentifiers.go +++ b/service/macie2/api_op_ListCustomDataIdentifiers.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListCustomDataIdentifiers(ctx context.Context, params *ListCust addawsRestjson1_serdeOpListCustomDataIdentifiersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_ListFindings.go b/service/macie2/api_op_ListFindings.go index d5a96b442da..9c7905fa97b 100644 --- a/service/macie2/api_op_ListFindings.go +++ b/service/macie2/api_op_ListFindings.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListFindings(ctx context.Context, params *ListFindingsInput, op addawsRestjson1_serdeOpListFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_ListFindingsFilters.go b/service/macie2/api_op_ListFindingsFilters.go index b49d5337d65..3af9e124842 100644 --- a/service/macie2/api_op_ListFindingsFilters.go +++ b/service/macie2/api_op_ListFindingsFilters.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListFindingsFilters(ctx context.Context, params *ListFindingsFi addawsRestjson1_serdeOpListFindingsFiltersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_ListInvitations.go b/service/macie2/api_op_ListInvitations.go index 2eeca7ae4ab..f3d79adcc9c 100644 --- a/service/macie2/api_op_ListInvitations.go +++ b/service/macie2/api_op_ListInvitations.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListInvitations(ctx context.Context, params *ListInvitationsInp addawsRestjson1_serdeOpListInvitationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_ListMembers.go b/service/macie2/api_op_ListMembers.go index f42fe720f78..6505f655b25 100644 --- a/service/macie2/api_op_ListMembers.go +++ b/service/macie2/api_op_ListMembers.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListMembers(ctx context.Context, params *ListMembersInput, optF addawsRestjson1_serdeOpListMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_ListOrganizationAdminAccounts.go b/service/macie2/api_op_ListOrganizationAdminAccounts.go index 969951d43e2..d75c4e5fa70 100644 --- a/service/macie2/api_op_ListOrganizationAdminAccounts.go +++ b/service/macie2/api_op_ListOrganizationAdminAccounts.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListOrganizationAdminAccounts(ctx context.Context, params *List addawsRestjson1_serdeOpListOrganizationAdminAccountsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_ListTagsForResource.go b/service/macie2/api_op_ListTagsForResource.go index 20807cdc3a4..4ed92579f4f 100644 --- a/service/macie2/api_op_ListTagsForResource.go +++ b/service/macie2/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_PutClassificationExportConfiguration.go b/service/macie2/api_op_PutClassificationExportConfiguration.go index 1982e17ad8e..d12579f85d5 100644 --- a/service/macie2/api_op_PutClassificationExportConfiguration.go +++ b/service/macie2/api_op_PutClassificationExportConfiguration.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutClassificationExportConfiguration(ctx context.Context, param addawsRestjson1_serdeOpPutClassificationExportConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_TagResource.go b/service/macie2/api_op_TagResource.go index 430952a06e5..7810e988aaa 100644 --- a/service/macie2/api_op_TagResource.go +++ b/service/macie2/api_op_TagResource.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_TestCustomDataIdentifier.go b/service/macie2/api_op_TestCustomDataIdentifier.go index 71ddac91782..90b1b6782e0 100644 --- a/service/macie2/api_op_TestCustomDataIdentifier.go +++ b/service/macie2/api_op_TestCustomDataIdentifier.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TestCustomDataIdentifier(ctx context.Context, params *TestCusto addawsRestjson1_serdeOpTestCustomDataIdentifierMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_UntagResource.go b/service/macie2/api_op_UntagResource.go index 8dc72d1ceed..d14e033a813 100644 --- a/service/macie2/api_op_UntagResource.go +++ b/service/macie2/api_op_UntagResource.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_UpdateClassificationJob.go b/service/macie2/api_op_UpdateClassificationJob.go index 9fb6d91d1c5..3215137a125 100644 --- a/service/macie2/api_op_UpdateClassificationJob.go +++ b/service/macie2/api_op_UpdateClassificationJob.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateClassificationJob(ctx context.Context, params *UpdateClas addawsRestjson1_serdeOpUpdateClassificationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_UpdateFindingsFilter.go b/service/macie2/api_op_UpdateFindingsFilter.go index 244f14625c9..2e8bbe786b1 100644 --- a/service/macie2/api_op_UpdateFindingsFilter.go +++ b/service/macie2/api_op_UpdateFindingsFilter.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateFindingsFilter(ctx context.Context, params *UpdateFinding addawsRestjson1_serdeOpUpdateFindingsFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_UpdateMacieSession.go b/service/macie2/api_op_UpdateMacieSession.go index 89ca52dbcab..0ead01d367d 100644 --- a/service/macie2/api_op_UpdateMacieSession.go +++ b/service/macie2/api_op_UpdateMacieSession.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateMacieSession(ctx context.Context, params *UpdateMacieSess addawsRestjson1_serdeOpUpdateMacieSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_UpdateMemberSession.go b/service/macie2/api_op_UpdateMemberSession.go index b44b6957c66..0477a81dd54 100644 --- a/service/macie2/api_op_UpdateMemberSession.go +++ b/service/macie2/api_op_UpdateMemberSession.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/macie2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateMemberSession(ctx context.Context, params *UpdateMemberSe addawsRestjson1_serdeOpUpdateMemberSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/api_op_UpdateOrganizationConfiguration.go b/service/macie2/api_op_UpdateOrganizationConfiguration.go index 0294f53b9ae..20792a44564 100644 --- a/service/macie2/api_op_UpdateOrganizationConfiguration.go +++ b/service/macie2/api_op_UpdateOrganizationConfiguration.go @@ -5,7 +5,6 @@ package macie2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateOrganizationConfiguration(ctx context.Context, params *Up addawsRestjson1_serdeOpUpdateOrganizationConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/macie2/endpoints.go b/service/macie2/endpoints.go index 056f9717a19..4811b25d65c 100644 --- a/service/macie2/endpoints.go +++ b/service/macie2/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/managedblockchain/api_client.go b/service/managedblockchain/api_client.go index ca5dd2cff66..88e863fff99 100644 --- a/service/managedblockchain/api_client.go +++ b/service/managedblockchain/api_client.go @@ -90,34 +90,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -190,6 +162,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/managedblockchain/api_op_CreateMember.go b/service/managedblockchain/api_op_CreateMember.go index 83989ca3b53..7ce90cc397d 100644 --- a/service/managedblockchain/api_op_CreateMember.go +++ b/service/managedblockchain/api_op_CreateMember.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/managedblockchain/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateMember(ctx context.Context, params *CreateMemberInput, op addawsRestjson1_serdeOpCreateMemberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_CreateNetwork.go b/service/managedblockchain/api_op_CreateNetwork.go index 50c5ed6f7b1..70cd2332ead 100644 --- a/service/managedblockchain/api_op_CreateNetwork.go +++ b/service/managedblockchain/api_op_CreateNetwork.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/managedblockchain/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateNetwork(ctx context.Context, params *CreateNetworkInput, addawsRestjson1_serdeOpCreateNetworkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_CreateNode.go b/service/managedblockchain/api_op_CreateNode.go index 12bfbdbde71..103949f886c 100644 --- a/service/managedblockchain/api_op_CreateNode.go +++ b/service/managedblockchain/api_op_CreateNode.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/managedblockchain/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateNode(ctx context.Context, params *CreateNodeInput, optFns addawsRestjson1_serdeOpCreateNodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_CreateProposal.go b/service/managedblockchain/api_op_CreateProposal.go index 0a663501182..7915c5ecf1a 100644 --- a/service/managedblockchain/api_op_CreateProposal.go +++ b/service/managedblockchain/api_op_CreateProposal.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/managedblockchain/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateProposal(ctx context.Context, params *CreateProposalInput addawsRestjson1_serdeOpCreateProposalMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_DeleteMember.go b/service/managedblockchain/api_op_DeleteMember.go index 4370bcfe59a..5a9559949cb 100644 --- a/service/managedblockchain/api_op_DeleteMember.go +++ b/service/managedblockchain/api_op_DeleteMember.go @@ -5,7 +5,6 @@ package managedblockchain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeleteMember(ctx context.Context, params *DeleteMemberInput, op addawsRestjson1_serdeOpDeleteMemberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_DeleteNode.go b/service/managedblockchain/api_op_DeleteNode.go index 67ee27842f2..aa24ef593c8 100644 --- a/service/managedblockchain/api_op_DeleteNode.go +++ b/service/managedblockchain/api_op_DeleteNode.go @@ -5,7 +5,6 @@ package managedblockchain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteNode(ctx context.Context, params *DeleteNodeInput, optFns addawsRestjson1_serdeOpDeleteNodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_GetMember.go b/service/managedblockchain/api_op_GetMember.go index d38fbcbb679..4db5ac65410 100644 --- a/service/managedblockchain/api_op_GetMember.go +++ b/service/managedblockchain/api_op_GetMember.go @@ -5,7 +5,6 @@ package managedblockchain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/managedblockchain/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetMember(ctx context.Context, params *GetMemberInput, optFns . addawsRestjson1_serdeOpGetMemberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_GetNetwork.go b/service/managedblockchain/api_op_GetNetwork.go index 6a301f34ec5..49036fc2020 100644 --- a/service/managedblockchain/api_op_GetNetwork.go +++ b/service/managedblockchain/api_op_GetNetwork.go @@ -5,7 +5,6 @@ package managedblockchain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/managedblockchain/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetNetwork(ctx context.Context, params *GetNetworkInput, optFns addawsRestjson1_serdeOpGetNetworkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_GetNode.go b/service/managedblockchain/api_op_GetNode.go index ad5be325a12..b982573ee95 100644 --- a/service/managedblockchain/api_op_GetNode.go +++ b/service/managedblockchain/api_op_GetNode.go @@ -5,7 +5,6 @@ package managedblockchain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/managedblockchain/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetNode(ctx context.Context, params *GetNodeInput, optFns ...fu addawsRestjson1_serdeOpGetNodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_GetProposal.go b/service/managedblockchain/api_op_GetProposal.go index ae0174356de..8bdf7b080b8 100644 --- a/service/managedblockchain/api_op_GetProposal.go +++ b/service/managedblockchain/api_op_GetProposal.go @@ -5,7 +5,6 @@ package managedblockchain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/managedblockchain/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetProposal(ctx context.Context, params *GetProposalInput, optF addawsRestjson1_serdeOpGetProposalMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_ListInvitations.go b/service/managedblockchain/api_op_ListInvitations.go index dd45d182fe7..9f20a5bdf70 100644 --- a/service/managedblockchain/api_op_ListInvitations.go +++ b/service/managedblockchain/api_op_ListInvitations.go @@ -5,7 +5,6 @@ package managedblockchain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/managedblockchain/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListInvitations(ctx context.Context, params *ListInvitationsInp addawsRestjson1_serdeOpListInvitationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_ListMembers.go b/service/managedblockchain/api_op_ListMembers.go index e08c7193e2b..5b0942d788c 100644 --- a/service/managedblockchain/api_op_ListMembers.go +++ b/service/managedblockchain/api_op_ListMembers.go @@ -5,7 +5,6 @@ package managedblockchain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/managedblockchain/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListMembers(ctx context.Context, params *ListMembersInput, optF addawsRestjson1_serdeOpListMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_ListNetworks.go b/service/managedblockchain/api_op_ListNetworks.go index d0a8ca1919e..202b2cff004 100644 --- a/service/managedblockchain/api_op_ListNetworks.go +++ b/service/managedblockchain/api_op_ListNetworks.go @@ -5,7 +5,6 @@ package managedblockchain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/managedblockchain/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListNetworks(ctx context.Context, params *ListNetworksInput, op addawsRestjson1_serdeOpListNetworksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_ListNodes.go b/service/managedblockchain/api_op_ListNodes.go index 723a57d9b18..61337c0623e 100644 --- a/service/managedblockchain/api_op_ListNodes.go +++ b/service/managedblockchain/api_op_ListNodes.go @@ -5,7 +5,6 @@ package managedblockchain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/managedblockchain/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListNodes(ctx context.Context, params *ListNodesInput, optFns . addawsRestjson1_serdeOpListNodesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_ListProposalVotes.go b/service/managedblockchain/api_op_ListProposalVotes.go index fae732da4e4..27c101aa130 100644 --- a/service/managedblockchain/api_op_ListProposalVotes.go +++ b/service/managedblockchain/api_op_ListProposalVotes.go @@ -5,7 +5,6 @@ package managedblockchain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/managedblockchain/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListProposalVotes(ctx context.Context, params *ListProposalVote addawsRestjson1_serdeOpListProposalVotesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_ListProposals.go b/service/managedblockchain/api_op_ListProposals.go index 17061ae678e..ee4d8e8e205 100644 --- a/service/managedblockchain/api_op_ListProposals.go +++ b/service/managedblockchain/api_op_ListProposals.go @@ -5,7 +5,6 @@ package managedblockchain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/managedblockchain/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListProposals(ctx context.Context, params *ListProposalsInput, addawsRestjson1_serdeOpListProposalsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_RejectInvitation.go b/service/managedblockchain/api_op_RejectInvitation.go index b2d1a29381e..d3ee381eab1 100644 --- a/service/managedblockchain/api_op_RejectInvitation.go +++ b/service/managedblockchain/api_op_RejectInvitation.go @@ -5,7 +5,6 @@ package managedblockchain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) RejectInvitation(ctx context.Context, params *RejectInvitationI addawsRestjson1_serdeOpRejectInvitationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_UpdateMember.go b/service/managedblockchain/api_op_UpdateMember.go index b597957b712..4870bfcad17 100644 --- a/service/managedblockchain/api_op_UpdateMember.go +++ b/service/managedblockchain/api_op_UpdateMember.go @@ -5,7 +5,6 @@ package managedblockchain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/managedblockchain/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateMember(ctx context.Context, params *UpdateMemberInput, op addawsRestjson1_serdeOpUpdateMemberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_UpdateNode.go b/service/managedblockchain/api_op_UpdateNode.go index a50fb282370..a6c31135837 100644 --- a/service/managedblockchain/api_op_UpdateNode.go +++ b/service/managedblockchain/api_op_UpdateNode.go @@ -5,7 +5,6 @@ package managedblockchain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/managedblockchain/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateNode(ctx context.Context, params *UpdateNodeInput, optFns addawsRestjson1_serdeOpUpdateNodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/api_op_VoteOnProposal.go b/service/managedblockchain/api_op_VoteOnProposal.go index 472bd5371ff..04b70cd495e 100644 --- a/service/managedblockchain/api_op_VoteOnProposal.go +++ b/service/managedblockchain/api_op_VoteOnProposal.go @@ -5,7 +5,6 @@ package managedblockchain import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/managedblockchain/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) VoteOnProposal(ctx context.Context, params *VoteOnProposalInput addawsRestjson1_serdeOpVoteOnProposalMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/managedblockchain/endpoints.go b/service/managedblockchain/endpoints.go index 4df16dc9713..64544774561 100644 --- a/service/managedblockchain/endpoints.go +++ b/service/managedblockchain/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/marketplacecatalog/api_client.go b/service/marketplacecatalog/api_client.go index 1c5be3cabd4..377b9d40ae6 100644 --- a/service/marketplacecatalog/api_client.go +++ b/service/marketplacecatalog/api_client.go @@ -82,30 +82,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -171,6 +147,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/marketplacecatalog/api_op_CancelChangeSet.go b/service/marketplacecatalog/api_op_CancelChangeSet.go index d1172c6b58d..57412309fe4 100644 --- a/service/marketplacecatalog/api_op_CancelChangeSet.go +++ b/service/marketplacecatalog/api_op_CancelChangeSet.go @@ -5,7 +5,6 @@ package marketplacecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) CancelChangeSet(ctx context.Context, params *CancelChangeSetInp addawsRestjson1_serdeOpCancelChangeSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/marketplacecatalog/api_op_DescribeChangeSet.go b/service/marketplacecatalog/api_op_DescribeChangeSet.go index 1b5d736eda7..0d1de9535f4 100644 --- a/service/marketplacecatalog/api_op_DescribeChangeSet.go +++ b/service/marketplacecatalog/api_op_DescribeChangeSet.go @@ -5,7 +5,6 @@ package marketplacecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/marketplacecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeChangeSet(ctx context.Context, params *DescribeChangeSe addawsRestjson1_serdeOpDescribeChangeSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/marketplacecatalog/api_op_DescribeEntity.go b/service/marketplacecatalog/api_op_DescribeEntity.go index ef41d50cede..69bd081b9da 100644 --- a/service/marketplacecatalog/api_op_DescribeEntity.go +++ b/service/marketplacecatalog/api_op_DescribeEntity.go @@ -5,7 +5,6 @@ package marketplacecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DescribeEntity(ctx context.Context, params *DescribeEntityInput addawsRestjson1_serdeOpDescribeEntityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/marketplacecatalog/api_op_ListChangeSets.go b/service/marketplacecatalog/api_op_ListChangeSets.go index ce52e57ca83..9b1b5e21993 100644 --- a/service/marketplacecatalog/api_op_ListChangeSets.go +++ b/service/marketplacecatalog/api_op_ListChangeSets.go @@ -5,7 +5,6 @@ package marketplacecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/marketplacecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListChangeSets(ctx context.Context, params *ListChangeSetsInput addawsRestjson1_serdeOpListChangeSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/marketplacecatalog/api_op_ListEntities.go b/service/marketplacecatalog/api_op_ListEntities.go index 2c233d07d44..e83def2a821 100644 --- a/service/marketplacecatalog/api_op_ListEntities.go +++ b/service/marketplacecatalog/api_op_ListEntities.go @@ -5,7 +5,6 @@ package marketplacecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/marketplacecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListEntities(ctx context.Context, params *ListEntitiesInput, op addawsRestjson1_serdeOpListEntitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/marketplacecatalog/api_op_StartChangeSet.go b/service/marketplacecatalog/api_op_StartChangeSet.go index bbeea68ff83..9ca0d4b738e 100644 --- a/service/marketplacecatalog/api_op_StartChangeSet.go +++ b/service/marketplacecatalog/api_op_StartChangeSet.go @@ -5,7 +5,6 @@ package marketplacecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/marketplacecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) StartChangeSet(ctx context.Context, params *StartChangeSetInput addawsRestjson1_serdeOpStartChangeSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/marketplacecatalog/endpoints.go b/service/marketplacecatalog/endpoints.go index 6b6d5d2b2ce..3e98c59d89e 100644 --- a/service/marketplacecatalog/endpoints.go +++ b/service/marketplacecatalog/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/marketplacecommerceanalytics/api_client.go b/service/marketplacecommerceanalytics/api_client.go index 6f0136c1df5..aff83ec1438 100644 --- a/service/marketplacecommerceanalytics/api_client.go +++ b/service/marketplacecommerceanalytics/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/marketplacecommerceanalytics/api_op_GenerateDataSet.go b/service/marketplacecommerceanalytics/api_op_GenerateDataSet.go index aedb0118779..6ed55e549dc 100644 --- a/service/marketplacecommerceanalytics/api_op_GenerateDataSet.go +++ b/service/marketplacecommerceanalytics/api_op_GenerateDataSet.go @@ -5,7 +5,6 @@ package marketplacecommerceanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/marketplacecommerceanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) GenerateDataSet(ctx context.Context, params *GenerateDataSetInp addawsAwsjson11_serdeOpGenerateDataSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/marketplacecommerceanalytics/api_op_StartSupportDataExport.go b/service/marketplacecommerceanalytics/api_op_StartSupportDataExport.go index 226d0ff25f3..82bc3ee4721 100644 --- a/service/marketplacecommerceanalytics/api_op_StartSupportDataExport.go +++ b/service/marketplacecommerceanalytics/api_op_StartSupportDataExport.go @@ -5,7 +5,6 @@ package marketplacecommerceanalytics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/marketplacecommerceanalytics/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) StartSupportDataExport(ctx context.Context, params *StartSuppor addawsAwsjson11_serdeOpStartSupportDataExportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/marketplacecommerceanalytics/endpoints.go b/service/marketplacecommerceanalytics/endpoints.go index 6c89a4e3977..41781288966 100644 --- a/service/marketplacecommerceanalytics/endpoints.go +++ b/service/marketplacecommerceanalytics/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/marketplaceentitlementservice/api_client.go b/service/marketplaceentitlementservice/api_client.go index 6bf95b46e32..b6caee476c9 100644 --- a/service/marketplaceentitlementservice/api_client.go +++ b/service/marketplaceentitlementservice/api_client.go @@ -85,30 +85,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -174,6 +150,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/marketplaceentitlementservice/api_op_GetEntitlements.go b/service/marketplaceentitlementservice/api_op_GetEntitlements.go index f94f5769b10..7f2f6a35dca 100644 --- a/service/marketplaceentitlementservice/api_op_GetEntitlements.go +++ b/service/marketplaceentitlementservice/api_op_GetEntitlements.go @@ -5,7 +5,6 @@ package marketplaceentitlementservice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/marketplaceentitlementservice/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetEntitlements(ctx context.Context, params *GetEntitlementsInp addawsAwsjson11_serdeOpGetEntitlementsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/marketplaceentitlementservice/endpoints.go b/service/marketplaceentitlementservice/endpoints.go index 961a6a027d8..d9b5d785550 100644 --- a/service/marketplaceentitlementservice/endpoints.go +++ b/service/marketplaceentitlementservice/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/marketplacemetering/api_client.go b/service/marketplacemetering/api_client.go index 313164459e0..29c101ec11a 100644 --- a/service/marketplacemetering/api_client.go +++ b/service/marketplacemetering/api_client.go @@ -119,30 +119,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -208,6 +184,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/marketplacemetering/api_op_BatchMeterUsage.go b/service/marketplacemetering/api_op_BatchMeterUsage.go index c6f42d83530..5dfb801b2af 100644 --- a/service/marketplacemetering/api_op_BatchMeterUsage.go +++ b/service/marketplacemetering/api_op_BatchMeterUsage.go @@ -5,7 +5,6 @@ package marketplacemetering import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/marketplacemetering/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) BatchMeterUsage(ctx context.Context, params *BatchMeterUsageInp addawsAwsjson11_serdeOpBatchMeterUsageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/marketplacemetering/api_op_MeterUsage.go b/service/marketplacemetering/api_op_MeterUsage.go index 139d04203dc..b6a832146a3 100644 --- a/service/marketplacemetering/api_op_MeterUsage.go +++ b/service/marketplacemetering/api_op_MeterUsage.go @@ -5,7 +5,6 @@ package marketplacemetering import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) MeterUsage(ctx context.Context, params *MeterUsageInput, optFns addawsAwsjson11_serdeOpMeterUsageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/marketplacemetering/api_op_RegisterUsage.go b/service/marketplacemetering/api_op_RegisterUsage.go index b0ed8ec0826..907a34f09c6 100644 --- a/service/marketplacemetering/api_op_RegisterUsage.go +++ b/service/marketplacemetering/api_op_RegisterUsage.go @@ -5,7 +5,6 @@ package marketplacemetering import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -51,9 +50,9 @@ func (c *Client) RegisterUsage(ctx context.Context, params *RegisterUsageInput, addawsAwsjson11_serdeOpRegisterUsageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/marketplacemetering/api_op_ResolveCustomer.go b/service/marketplacemetering/api_op_ResolveCustomer.go index 3d82cd89115..eed2d38831e 100644 --- a/service/marketplacemetering/api_op_ResolveCustomer.go +++ b/service/marketplacemetering/api_op_ResolveCustomer.go @@ -5,7 +5,6 @@ package marketplacemetering import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) ResolveCustomer(ctx context.Context, params *ResolveCustomerInp addawsAwsjson11_serdeOpResolveCustomerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/marketplacemetering/endpoints.go b/service/marketplacemetering/endpoints.go index 2d942688f51..91c356768ab 100644 --- a/service/marketplacemetering/endpoints.go +++ b/service/marketplacemetering/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/mediaconnect/api_client.go b/service/mediaconnect/api_client.go index ee4b622d032..0fa63a5b071 100644 --- a/service/mediaconnect/api_client.go +++ b/service/mediaconnect/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/mediaconnect/api_op_AddFlowOutputs.go b/service/mediaconnect/api_op_AddFlowOutputs.go index ae88a6e2bd2..be2e3c69065 100644 --- a/service/mediaconnect/api_op_AddFlowOutputs.go +++ b/service/mediaconnect/api_op_AddFlowOutputs.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconnect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) AddFlowOutputs(ctx context.Context, params *AddFlowOutputsInput addawsRestjson1_serdeOpAddFlowOutputsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_AddFlowSources.go b/service/mediaconnect/api_op_AddFlowSources.go index 4c586f814b1..3d2a5008fb8 100644 --- a/service/mediaconnect/api_op_AddFlowSources.go +++ b/service/mediaconnect/api_op_AddFlowSources.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconnect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) AddFlowSources(ctx context.Context, params *AddFlowSourcesInput addawsRestjson1_serdeOpAddFlowSourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_AddFlowVpcInterfaces.go b/service/mediaconnect/api_op_AddFlowVpcInterfaces.go index d12334e5f90..d95d2f681c2 100644 --- a/service/mediaconnect/api_op_AddFlowVpcInterfaces.go +++ b/service/mediaconnect/api_op_AddFlowVpcInterfaces.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconnect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) AddFlowVpcInterfaces(ctx context.Context, params *AddFlowVpcInt addawsRestjson1_serdeOpAddFlowVpcInterfacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_CreateFlow.go b/service/mediaconnect/api_op_CreateFlow.go index bd28c6e680e..4356335e2ce 100644 --- a/service/mediaconnect/api_op_CreateFlow.go +++ b/service/mediaconnect/api_op_CreateFlow.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconnect/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateFlow(ctx context.Context, params *CreateFlowInput, optFns addawsRestjson1_serdeOpCreateFlowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_DeleteFlow.go b/service/mediaconnect/api_op_DeleteFlow.go index 0f46f0dc121..55c78714f64 100644 --- a/service/mediaconnect/api_op_DeleteFlow.go +++ b/service/mediaconnect/api_op_DeleteFlow.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconnect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteFlow(ctx context.Context, params *DeleteFlowInput, optFns addawsRestjson1_serdeOpDeleteFlowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_DescribeFlow.go b/service/mediaconnect/api_op_DescribeFlow.go index d896e13569e..63c4b11435f 100644 --- a/service/mediaconnect/api_op_DescribeFlow.go +++ b/service/mediaconnect/api_op_DescribeFlow.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconnect/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeFlow(ctx context.Context, params *DescribeFlowInput, op addawsRestjson1_serdeOpDescribeFlowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_GrantFlowEntitlements.go b/service/mediaconnect/api_op_GrantFlowEntitlements.go index 104c60d3181..f089fc07f70 100644 --- a/service/mediaconnect/api_op_GrantFlowEntitlements.go +++ b/service/mediaconnect/api_op_GrantFlowEntitlements.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconnect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GrantFlowEntitlements(ctx context.Context, params *GrantFlowEnt addawsRestjson1_serdeOpGrantFlowEntitlementsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_ListEntitlements.go b/service/mediaconnect/api_op_ListEntitlements.go index ee9c5cc6fa7..703b34cab55 100644 --- a/service/mediaconnect/api_op_ListEntitlements.go +++ b/service/mediaconnect/api_op_ListEntitlements.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconnect/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListEntitlements(ctx context.Context, params *ListEntitlementsI addawsRestjson1_serdeOpListEntitlementsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_ListFlows.go b/service/mediaconnect/api_op_ListFlows.go index 16898a90813..83fb1f31133 100644 --- a/service/mediaconnect/api_op_ListFlows.go +++ b/service/mediaconnect/api_op_ListFlows.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconnect/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListFlows(ctx context.Context, params *ListFlowsInput, optFns . addawsRestjson1_serdeOpListFlowsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_ListTagsForResource.go b/service/mediaconnect/api_op_ListTagsForResource.go index 927ff466b28..b462427b46f 100644 --- a/service/mediaconnect/api_op_ListTagsForResource.go +++ b/service/mediaconnect/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_RemoveFlowOutput.go b/service/mediaconnect/api_op_RemoveFlowOutput.go index d2e5dd8d0d6..b0010ea2fb1 100644 --- a/service/mediaconnect/api_op_RemoveFlowOutput.go +++ b/service/mediaconnect/api_op_RemoveFlowOutput.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) RemoveFlowOutput(ctx context.Context, params *RemoveFlowOutputI addawsRestjson1_serdeOpRemoveFlowOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_RemoveFlowSource.go b/service/mediaconnect/api_op_RemoveFlowSource.go index 0139c105e3b..a86ae3867c2 100644 --- a/service/mediaconnect/api_op_RemoveFlowSource.go +++ b/service/mediaconnect/api_op_RemoveFlowSource.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) RemoveFlowSource(ctx context.Context, params *RemoveFlowSourceI addawsRestjson1_serdeOpRemoveFlowSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_RemoveFlowVpcInterface.go b/service/mediaconnect/api_op_RemoveFlowVpcInterface.go index 1e6e04ced4c..f4b5703bda3 100644 --- a/service/mediaconnect/api_op_RemoveFlowVpcInterface.go +++ b/service/mediaconnect/api_op_RemoveFlowVpcInterface.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) RemoveFlowVpcInterface(ctx context.Context, params *RemoveFlowV addawsRestjson1_serdeOpRemoveFlowVpcInterfaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_RevokeFlowEntitlement.go b/service/mediaconnect/api_op_RevokeFlowEntitlement.go index 16a876ef832..76ef1a6acc3 100644 --- a/service/mediaconnect/api_op_RevokeFlowEntitlement.go +++ b/service/mediaconnect/api_op_RevokeFlowEntitlement.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) RevokeFlowEntitlement(ctx context.Context, params *RevokeFlowEn addawsRestjson1_serdeOpRevokeFlowEntitlementMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_StartFlow.go b/service/mediaconnect/api_op_StartFlow.go index 1c69c765102..4523ab5feab 100644 --- a/service/mediaconnect/api_op_StartFlow.go +++ b/service/mediaconnect/api_op_StartFlow.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconnect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StartFlow(ctx context.Context, params *StartFlowInput, optFns . addawsRestjson1_serdeOpStartFlowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_StopFlow.go b/service/mediaconnect/api_op_StopFlow.go index f2763e93f71..362279bca75 100644 --- a/service/mediaconnect/api_op_StopFlow.go +++ b/service/mediaconnect/api_op_StopFlow.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconnect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StopFlow(ctx context.Context, params *StopFlowInput, optFns ... addawsRestjson1_serdeOpStopFlowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_TagResource.go b/service/mediaconnect/api_op_TagResource.go index a4f6f64036d..601046247a9 100644 --- a/service/mediaconnect/api_op_TagResource.go +++ b/service/mediaconnect/api_op_TagResource.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_UntagResource.go b/service/mediaconnect/api_op_UntagResource.go index 52904206bd0..fa06833b301 100644 --- a/service/mediaconnect/api_op_UntagResource.go +++ b/service/mediaconnect/api_op_UntagResource.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_UpdateFlow.go b/service/mediaconnect/api_op_UpdateFlow.go index 841016800a1..3cca3e17445 100644 --- a/service/mediaconnect/api_op_UpdateFlow.go +++ b/service/mediaconnect/api_op_UpdateFlow.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconnect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateFlow(ctx context.Context, params *UpdateFlowInput, optFns addawsRestjson1_serdeOpUpdateFlowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_UpdateFlowEntitlement.go b/service/mediaconnect/api_op_UpdateFlowEntitlement.go index 1aa9e829edb..ec314f29a3b 100644 --- a/service/mediaconnect/api_op_UpdateFlowEntitlement.go +++ b/service/mediaconnect/api_op_UpdateFlowEntitlement.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconnect/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateFlowEntitlement(ctx context.Context, params *UpdateFlowEn addawsRestjson1_serdeOpUpdateFlowEntitlementMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_UpdateFlowOutput.go b/service/mediaconnect/api_op_UpdateFlowOutput.go index 837886c1735..50639f14472 100644 --- a/service/mediaconnect/api_op_UpdateFlowOutput.go +++ b/service/mediaconnect/api_op_UpdateFlowOutput.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconnect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateFlowOutput(ctx context.Context, params *UpdateFlowOutputI addawsRestjson1_serdeOpUpdateFlowOutputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/api_op_UpdateFlowSource.go b/service/mediaconnect/api_op_UpdateFlowSource.go index 9db8eceabef..53acf962603 100644 --- a/service/mediaconnect/api_op_UpdateFlowSource.go +++ b/service/mediaconnect/api_op_UpdateFlowSource.go @@ -5,7 +5,6 @@ package mediaconnect import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconnect/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateFlowSource(ctx context.Context, params *UpdateFlowSourceI addawsRestjson1_serdeOpUpdateFlowSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconnect/endpoints.go b/service/mediaconnect/endpoints.go index 570fc87c5b4..b0da49f004f 100644 --- a/service/mediaconnect/endpoints.go +++ b/service/mediaconnect/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/mediaconvert/api_client.go b/service/mediaconvert/api_client.go index 142e8f18374..1aa90419248 100644 --- a/service/mediaconvert/api_client.go +++ b/service/mediaconvert/api_client.go @@ -85,34 +85,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -185,6 +157,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/mediaconvert/api_op_AssociateCertificate.go b/service/mediaconvert/api_op_AssociateCertificate.go index a6870a3a05b..0a48b0ab2c5 100644 --- a/service/mediaconvert/api_op_AssociateCertificate.go +++ b/service/mediaconvert/api_op_AssociateCertificate.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AssociateCertificate(ctx context.Context, params *AssociateCert addawsRestjson1_serdeOpAssociateCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_CancelJob.go b/service/mediaconvert/api_op_CancelJob.go index f2eeff75a90..20ff0fd218f 100644 --- a/service/mediaconvert/api_op_CancelJob.go +++ b/service/mediaconvert/api_op_CancelJob.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CancelJob(ctx context.Context, params *CancelJobInput, optFns . addawsRestjson1_serdeOpCancelJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_CreateJob.go b/service/mediaconvert/api_op_CreateJob.go index 20609357233..ca37050bd4a 100644 --- a/service/mediaconvert/api_op_CreateJob.go +++ b/service/mediaconvert/api_op_CreateJob.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconvert/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateJob(ctx context.Context, params *CreateJobInput, optFns . addawsRestjson1_serdeOpCreateJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_CreateJobTemplate.go b/service/mediaconvert/api_op_CreateJobTemplate.go index e5cd6112a40..cb91cd7064f 100644 --- a/service/mediaconvert/api_op_CreateJobTemplate.go +++ b/service/mediaconvert/api_op_CreateJobTemplate.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconvert/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateJobTemplate(ctx context.Context, params *CreateJobTemplat addawsRestjson1_serdeOpCreateJobTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_CreatePreset.go b/service/mediaconvert/api_op_CreatePreset.go index 64d6e688a7a..d6bb33d61a2 100644 --- a/service/mediaconvert/api_op_CreatePreset.go +++ b/service/mediaconvert/api_op_CreatePreset.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconvert/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreatePreset(ctx context.Context, params *CreatePresetInput, op addawsRestjson1_serdeOpCreatePresetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_CreateQueue.go b/service/mediaconvert/api_op_CreateQueue.go index d6dd7f47fd3..6c532b0726b 100644 --- a/service/mediaconvert/api_op_CreateQueue.go +++ b/service/mediaconvert/api_op_CreateQueue.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconvert/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateQueue(ctx context.Context, params *CreateQueueInput, optF addawsRestjson1_serdeOpCreateQueueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_DeleteJobTemplate.go b/service/mediaconvert/api_op_DeleteJobTemplate.go index 18858095981..218f755e88e 100644 --- a/service/mediaconvert/api_op_DeleteJobTemplate.go +++ b/service/mediaconvert/api_op_DeleteJobTemplate.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteJobTemplate(ctx context.Context, params *DeleteJobTemplat addawsRestjson1_serdeOpDeleteJobTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_DeletePreset.go b/service/mediaconvert/api_op_DeletePreset.go index bf71dab4896..568b376b373 100644 --- a/service/mediaconvert/api_op_DeletePreset.go +++ b/service/mediaconvert/api_op_DeletePreset.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeletePreset(ctx context.Context, params *DeletePresetInput, op addawsRestjson1_serdeOpDeletePresetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_DeleteQueue.go b/service/mediaconvert/api_op_DeleteQueue.go index 55331b6478f..97eb1a8642d 100644 --- a/service/mediaconvert/api_op_DeleteQueue.go +++ b/service/mediaconvert/api_op_DeleteQueue.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteQueue(ctx context.Context, params *DeleteQueueInput, optF addawsRestjson1_serdeOpDeleteQueueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_DescribeEndpoints.go b/service/mediaconvert/api_op_DescribeEndpoints.go index 48ba7786ba7..d6434d8e888 100644 --- a/service/mediaconvert/api_op_DescribeEndpoints.go +++ b/service/mediaconvert/api_op_DescribeEndpoints.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconvert/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEndpoints(ctx context.Context, params *DescribeEndpoint addawsRestjson1_serdeOpDescribeEndpointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_DisassociateCertificate.go b/service/mediaconvert/api_op_DisassociateCertificate.go index c582697c116..0ae009be552 100644 --- a/service/mediaconvert/api_op_DisassociateCertificate.go +++ b/service/mediaconvert/api_op_DisassociateCertificate.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DisassociateCertificate(ctx context.Context, params *Disassocia addawsRestjson1_serdeOpDisassociateCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_GetJob.go b/service/mediaconvert/api_op_GetJob.go index 2bdf708c4d6..a2eb7f7ba57 100644 --- a/service/mediaconvert/api_op_GetJob.go +++ b/service/mediaconvert/api_op_GetJob.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconvert/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetJob(ctx context.Context, params *GetJobInput, optFns ...func addawsRestjson1_serdeOpGetJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_GetJobTemplate.go b/service/mediaconvert/api_op_GetJobTemplate.go index 1c3b4a89dbd..d9e0a6d0ef1 100644 --- a/service/mediaconvert/api_op_GetJobTemplate.go +++ b/service/mediaconvert/api_op_GetJobTemplate.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconvert/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetJobTemplate(ctx context.Context, params *GetJobTemplateInput addawsRestjson1_serdeOpGetJobTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_GetPreset.go b/service/mediaconvert/api_op_GetPreset.go index 06e2e4c9c5a..7de44b5441d 100644 --- a/service/mediaconvert/api_op_GetPreset.go +++ b/service/mediaconvert/api_op_GetPreset.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconvert/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetPreset(ctx context.Context, params *GetPresetInput, optFns . addawsRestjson1_serdeOpGetPresetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_GetQueue.go b/service/mediaconvert/api_op_GetQueue.go index 2d2e8e3e42f..d58f520cfce 100644 --- a/service/mediaconvert/api_op_GetQueue.go +++ b/service/mediaconvert/api_op_GetQueue.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconvert/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetQueue(ctx context.Context, params *GetQueueInput, optFns ... addawsRestjson1_serdeOpGetQueueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_ListJobTemplates.go b/service/mediaconvert/api_op_ListJobTemplates.go index 7b26849db81..cdb444299d2 100644 --- a/service/mediaconvert/api_op_ListJobTemplates.go +++ b/service/mediaconvert/api_op_ListJobTemplates.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconvert/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListJobTemplates(ctx context.Context, params *ListJobTemplatesI addawsRestjson1_serdeOpListJobTemplatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_ListJobs.go b/service/mediaconvert/api_op_ListJobs.go index 5e03b230255..1760ec73930 100644 --- a/service/mediaconvert/api_op_ListJobs.go +++ b/service/mediaconvert/api_op_ListJobs.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconvert/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListJobs(ctx context.Context, params *ListJobsInput, optFns ... addawsRestjson1_serdeOpListJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_ListPresets.go b/service/mediaconvert/api_op_ListPresets.go index 54d0fbf938a..8eb0eb5af9c 100644 --- a/service/mediaconvert/api_op_ListPresets.go +++ b/service/mediaconvert/api_op_ListPresets.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconvert/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListPresets(ctx context.Context, params *ListPresetsInput, optF addawsRestjson1_serdeOpListPresetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_ListQueues.go b/service/mediaconvert/api_op_ListQueues.go index 3eec5ccc4ce..4843aae0aa5 100644 --- a/service/mediaconvert/api_op_ListQueues.go +++ b/service/mediaconvert/api_op_ListQueues.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconvert/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListQueues(ctx context.Context, params *ListQueuesInput, optFns addawsRestjson1_serdeOpListQueuesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_ListTagsForResource.go b/service/mediaconvert/api_op_ListTagsForResource.go index c7c066680db..bd72a5f337a 100644 --- a/service/mediaconvert/api_op_ListTagsForResource.go +++ b/service/mediaconvert/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconvert/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_TagResource.go b/service/mediaconvert/api_op_TagResource.go index 84cfd8d973c..5931346358e 100644 --- a/service/mediaconvert/api_op_TagResource.go +++ b/service/mediaconvert/api_op_TagResource.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_UntagResource.go b/service/mediaconvert/api_op_UntagResource.go index b67d9ff7b08..abc1894537d 100644 --- a/service/mediaconvert/api_op_UntagResource.go +++ b/service/mediaconvert/api_op_UntagResource.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_UpdateJobTemplate.go b/service/mediaconvert/api_op_UpdateJobTemplate.go index 6d3b75a27ff..ad437eec552 100644 --- a/service/mediaconvert/api_op_UpdateJobTemplate.go +++ b/service/mediaconvert/api_op_UpdateJobTemplate.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconvert/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateJobTemplate(ctx context.Context, params *UpdateJobTemplat addawsRestjson1_serdeOpUpdateJobTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_UpdatePreset.go b/service/mediaconvert/api_op_UpdatePreset.go index 09a8fdf6c18..b993f285457 100644 --- a/service/mediaconvert/api_op_UpdatePreset.go +++ b/service/mediaconvert/api_op_UpdatePreset.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconvert/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdatePreset(ctx context.Context, params *UpdatePresetInput, op addawsRestjson1_serdeOpUpdatePresetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/api_op_UpdateQueue.go b/service/mediaconvert/api_op_UpdateQueue.go index ebe440fd51a..9ca1ce2f9fb 100644 --- a/service/mediaconvert/api_op_UpdateQueue.go +++ b/service/mediaconvert/api_op_UpdateQueue.go @@ -5,7 +5,6 @@ package mediaconvert import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediaconvert/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateQueue(ctx context.Context, params *UpdateQueueInput, optF addawsRestjson1_serdeOpUpdateQueueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediaconvert/endpoints.go b/service/mediaconvert/endpoints.go index e4e0bd406ec..684a4aa2f2c 100644 --- a/service/mediaconvert/endpoints.go +++ b/service/mediaconvert/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/medialive/api_client.go b/service/medialive/api_client.go index e0ec97d25ca..f71268ddf56 100644 --- a/service/medialive/api_client.go +++ b/service/medialive/api_client.go @@ -85,34 +85,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -185,6 +157,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/medialive/api_op_BatchUpdateSchedule.go b/service/medialive/api_op_BatchUpdateSchedule.go index bcaae9b855f..c151413ba27 100644 --- a/service/medialive/api_op_BatchUpdateSchedule.go +++ b/service/medialive/api_op_BatchUpdateSchedule.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchUpdateSchedule(ctx context.Context, params *BatchUpdateSch addawsRestjson1_serdeOpBatchUpdateScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_CreateChannel.go b/service/medialive/api_op_CreateChannel.go index e78d77eea81..af57230502c 100644 --- a/service/medialive/api_op_CreateChannel.go +++ b/service/medialive/api_op_CreateChannel.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateChannel(ctx context.Context, params *CreateChannelInput, addawsRestjson1_serdeOpCreateChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_CreateInput.go b/service/medialive/api_op_CreateInput.go index a33868fbffe..413d7b1f4c1 100644 --- a/service/medialive/api_op_CreateInput.go +++ b/service/medialive/api_op_CreateInput.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateInput(ctx context.Context, params *CreateInputInput, optF addawsRestjson1_serdeOpCreateInputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_CreateInputSecurityGroup.go b/service/medialive/api_op_CreateInputSecurityGroup.go index aa0943dfd66..cdbc0e58835 100644 --- a/service/medialive/api_op_CreateInputSecurityGroup.go +++ b/service/medialive/api_op_CreateInputSecurityGroup.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateInputSecurityGroup(ctx context.Context, params *CreateInp addawsRestjson1_serdeOpCreateInputSecurityGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_CreateMultiplex.go b/service/medialive/api_op_CreateMultiplex.go index bcf10991896..812ff529a27 100644 --- a/service/medialive/api_op_CreateMultiplex.go +++ b/service/medialive/api_op_CreateMultiplex.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateMultiplex(ctx context.Context, params *CreateMultiplexInp addawsRestjson1_serdeOpCreateMultiplexMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_CreateMultiplexProgram.go b/service/medialive/api_op_CreateMultiplexProgram.go index 99678963f33..4b5fe7bf4f7 100644 --- a/service/medialive/api_op_CreateMultiplexProgram.go +++ b/service/medialive/api_op_CreateMultiplexProgram.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateMultiplexProgram(ctx context.Context, params *CreateMulti addawsRestjson1_serdeOpCreateMultiplexProgramMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_CreateTags.go b/service/medialive/api_op_CreateTags.go index c5a943420ce..6cdd38b4ea0 100644 --- a/service/medialive/api_op_CreateTags.go +++ b/service/medialive/api_op_CreateTags.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateTags(ctx context.Context, params *CreateTagsInput, optFns addawsRestjson1_serdeOpCreateTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_DeleteChannel.go b/service/medialive/api_op_DeleteChannel.go index a3704b20e42..7ad1d1ea29f 100644 --- a/service/medialive/api_op_DeleteChannel.go +++ b/service/medialive/api_op_DeleteChannel.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteChannel(ctx context.Context, params *DeleteChannelInput, addawsRestjson1_serdeOpDeleteChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_DeleteInput.go b/service/medialive/api_op_DeleteInput.go index 62305264b6c..e17f21aefca 100644 --- a/service/medialive/api_op_DeleteInput.go +++ b/service/medialive/api_op_DeleteInput.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteInput(ctx context.Context, params *DeleteInputInput, optF addawsRestjson1_serdeOpDeleteInputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_DeleteInputSecurityGroup.go b/service/medialive/api_op_DeleteInputSecurityGroup.go index cc76bc44b58..b3ec0b58c0b 100644 --- a/service/medialive/api_op_DeleteInputSecurityGroup.go +++ b/service/medialive/api_op_DeleteInputSecurityGroup.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteInputSecurityGroup(ctx context.Context, params *DeleteInp addawsRestjson1_serdeOpDeleteInputSecurityGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_DeleteMultiplex.go b/service/medialive/api_op_DeleteMultiplex.go index a5c65775c5b..541f6bbe8cf 100644 --- a/service/medialive/api_op_DeleteMultiplex.go +++ b/service/medialive/api_op_DeleteMultiplex.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteMultiplex(ctx context.Context, params *DeleteMultiplexInp addawsRestjson1_serdeOpDeleteMultiplexMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_DeleteMultiplexProgram.go b/service/medialive/api_op_DeleteMultiplexProgram.go index 743d4e43aec..e346e76058f 100644 --- a/service/medialive/api_op_DeleteMultiplexProgram.go +++ b/service/medialive/api_op_DeleteMultiplexProgram.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteMultiplexProgram(ctx context.Context, params *DeleteMulti addawsRestjson1_serdeOpDeleteMultiplexProgramMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_DeleteReservation.go b/service/medialive/api_op_DeleteReservation.go index 036903ec177..f7f2f094020 100644 --- a/service/medialive/api_op_DeleteReservation.go +++ b/service/medialive/api_op_DeleteReservation.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteReservation(ctx context.Context, params *DeleteReservatio addawsRestjson1_serdeOpDeleteReservationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_DeleteSchedule.go b/service/medialive/api_op_DeleteSchedule.go index e325b9d36a8..f379a8f336b 100644 --- a/service/medialive/api_op_DeleteSchedule.go +++ b/service/medialive/api_op_DeleteSchedule.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSchedule(ctx context.Context, params *DeleteScheduleInput addawsRestjson1_serdeOpDeleteScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_DeleteTags.go b/service/medialive/api_op_DeleteTags.go index ebca220ebcb..3adfa56f98f 100644 --- a/service/medialive/api_op_DeleteTags.go +++ b/service/medialive/api_op_DeleteTags.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteTags(ctx context.Context, params *DeleteTagsInput, optFns addawsRestjson1_serdeOpDeleteTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_DescribeChannel.go b/service/medialive/api_op_DescribeChannel.go index ff28d28f5f2..736cd42a24c 100644 --- a/service/medialive/api_op_DescribeChannel.go +++ b/service/medialive/api_op_DescribeChannel.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeChannel(ctx context.Context, params *DescribeChannelInp addawsRestjson1_serdeOpDescribeChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_DescribeInput.go b/service/medialive/api_op_DescribeInput.go index fa2dab0cb2e..bb62ca2e1fe 100644 --- a/service/medialive/api_op_DescribeInput.go +++ b/service/medialive/api_op_DescribeInput.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeInput(ctx context.Context, params *DescribeInputInput, addawsRestjson1_serdeOpDescribeInputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_DescribeInputDevice.go b/service/medialive/api_op_DescribeInputDevice.go index 9392148b49e..5279d0f1061 100644 --- a/service/medialive/api_op_DescribeInputDevice.go +++ b/service/medialive/api_op_DescribeInputDevice.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeInputDevice(ctx context.Context, params *DescribeInputD addawsRestjson1_serdeOpDescribeInputDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_DescribeInputDeviceThumbnail.go b/service/medialive/api_op_DescribeInputDeviceThumbnail.go index 321bb63ac8c..4153a6a9a53 100644 --- a/service/medialive/api_op_DescribeInputDeviceThumbnail.go +++ b/service/medialive/api_op_DescribeInputDeviceThumbnail.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeInputDeviceThumbnail(ctx context.Context, params *Descr addawsRestjson1_serdeOpDescribeInputDeviceThumbnailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_DescribeInputSecurityGroup.go b/service/medialive/api_op_DescribeInputSecurityGroup.go index 730752d39a9..13f86f7c953 100644 --- a/service/medialive/api_op_DescribeInputSecurityGroup.go +++ b/service/medialive/api_op_DescribeInputSecurityGroup.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeInputSecurityGroup(ctx context.Context, params *Describ addawsRestjson1_serdeOpDescribeInputSecurityGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_DescribeMultiplex.go b/service/medialive/api_op_DescribeMultiplex.go index 6006a71d7e4..07693bc461e 100644 --- a/service/medialive/api_op_DescribeMultiplex.go +++ b/service/medialive/api_op_DescribeMultiplex.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeMultiplex(ctx context.Context, params *DescribeMultiple addawsRestjson1_serdeOpDescribeMultiplexMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_DescribeMultiplexProgram.go b/service/medialive/api_op_DescribeMultiplexProgram.go index 7a110cdd94a..1e55cfde03c 100644 --- a/service/medialive/api_op_DescribeMultiplexProgram.go +++ b/service/medialive/api_op_DescribeMultiplexProgram.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeMultiplexProgram(ctx context.Context, params *DescribeM addawsRestjson1_serdeOpDescribeMultiplexProgramMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_DescribeOffering.go b/service/medialive/api_op_DescribeOffering.go index bcdfe087d7f..3d29781ebe9 100644 --- a/service/medialive/api_op_DescribeOffering.go +++ b/service/medialive/api_op_DescribeOffering.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeOffering(ctx context.Context, params *DescribeOfferingI addawsRestjson1_serdeOpDescribeOfferingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_DescribeReservation.go b/service/medialive/api_op_DescribeReservation.go index 6df800080bf..c69df6e01fd 100644 --- a/service/medialive/api_op_DescribeReservation.go +++ b/service/medialive/api_op_DescribeReservation.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeReservation(ctx context.Context, params *DescribeReserv addawsRestjson1_serdeOpDescribeReservationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_DescribeSchedule.go b/service/medialive/api_op_DescribeSchedule.go index 40f4161b4c4..083c9f54c94 100644 --- a/service/medialive/api_op_DescribeSchedule.go +++ b/service/medialive/api_op_DescribeSchedule.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeSchedule(ctx context.Context, params *DescribeScheduleI addawsRestjson1_serdeOpDescribeScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_ListChannels.go b/service/medialive/api_op_ListChannels.go index fb133bf6670..1239f4cb92a 100644 --- a/service/medialive/api_op_ListChannels.go +++ b/service/medialive/api_op_ListChannels.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListChannels(ctx context.Context, params *ListChannelsInput, op addawsRestjson1_serdeOpListChannelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_ListInputDevices.go b/service/medialive/api_op_ListInputDevices.go index 91caf826f0e..d365cfdd9e6 100644 --- a/service/medialive/api_op_ListInputDevices.go +++ b/service/medialive/api_op_ListInputDevices.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListInputDevices(ctx context.Context, params *ListInputDevicesI addawsRestjson1_serdeOpListInputDevicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_ListInputSecurityGroups.go b/service/medialive/api_op_ListInputSecurityGroups.go index a9ea2a8f69c..d6faf843277 100644 --- a/service/medialive/api_op_ListInputSecurityGroups.go +++ b/service/medialive/api_op_ListInputSecurityGroups.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListInputSecurityGroups(ctx context.Context, params *ListInputS addawsRestjson1_serdeOpListInputSecurityGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_ListInputs.go b/service/medialive/api_op_ListInputs.go index 7276f78ceed..cd651e95511 100644 --- a/service/medialive/api_op_ListInputs.go +++ b/service/medialive/api_op_ListInputs.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListInputs(ctx context.Context, params *ListInputsInput, optFns addawsRestjson1_serdeOpListInputsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_ListMultiplexPrograms.go b/service/medialive/api_op_ListMultiplexPrograms.go index e3babf01ca2..942bd2848f1 100644 --- a/service/medialive/api_op_ListMultiplexPrograms.go +++ b/service/medialive/api_op_ListMultiplexPrograms.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListMultiplexPrograms(ctx context.Context, params *ListMultiple addawsRestjson1_serdeOpListMultiplexProgramsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_ListMultiplexes.go b/service/medialive/api_op_ListMultiplexes.go index f70efa0c61e..9cef5235e88 100644 --- a/service/medialive/api_op_ListMultiplexes.go +++ b/service/medialive/api_op_ListMultiplexes.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListMultiplexes(ctx context.Context, params *ListMultiplexesInp addawsRestjson1_serdeOpListMultiplexesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_ListOfferings.go b/service/medialive/api_op_ListOfferings.go index b65ee6024d6..6e7b6f4b09e 100644 --- a/service/medialive/api_op_ListOfferings.go +++ b/service/medialive/api_op_ListOfferings.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListOfferings(ctx context.Context, params *ListOfferingsInput, addawsRestjson1_serdeOpListOfferingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_ListReservations.go b/service/medialive/api_op_ListReservations.go index c9fb3a962cd..aeef5aa057b 100644 --- a/service/medialive/api_op_ListReservations.go +++ b/service/medialive/api_op_ListReservations.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListReservations(ctx context.Context, params *ListReservationsI addawsRestjson1_serdeOpListReservationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_ListTagsForResource.go b/service/medialive/api_op_ListTagsForResource.go index a9a5501276c..da3613c1b58 100644 --- a/service/medialive/api_op_ListTagsForResource.go +++ b/service/medialive/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_PurchaseOffering.go b/service/medialive/api_op_PurchaseOffering.go index ccbd7a5c547..3c14084ae35 100644 --- a/service/medialive/api_op_PurchaseOffering.go +++ b/service/medialive/api_op_PurchaseOffering.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PurchaseOffering(ctx context.Context, params *PurchaseOfferingI addawsRestjson1_serdeOpPurchaseOfferingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_StartChannel.go b/service/medialive/api_op_StartChannel.go index a1d918b5252..1437fd6cf7d 100644 --- a/service/medialive/api_op_StartChannel.go +++ b/service/medialive/api_op_StartChannel.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StartChannel(ctx context.Context, params *StartChannelInput, op addawsRestjson1_serdeOpStartChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_StartMultiplex.go b/service/medialive/api_op_StartMultiplex.go index ff9d433194d..bb91fe05243 100644 --- a/service/medialive/api_op_StartMultiplex.go +++ b/service/medialive/api_op_StartMultiplex.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) StartMultiplex(ctx context.Context, params *StartMultiplexInput addawsRestjson1_serdeOpStartMultiplexMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_StopChannel.go b/service/medialive/api_op_StopChannel.go index 2a21ef8a902..160e34dd8a5 100644 --- a/service/medialive/api_op_StopChannel.go +++ b/service/medialive/api_op_StopChannel.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StopChannel(ctx context.Context, params *StopChannelInput, optF addawsRestjson1_serdeOpStopChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_StopMultiplex.go b/service/medialive/api_op_StopMultiplex.go index f3b23ba8563..f3b2fb07345 100644 --- a/service/medialive/api_op_StopMultiplex.go +++ b/service/medialive/api_op_StopMultiplex.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) StopMultiplex(ctx context.Context, params *StopMultiplexInput, addawsRestjson1_serdeOpStopMultiplexMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_UpdateChannel.go b/service/medialive/api_op_UpdateChannel.go index 147494b0802..a53007ae53a 100644 --- a/service/medialive/api_op_UpdateChannel.go +++ b/service/medialive/api_op_UpdateChannel.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateChannel(ctx context.Context, params *UpdateChannelInput, addawsRestjson1_serdeOpUpdateChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_UpdateChannelClass.go b/service/medialive/api_op_UpdateChannelClass.go index 5f047fb99e6..1d308c27374 100644 --- a/service/medialive/api_op_UpdateChannelClass.go +++ b/service/medialive/api_op_UpdateChannelClass.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateChannelClass(ctx context.Context, params *UpdateChannelCl addawsRestjson1_serdeOpUpdateChannelClassMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_UpdateInput.go b/service/medialive/api_op_UpdateInput.go index 2238b606b07..ce5bc07e2dd 100644 --- a/service/medialive/api_op_UpdateInput.go +++ b/service/medialive/api_op_UpdateInput.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateInput(ctx context.Context, params *UpdateInputInput, optF addawsRestjson1_serdeOpUpdateInputMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_UpdateInputDevice.go b/service/medialive/api_op_UpdateInputDevice.go index 4f82cd9a239..89bd32fc67f 100644 --- a/service/medialive/api_op_UpdateInputDevice.go +++ b/service/medialive/api_op_UpdateInputDevice.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateInputDevice(ctx context.Context, params *UpdateInputDevic addawsRestjson1_serdeOpUpdateInputDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_UpdateInputSecurityGroup.go b/service/medialive/api_op_UpdateInputSecurityGroup.go index 2c595235fb0..903d6b2d1cf 100644 --- a/service/medialive/api_op_UpdateInputSecurityGroup.go +++ b/service/medialive/api_op_UpdateInputSecurityGroup.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateInputSecurityGroup(ctx context.Context, params *UpdateInp addawsRestjson1_serdeOpUpdateInputSecurityGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_UpdateMultiplex.go b/service/medialive/api_op_UpdateMultiplex.go index fea2fd64367..76a1239fb5d 100644 --- a/service/medialive/api_op_UpdateMultiplex.go +++ b/service/medialive/api_op_UpdateMultiplex.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateMultiplex(ctx context.Context, params *UpdateMultiplexInp addawsRestjson1_serdeOpUpdateMultiplexMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_UpdateMultiplexProgram.go b/service/medialive/api_op_UpdateMultiplexProgram.go index c2b6b20cfc4..9169e81a310 100644 --- a/service/medialive/api_op_UpdateMultiplexProgram.go +++ b/service/medialive/api_op_UpdateMultiplexProgram.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateMultiplexProgram(ctx context.Context, params *UpdateMulti addawsRestjson1_serdeOpUpdateMultiplexProgramMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/api_op_UpdateReservation.go b/service/medialive/api_op_UpdateReservation.go index 9c1e5e02f61..138042396d3 100644 --- a/service/medialive/api_op_UpdateReservation.go +++ b/service/medialive/api_op_UpdateReservation.go @@ -5,7 +5,6 @@ package medialive import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/medialive/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateReservation(ctx context.Context, params *UpdateReservatio addawsRestjson1_serdeOpUpdateReservationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/medialive/endpoints.go b/service/medialive/endpoints.go index 5b77d3c11b1..e6414ee9479 100644 --- a/service/medialive/endpoints.go +++ b/service/medialive/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/mediapackage/api_client.go b/service/mediapackage/api_client.go index dd3387dca7d..e3d29bd7415 100644 --- a/service/mediapackage/api_client.go +++ b/service/mediapackage/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/mediapackage/api_op_CreateChannel.go b/service/mediapackage/api_op_CreateChannel.go index 316fcfb1417..9b5c2aa7052 100644 --- a/service/mediapackage/api_op_CreateChannel.go +++ b/service/mediapackage/api_op_CreateChannel.go @@ -5,7 +5,6 @@ package mediapackage import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackage/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateChannel(ctx context.Context, params *CreateChannelInput, addawsRestjson1_serdeOpCreateChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackage/api_op_CreateHarvestJob.go b/service/mediapackage/api_op_CreateHarvestJob.go index 8f60b5113d9..d07691875b1 100644 --- a/service/mediapackage/api_op_CreateHarvestJob.go +++ b/service/mediapackage/api_op_CreateHarvestJob.go @@ -5,7 +5,6 @@ package mediapackage import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackage/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateHarvestJob(ctx context.Context, params *CreateHarvestJobI addawsRestjson1_serdeOpCreateHarvestJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackage/api_op_CreateOriginEndpoint.go b/service/mediapackage/api_op_CreateOriginEndpoint.go index d76b82b8792..d68306e18e9 100644 --- a/service/mediapackage/api_op_CreateOriginEndpoint.go +++ b/service/mediapackage/api_op_CreateOriginEndpoint.go @@ -5,7 +5,6 @@ package mediapackage import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackage/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateOriginEndpoint(ctx context.Context, params *CreateOriginE addawsRestjson1_serdeOpCreateOriginEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackage/api_op_DeleteChannel.go b/service/mediapackage/api_op_DeleteChannel.go index 4d1604506b6..4e095883d2c 100644 --- a/service/mediapackage/api_op_DeleteChannel.go +++ b/service/mediapackage/api_op_DeleteChannel.go @@ -5,7 +5,6 @@ package mediapackage import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteChannel(ctx context.Context, params *DeleteChannelInput, addawsRestjson1_serdeOpDeleteChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackage/api_op_DeleteOriginEndpoint.go b/service/mediapackage/api_op_DeleteOriginEndpoint.go index dc7d77c841e..0e87236c8e9 100644 --- a/service/mediapackage/api_op_DeleteOriginEndpoint.go +++ b/service/mediapackage/api_op_DeleteOriginEndpoint.go @@ -5,7 +5,6 @@ package mediapackage import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteOriginEndpoint(ctx context.Context, params *DeleteOriginE addawsRestjson1_serdeOpDeleteOriginEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackage/api_op_DescribeChannel.go b/service/mediapackage/api_op_DescribeChannel.go index 600cb660c30..641f5aa306d 100644 --- a/service/mediapackage/api_op_DescribeChannel.go +++ b/service/mediapackage/api_op_DescribeChannel.go @@ -5,7 +5,6 @@ package mediapackage import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackage/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeChannel(ctx context.Context, params *DescribeChannelInp addawsRestjson1_serdeOpDescribeChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackage/api_op_DescribeHarvestJob.go b/service/mediapackage/api_op_DescribeHarvestJob.go index 1226a2a6d2a..2c59c7382e2 100644 --- a/service/mediapackage/api_op_DescribeHarvestJob.go +++ b/service/mediapackage/api_op_DescribeHarvestJob.go @@ -5,7 +5,6 @@ package mediapackage import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackage/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeHarvestJob(ctx context.Context, params *DescribeHarvest addawsRestjson1_serdeOpDescribeHarvestJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackage/api_op_DescribeOriginEndpoint.go b/service/mediapackage/api_op_DescribeOriginEndpoint.go index 9ba9388d7c3..29d682d7972 100644 --- a/service/mediapackage/api_op_DescribeOriginEndpoint.go +++ b/service/mediapackage/api_op_DescribeOriginEndpoint.go @@ -5,7 +5,6 @@ package mediapackage import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackage/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeOriginEndpoint(ctx context.Context, params *DescribeOri addawsRestjson1_serdeOpDescribeOriginEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackage/api_op_ListChannels.go b/service/mediapackage/api_op_ListChannels.go index e5d2df92676..344118ddadd 100644 --- a/service/mediapackage/api_op_ListChannels.go +++ b/service/mediapackage/api_op_ListChannels.go @@ -5,7 +5,6 @@ package mediapackage import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackage/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListChannels(ctx context.Context, params *ListChannelsInput, op addawsRestjson1_serdeOpListChannelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackage/api_op_ListHarvestJobs.go b/service/mediapackage/api_op_ListHarvestJobs.go index 23068618ab2..04c8010b08d 100644 --- a/service/mediapackage/api_op_ListHarvestJobs.go +++ b/service/mediapackage/api_op_ListHarvestJobs.go @@ -5,7 +5,6 @@ package mediapackage import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackage/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListHarvestJobs(ctx context.Context, params *ListHarvestJobsInp addawsRestjson1_serdeOpListHarvestJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackage/api_op_ListOriginEndpoints.go b/service/mediapackage/api_op_ListOriginEndpoints.go index c9552d9b28d..3767f30b386 100644 --- a/service/mediapackage/api_op_ListOriginEndpoints.go +++ b/service/mediapackage/api_op_ListOriginEndpoints.go @@ -5,7 +5,6 @@ package mediapackage import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackage/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListOriginEndpoints(ctx context.Context, params *ListOriginEndp addawsRestjson1_serdeOpListOriginEndpointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackage/api_op_ListTagsForResource.go b/service/mediapackage/api_op_ListTagsForResource.go index 18bff87dbdf..9ee86b86c37 100644 --- a/service/mediapackage/api_op_ListTagsForResource.go +++ b/service/mediapackage/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package mediapackage import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -21,9 +20,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackage/api_op_RotateChannelCredentials.go b/service/mediapackage/api_op_RotateChannelCredentials.go index 918c8c79821..966322d63cb 100644 --- a/service/mediapackage/api_op_RotateChannelCredentials.go +++ b/service/mediapackage/api_op_RotateChannelCredentials.go @@ -5,7 +5,6 @@ package mediapackage import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackage/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) RotateChannelCredentials(ctx context.Context, params *RotateCha addawsRestjson1_serdeOpRotateChannelCredentialsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackage/api_op_RotateIngestEndpointCredentials.go b/service/mediapackage/api_op_RotateIngestEndpointCredentials.go index 6077e3f92d6..b6246762e83 100644 --- a/service/mediapackage/api_op_RotateIngestEndpointCredentials.go +++ b/service/mediapackage/api_op_RotateIngestEndpointCredentials.go @@ -5,7 +5,6 @@ package mediapackage import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackage/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) RotateIngestEndpointCredentials(ctx context.Context, params *Ro addawsRestjson1_serdeOpRotateIngestEndpointCredentialsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackage/api_op_TagResource.go b/service/mediapackage/api_op_TagResource.go index 6d70835d8ce..fc18a04f745 100644 --- a/service/mediapackage/api_op_TagResource.go +++ b/service/mediapackage/api_op_TagResource.go @@ -5,7 +5,6 @@ package mediapackage import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -21,9 +20,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackage/api_op_UntagResource.go b/service/mediapackage/api_op_UntagResource.go index 2e29bcebafa..5a054616243 100644 --- a/service/mediapackage/api_op_UntagResource.go +++ b/service/mediapackage/api_op_UntagResource.go @@ -5,7 +5,6 @@ package mediapackage import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -21,9 +20,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackage/api_op_UpdateChannel.go b/service/mediapackage/api_op_UpdateChannel.go index 44896acee20..93f22b03846 100644 --- a/service/mediapackage/api_op_UpdateChannel.go +++ b/service/mediapackage/api_op_UpdateChannel.go @@ -5,7 +5,6 @@ package mediapackage import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackage/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateChannel(ctx context.Context, params *UpdateChannelInput, addawsRestjson1_serdeOpUpdateChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackage/api_op_UpdateOriginEndpoint.go b/service/mediapackage/api_op_UpdateOriginEndpoint.go index 40b9e5a74da..baf45592887 100644 --- a/service/mediapackage/api_op_UpdateOriginEndpoint.go +++ b/service/mediapackage/api_op_UpdateOriginEndpoint.go @@ -5,7 +5,6 @@ package mediapackage import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackage/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateOriginEndpoint(ctx context.Context, params *UpdateOriginE addawsRestjson1_serdeOpUpdateOriginEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackage/endpoints.go b/service/mediapackage/endpoints.go index b798e282809..304b07017e2 100644 --- a/service/mediapackage/endpoints.go +++ b/service/mediapackage/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/mediapackagevod/api_client.go b/service/mediapackagevod/api_client.go index b5b0803db84..baf74081cc7 100644 --- a/service/mediapackagevod/api_client.go +++ b/service/mediapackagevod/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/mediapackagevod/api_op_CreateAsset.go b/service/mediapackagevod/api_op_CreateAsset.go index 39f19cbb7b6..f74cdd933fa 100644 --- a/service/mediapackagevod/api_op_CreateAsset.go +++ b/service/mediapackagevod/api_op_CreateAsset.go @@ -5,7 +5,6 @@ package mediapackagevod import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackagevod/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateAsset(ctx context.Context, params *CreateAssetInput, optF addawsRestjson1_serdeOpCreateAssetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackagevod/api_op_CreatePackagingConfiguration.go b/service/mediapackagevod/api_op_CreatePackagingConfiguration.go index f2fd2010ed8..9b481478811 100644 --- a/service/mediapackagevod/api_op_CreatePackagingConfiguration.go +++ b/service/mediapackagevod/api_op_CreatePackagingConfiguration.go @@ -5,7 +5,6 @@ package mediapackagevod import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackagevod/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreatePackagingConfiguration(ctx context.Context, params *Creat addawsRestjson1_serdeOpCreatePackagingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackagevod/api_op_CreatePackagingGroup.go b/service/mediapackagevod/api_op_CreatePackagingGroup.go index c907838ac68..5d182cc2d3d 100644 --- a/service/mediapackagevod/api_op_CreatePackagingGroup.go +++ b/service/mediapackagevod/api_op_CreatePackagingGroup.go @@ -5,7 +5,6 @@ package mediapackagevod import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackagevod/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreatePackagingGroup(ctx context.Context, params *CreatePackagi addawsRestjson1_serdeOpCreatePackagingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackagevod/api_op_DeleteAsset.go b/service/mediapackagevod/api_op_DeleteAsset.go index 3926342b7eb..17cf703cb7e 100644 --- a/service/mediapackagevod/api_op_DeleteAsset.go +++ b/service/mediapackagevod/api_op_DeleteAsset.go @@ -5,7 +5,6 @@ package mediapackagevod import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteAsset(ctx context.Context, params *DeleteAssetInput, optF addawsRestjson1_serdeOpDeleteAssetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackagevod/api_op_DeletePackagingConfiguration.go b/service/mediapackagevod/api_op_DeletePackagingConfiguration.go index 9b8248c421c..3c8e4bc5888 100644 --- a/service/mediapackagevod/api_op_DeletePackagingConfiguration.go +++ b/service/mediapackagevod/api_op_DeletePackagingConfiguration.go @@ -5,7 +5,6 @@ package mediapackagevod import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeletePackagingConfiguration(ctx context.Context, params *Delet addawsRestjson1_serdeOpDeletePackagingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackagevod/api_op_DeletePackagingGroup.go b/service/mediapackagevod/api_op_DeletePackagingGroup.go index 378e4938523..178423bf26a 100644 --- a/service/mediapackagevod/api_op_DeletePackagingGroup.go +++ b/service/mediapackagevod/api_op_DeletePackagingGroup.go @@ -5,7 +5,6 @@ package mediapackagevod import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeletePackagingGroup(ctx context.Context, params *DeletePackagi addawsRestjson1_serdeOpDeletePackagingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackagevod/api_op_DescribeAsset.go b/service/mediapackagevod/api_op_DescribeAsset.go index 8a215bbd95a..c122e606bb7 100644 --- a/service/mediapackagevod/api_op_DescribeAsset.go +++ b/service/mediapackagevod/api_op_DescribeAsset.go @@ -5,7 +5,6 @@ package mediapackagevod import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackagevod/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeAsset(ctx context.Context, params *DescribeAssetInput, addawsRestjson1_serdeOpDescribeAssetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackagevod/api_op_DescribePackagingConfiguration.go b/service/mediapackagevod/api_op_DescribePackagingConfiguration.go index 7fca7982971..e8327f20ae8 100644 --- a/service/mediapackagevod/api_op_DescribePackagingConfiguration.go +++ b/service/mediapackagevod/api_op_DescribePackagingConfiguration.go @@ -5,7 +5,6 @@ package mediapackagevod import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackagevod/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribePackagingConfiguration(ctx context.Context, params *Des addawsRestjson1_serdeOpDescribePackagingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackagevod/api_op_DescribePackagingGroup.go b/service/mediapackagevod/api_op_DescribePackagingGroup.go index e1c9124db93..002b6650bbc 100644 --- a/service/mediapackagevod/api_op_DescribePackagingGroup.go +++ b/service/mediapackagevod/api_op_DescribePackagingGroup.go @@ -5,7 +5,6 @@ package mediapackagevod import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackagevod/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribePackagingGroup(ctx context.Context, params *DescribePac addawsRestjson1_serdeOpDescribePackagingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackagevod/api_op_ListAssets.go b/service/mediapackagevod/api_op_ListAssets.go index a7bd8faec6b..37e88e93880 100644 --- a/service/mediapackagevod/api_op_ListAssets.go +++ b/service/mediapackagevod/api_op_ListAssets.go @@ -5,7 +5,6 @@ package mediapackagevod import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackagevod/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListAssets(ctx context.Context, params *ListAssetsInput, optFns addawsRestjson1_serdeOpListAssetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackagevod/api_op_ListPackagingConfigurations.go b/service/mediapackagevod/api_op_ListPackagingConfigurations.go index 0ac5645e593..8a5c4a418fb 100644 --- a/service/mediapackagevod/api_op_ListPackagingConfigurations.go +++ b/service/mediapackagevod/api_op_ListPackagingConfigurations.go @@ -5,7 +5,6 @@ package mediapackagevod import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackagevod/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListPackagingConfigurations(ctx context.Context, params *ListPa addawsRestjson1_serdeOpListPackagingConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackagevod/api_op_ListPackagingGroups.go b/service/mediapackagevod/api_op_ListPackagingGroups.go index 6fbbf87e8cd..cb3010d14fc 100644 --- a/service/mediapackagevod/api_op_ListPackagingGroups.go +++ b/service/mediapackagevod/api_op_ListPackagingGroups.go @@ -5,7 +5,6 @@ package mediapackagevod import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackagevod/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListPackagingGroups(ctx context.Context, params *ListPackagingG addawsRestjson1_serdeOpListPackagingGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackagevod/api_op_ListTagsForResource.go b/service/mediapackagevod/api_op_ListTagsForResource.go index 3ac347d0c07..1898a6bbdee 100644 --- a/service/mediapackagevod/api_op_ListTagsForResource.go +++ b/service/mediapackagevod/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package mediapackagevod import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackagevod/api_op_TagResource.go b/service/mediapackagevod/api_op_TagResource.go index 937db09eddb..c74e631c60e 100644 --- a/service/mediapackagevod/api_op_TagResource.go +++ b/service/mediapackagevod/api_op_TagResource.go @@ -5,7 +5,6 @@ package mediapackagevod import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackagevod/api_op_UntagResource.go b/service/mediapackagevod/api_op_UntagResource.go index 5420b76a508..55e6e892c0f 100644 --- a/service/mediapackagevod/api_op_UntagResource.go +++ b/service/mediapackagevod/api_op_UntagResource.go @@ -5,7 +5,6 @@ package mediapackagevod import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackagevod/api_op_UpdatePackagingGroup.go b/service/mediapackagevod/api_op_UpdatePackagingGroup.go index ab24c62e251..6fc387ed6a4 100644 --- a/service/mediapackagevod/api_op_UpdatePackagingGroup.go +++ b/service/mediapackagevod/api_op_UpdatePackagingGroup.go @@ -5,7 +5,6 @@ package mediapackagevod import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediapackagevod/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdatePackagingGroup(ctx context.Context, params *UpdatePackagi addawsRestjson1_serdeOpUpdatePackagingGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediapackagevod/endpoints.go b/service/mediapackagevod/endpoints.go index 67d985d7ec2..40d9e875c45 100644 --- a/service/mediapackagevod/endpoints.go +++ b/service/mediapackagevod/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/mediastore/api_client.go b/service/mediastore/api_client.go index d4504b7c18f..9376454912e 100644 --- a/service/mediastore/api_client.go +++ b/service/mediastore/api_client.go @@ -78,30 +78,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -167,6 +143,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/mediastore/api_op_CreateContainer.go b/service/mediastore/api_op_CreateContainer.go index e8311ad3ea6..a2c97527635 100644 --- a/service/mediastore/api_op_CreateContainer.go +++ b/service/mediastore/api_op_CreateContainer.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediastore/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateContainer(ctx context.Context, params *CreateContainerInp addawsAwsjson11_serdeOpCreateContainerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_DeleteContainer.go b/service/mediastore/api_op_DeleteContainer.go index 95b1357fd93..5b648dbdead 100644 --- a/service/mediastore/api_op_DeleteContainer.go +++ b/service/mediastore/api_op_DeleteContainer.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteContainer(ctx context.Context, params *DeleteContainerInp addawsAwsjson11_serdeOpDeleteContainerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_DeleteContainerPolicy.go b/service/mediastore/api_op_DeleteContainerPolicy.go index 2e41d03f89b..7cf5eab4b8e 100644 --- a/service/mediastore/api_op_DeleteContainerPolicy.go +++ b/service/mediastore/api_op_DeleteContainerPolicy.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteContainerPolicy(ctx context.Context, params *DeleteContai addawsAwsjson11_serdeOpDeleteContainerPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_DeleteCorsPolicy.go b/service/mediastore/api_op_DeleteCorsPolicy.go index e4e033388a9..638b0dab82f 100644 --- a/service/mediastore/api_op_DeleteCorsPolicy.go +++ b/service/mediastore/api_op_DeleteCorsPolicy.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteCorsPolicy(ctx context.Context, params *DeleteCorsPolicyI addawsAwsjson11_serdeOpDeleteCorsPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_DeleteLifecyclePolicy.go b/service/mediastore/api_op_DeleteLifecyclePolicy.go index c9d117d6ebc..efb37746ecf 100644 --- a/service/mediastore/api_op_DeleteLifecyclePolicy.go +++ b/service/mediastore/api_op_DeleteLifecyclePolicy.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteLifecyclePolicy(ctx context.Context, params *DeleteLifecy addawsAwsjson11_serdeOpDeleteLifecyclePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_DeleteMetricPolicy.go b/service/mediastore/api_op_DeleteMetricPolicy.go index 14299ad1832..8b7cad3e2c5 100644 --- a/service/mediastore/api_op_DeleteMetricPolicy.go +++ b/service/mediastore/api_op_DeleteMetricPolicy.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteMetricPolicy(ctx context.Context, params *DeleteMetricPol addawsAwsjson11_serdeOpDeleteMetricPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_DescribeContainer.go b/service/mediastore/api_op_DescribeContainer.go index 2a7caa7945e..77d5d582e76 100644 --- a/service/mediastore/api_op_DescribeContainer.go +++ b/service/mediastore/api_op_DescribeContainer.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediastore/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeContainer(ctx context.Context, params *DescribeContaine addawsAwsjson11_serdeOpDescribeContainerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_GetContainerPolicy.go b/service/mediastore/api_op_GetContainerPolicy.go index bc970252730..7bb33f756d6 100644 --- a/service/mediastore/api_op_GetContainerPolicy.go +++ b/service/mediastore/api_op_GetContainerPolicy.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) GetContainerPolicy(ctx context.Context, params *GetContainerPol addawsAwsjson11_serdeOpGetContainerPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_GetCorsPolicy.go b/service/mediastore/api_op_GetCorsPolicy.go index 34809ec173f..8ec89f18127 100644 --- a/service/mediastore/api_op_GetCorsPolicy.go +++ b/service/mediastore/api_op_GetCorsPolicy.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediastore/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetCorsPolicy(ctx context.Context, params *GetCorsPolicyInput, addawsAwsjson11_serdeOpGetCorsPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_GetLifecyclePolicy.go b/service/mediastore/api_op_GetLifecyclePolicy.go index c0d4b6fd314..caebc4269e0 100644 --- a/service/mediastore/api_op_GetLifecyclePolicy.go +++ b/service/mediastore/api_op_GetLifecyclePolicy.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetLifecyclePolicy(ctx context.Context, params *GetLifecyclePol addawsAwsjson11_serdeOpGetLifecyclePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_GetMetricPolicy.go b/service/mediastore/api_op_GetMetricPolicy.go index 685ecc7dae7..b1604298adc 100644 --- a/service/mediastore/api_op_GetMetricPolicy.go +++ b/service/mediastore/api_op_GetMetricPolicy.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediastore/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetMetricPolicy(ctx context.Context, params *GetMetricPolicyInp addawsAwsjson11_serdeOpGetMetricPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_ListContainers.go b/service/mediastore/api_op_ListContainers.go index a059cbc7832..c8b20922be4 100644 --- a/service/mediastore/api_op_ListContainers.go +++ b/service/mediastore/api_op_ListContainers.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediastore/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListContainers(ctx context.Context, params *ListContainersInput addawsAwsjson11_serdeOpListContainersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_ListTagsForResource.go b/service/mediastore/api_op_ListTagsForResource.go index 9d52d983a8e..1218508b355 100644 --- a/service/mediastore/api_op_ListTagsForResource.go +++ b/service/mediastore/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediastore/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_PutContainerPolicy.go b/service/mediastore/api_op_PutContainerPolicy.go index fd6823cb4a6..d144f4e7a73 100644 --- a/service/mediastore/api_op_PutContainerPolicy.go +++ b/service/mediastore/api_op_PutContainerPolicy.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) PutContainerPolicy(ctx context.Context, params *PutContainerPol addawsAwsjson11_serdeOpPutContainerPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_PutCorsPolicy.go b/service/mediastore/api_op_PutCorsPolicy.go index e3b4c0b17ac..c3e42f1986e 100644 --- a/service/mediastore/api_op_PutCorsPolicy.go +++ b/service/mediastore/api_op_PutCorsPolicy.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediastore/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) PutCorsPolicy(ctx context.Context, params *PutCorsPolicyInput, addawsAwsjson11_serdeOpPutCorsPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_PutLifecyclePolicy.go b/service/mediastore/api_op_PutLifecyclePolicy.go index da3c907c1ad..20e2246a171 100644 --- a/service/mediastore/api_op_PutLifecyclePolicy.go +++ b/service/mediastore/api_op_PutLifecyclePolicy.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) PutLifecyclePolicy(ctx context.Context, params *PutLifecyclePol addawsAwsjson11_serdeOpPutLifecyclePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_PutMetricPolicy.go b/service/mediastore/api_op_PutMetricPolicy.go index 1e428acebe1..9112f644d50 100644 --- a/service/mediastore/api_op_PutMetricPolicy.go +++ b/service/mediastore/api_op_PutMetricPolicy.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediastore/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) PutMetricPolicy(ctx context.Context, params *PutMetricPolicyInp addawsAwsjson11_serdeOpPutMetricPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_StartAccessLogging.go b/service/mediastore/api_op_StartAccessLogging.go index 96542f96cf0..10159bb7880 100644 --- a/service/mediastore/api_op_StartAccessLogging.go +++ b/service/mediastore/api_op_StartAccessLogging.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) StartAccessLogging(ctx context.Context, params *StartAccessLogg addawsAwsjson11_serdeOpStartAccessLoggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_StopAccessLogging.go b/service/mediastore/api_op_StopAccessLogging.go index af9e43bcd23..122ed136c6c 100644 --- a/service/mediastore/api_op_StopAccessLogging.go +++ b/service/mediastore/api_op_StopAccessLogging.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) StopAccessLogging(ctx context.Context, params *StopAccessLoggin addawsAwsjson11_serdeOpStopAccessLoggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_TagResource.go b/service/mediastore/api_op_TagResource.go index 1fa004b5d95..72be9bd8c50 100644 --- a/service/mediastore/api_op_TagResource.go +++ b/service/mediastore/api_op_TagResource.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediastore/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/api_op_UntagResource.go b/service/mediastore/api_op_UntagResource.go index c0f61b6d4e2..66a9ffe7f85 100644 --- a/service/mediastore/api_op_UntagResource.go +++ b/service/mediastore/api_op_UntagResource.go @@ -5,7 +5,6 @@ package mediastore import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastore/endpoints.go b/service/mediastore/endpoints.go index d8cfc58a104..cf0789f4549 100644 --- a/service/mediastore/endpoints.go +++ b/service/mediastore/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/mediastoredata/api_client.go b/service/mediastoredata/api_client.go index 9b78941262d..01909722145 100644 --- a/service/mediastoredata/api_client.go +++ b/service/mediastoredata/api_client.go @@ -79,30 +79,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -168,6 +144,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/mediastoredata/api_op_DeleteObject.go b/service/mediastoredata/api_op_DeleteObject.go index 2443b897aa0..1865a9949e3 100644 --- a/service/mediastoredata/api_op_DeleteObject.go +++ b/service/mediastoredata/api_op_DeleteObject.go @@ -5,7 +5,6 @@ package mediastoredata import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteObject(ctx context.Context, params *DeleteObjectInput, op addawsRestjson1_serdeOpDeleteObjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastoredata/api_op_DescribeObject.go b/service/mediastoredata/api_op_DescribeObject.go index f9f692eca1c..972e3cc3466 100644 --- a/service/mediastoredata/api_op_DescribeObject.go +++ b/service/mediastoredata/api_op_DescribeObject.go @@ -5,7 +5,6 @@ package mediastoredata import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DescribeObject(ctx context.Context, params *DescribeObjectInput addawsRestjson1_serdeOpDescribeObjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastoredata/api_op_GetObject.go b/service/mediastoredata/api_op_GetObject.go index 6558e8d771b..0012ebd2427 100644 --- a/service/mediastoredata/api_op_GetObject.go +++ b/service/mediastoredata/api_op_GetObject.go @@ -5,7 +5,6 @@ package mediastoredata import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) GetObject(ctx context.Context, params *GetObjectInput, optFns . addawsRestjson1_serdeOpGetObjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastoredata/api_op_ListItems.go b/service/mediastoredata/api_op_ListItems.go index 9cd68555340..d841c779b37 100644 --- a/service/mediastoredata/api_op_ListItems.go +++ b/service/mediastoredata/api_op_ListItems.go @@ -5,7 +5,6 @@ package mediastoredata import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediastoredata/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListItems(ctx context.Context, params *ListItemsInput, optFns . addawsRestjson1_serdeOpListItemsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastoredata/api_op_PutObject.go b/service/mediastoredata/api_op_PutObject.go index 18ac645241a..cb1c4fb8009 100644 --- a/service/mediastoredata/api_op_PutObject.go +++ b/service/mediastoredata/api_op_PutObject.go @@ -5,7 +5,6 @@ package mediastoredata import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediastoredata/types" smithy "github.com/awslabs/smithy-go" @@ -24,10 +23,10 @@ func (c *Client) PutObject(ctx context.Context, params *PutObjectInput, optFns . addawsRestjson1_serdeOpPutObjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddUnsignedPayloadMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediastoredata/endpoints.go b/service/mediastoredata/endpoints.go index e885f431e55..3e3fd0a5068 100644 --- a/service/mediastoredata/endpoints.go +++ b/service/mediastoredata/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/mediatailor/api_client.go b/service/mediatailor/api_client.go index 06b8c08c303..f9f00301dfa 100644 --- a/service/mediatailor/api_client.go +++ b/service/mediatailor/api_client.go @@ -85,30 +85,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -174,6 +150,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/mediatailor/api_op_DeletePlaybackConfiguration.go b/service/mediatailor/api_op_DeletePlaybackConfiguration.go index a99dca238e6..c5d7c71963b 100644 --- a/service/mediatailor/api_op_DeletePlaybackConfiguration.go +++ b/service/mediatailor/api_op_DeletePlaybackConfiguration.go @@ -5,7 +5,6 @@ package mediatailor import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeletePlaybackConfiguration(ctx context.Context, params *Delete addawsRestjson1_serdeOpDeletePlaybackConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediatailor/api_op_GetPlaybackConfiguration.go b/service/mediatailor/api_op_GetPlaybackConfiguration.go index 7eb287ef515..b4d4ffb5278 100644 --- a/service/mediatailor/api_op_GetPlaybackConfiguration.go +++ b/service/mediatailor/api_op_GetPlaybackConfiguration.go @@ -5,7 +5,6 @@ package mediatailor import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediatailor/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetPlaybackConfiguration(ctx context.Context, params *GetPlayba addawsRestjson1_serdeOpGetPlaybackConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediatailor/api_op_ListPlaybackConfigurations.go b/service/mediatailor/api_op_ListPlaybackConfigurations.go index 15964376dfe..88f1a24c02d 100644 --- a/service/mediatailor/api_op_ListPlaybackConfigurations.go +++ b/service/mediatailor/api_op_ListPlaybackConfigurations.go @@ -5,7 +5,6 @@ package mediatailor import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediatailor/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListPlaybackConfigurations(ctx context.Context, params *ListPla addawsRestjson1_serdeOpListPlaybackConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediatailor/api_op_ListTagsForResource.go b/service/mediatailor/api_op_ListTagsForResource.go index ed7957c3ac0..6625452f06e 100644 --- a/service/mediatailor/api_op_ListTagsForResource.go +++ b/service/mediatailor/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package mediatailor import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediatailor/api_op_PutPlaybackConfiguration.go b/service/mediatailor/api_op_PutPlaybackConfiguration.go index 497265cc7c2..da3b2b88330 100644 --- a/service/mediatailor/api_op_PutPlaybackConfiguration.go +++ b/service/mediatailor/api_op_PutPlaybackConfiguration.go @@ -5,7 +5,6 @@ package mediatailor import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mediatailor/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutPlaybackConfiguration(ctx context.Context, params *PutPlayba addawsRestjson1_serdeOpPutPlaybackConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediatailor/api_op_TagResource.go b/service/mediatailor/api_op_TagResource.go index 337eda8fb49..b0fcdf5916e 100644 --- a/service/mediatailor/api_op_TagResource.go +++ b/service/mediatailor/api_op_TagResource.go @@ -5,7 +5,6 @@ package mediatailor import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediatailor/api_op_UntagResource.go b/service/mediatailor/api_op_UntagResource.go index 97f061c2acf..82cf7b4e349 100644 --- a/service/mediatailor/api_op_UntagResource.go +++ b/service/mediatailor/api_op_UntagResource.go @@ -5,7 +5,6 @@ package mediatailor import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mediatailor/endpoints.go b/service/mediatailor/endpoints.go index c99f19f99b0..8ee540ff68a 100644 --- a/service/mediatailor/endpoints.go +++ b/service/mediatailor/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/migrationhub/api_client.go b/service/migrationhub/api_client.go index 0c12b2f49f6..6ce21ccaad2 100644 --- a/service/migrationhub/api_client.go +++ b/service/migrationhub/api_client.go @@ -82,30 +82,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -171,6 +147,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/migrationhub/api_op_AssociateCreatedArtifact.go b/service/migrationhub/api_op_AssociateCreatedArtifact.go index 77957f1a5cb..c1a0aea2ef4 100644 --- a/service/migrationhub/api_op_AssociateCreatedArtifact.go +++ b/service/migrationhub/api_op_AssociateCreatedArtifact.go @@ -5,7 +5,6 @@ package migrationhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/migrationhub/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) AssociateCreatedArtifact(ctx context.Context, params *Associate addawsAwsjson11_serdeOpAssociateCreatedArtifactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhub/api_op_AssociateDiscoveredResource.go b/service/migrationhub/api_op_AssociateDiscoveredResource.go index 772edffe5ee..35ea4b0e151 100644 --- a/service/migrationhub/api_op_AssociateDiscoveredResource.go +++ b/service/migrationhub/api_op_AssociateDiscoveredResource.go @@ -5,7 +5,6 @@ package migrationhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/migrationhub/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AssociateDiscoveredResource(ctx context.Context, params *Associ addawsAwsjson11_serdeOpAssociateDiscoveredResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhub/api_op_CreateProgressUpdateStream.go b/service/migrationhub/api_op_CreateProgressUpdateStream.go index 0c77065db23..422e992420b 100644 --- a/service/migrationhub/api_op_CreateProgressUpdateStream.go +++ b/service/migrationhub/api_op_CreateProgressUpdateStream.go @@ -5,7 +5,6 @@ package migrationhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) CreateProgressUpdateStream(ctx context.Context, params *CreateP addawsAwsjson11_serdeOpCreateProgressUpdateStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhub/api_op_DeleteProgressUpdateStream.go b/service/migrationhub/api_op_DeleteProgressUpdateStream.go index 011c4420e67..9e86ccd1100 100644 --- a/service/migrationhub/api_op_DeleteProgressUpdateStream.go +++ b/service/migrationhub/api_op_DeleteProgressUpdateStream.go @@ -5,7 +5,6 @@ package migrationhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -46,9 +45,9 @@ func (c *Client) DeleteProgressUpdateStream(ctx context.Context, params *DeleteP addawsAwsjson11_serdeOpDeleteProgressUpdateStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhub/api_op_DescribeApplicationState.go b/service/migrationhub/api_op_DescribeApplicationState.go index 1cbfa8e373b..dfcac15ba7e 100644 --- a/service/migrationhub/api_op_DescribeApplicationState.go +++ b/service/migrationhub/api_op_DescribeApplicationState.go @@ -5,7 +5,6 @@ package migrationhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/migrationhub/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeApplicationState(ctx context.Context, params *DescribeA addawsAwsjson11_serdeOpDescribeApplicationStateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhub/api_op_DescribeMigrationTask.go b/service/migrationhub/api_op_DescribeMigrationTask.go index ea3c8181f8d..d153ca767cb 100644 --- a/service/migrationhub/api_op_DescribeMigrationTask.go +++ b/service/migrationhub/api_op_DescribeMigrationTask.go @@ -5,7 +5,6 @@ package migrationhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/migrationhub/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeMigrationTask(ctx context.Context, params *DescribeMigr addawsAwsjson11_serdeOpDescribeMigrationTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhub/api_op_DisassociateCreatedArtifact.go b/service/migrationhub/api_op_DisassociateCreatedArtifact.go index 627d5dd883c..457cae9fa48 100644 --- a/service/migrationhub/api_op_DisassociateCreatedArtifact.go +++ b/service/migrationhub/api_op_DisassociateCreatedArtifact.go @@ -5,7 +5,6 @@ package migrationhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -36,9 +35,9 @@ func (c *Client) DisassociateCreatedArtifact(ctx context.Context, params *Disass addawsAwsjson11_serdeOpDisassociateCreatedArtifactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhub/api_op_DisassociateDiscoveredResource.go b/service/migrationhub/api_op_DisassociateDiscoveredResource.go index 5e2e30898fb..d170d85be62 100644 --- a/service/migrationhub/api_op_DisassociateDiscoveredResource.go +++ b/service/migrationhub/api_op_DisassociateDiscoveredResource.go @@ -5,7 +5,6 @@ package migrationhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisassociateDiscoveredResource(ctx context.Context, params *Dis addawsAwsjson11_serdeOpDisassociateDiscoveredResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhub/api_op_ImportMigrationTask.go b/service/migrationhub/api_op_ImportMigrationTask.go index 3954d073dec..730f649ede0 100644 --- a/service/migrationhub/api_op_ImportMigrationTask.go +++ b/service/migrationhub/api_op_ImportMigrationTask.go @@ -5,7 +5,6 @@ package migrationhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) ImportMigrationTask(ctx context.Context, params *ImportMigratio addawsAwsjson11_serdeOpImportMigrationTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhub/api_op_ListApplicationStates.go b/service/migrationhub/api_op_ListApplicationStates.go index 849d87840e9..01fce398a7d 100644 --- a/service/migrationhub/api_op_ListApplicationStates.go +++ b/service/migrationhub/api_op_ListApplicationStates.go @@ -5,7 +5,6 @@ package migrationhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/migrationhub/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListApplicationStates(ctx context.Context, params *ListApplicat addawsAwsjson11_serdeOpListApplicationStatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhub/api_op_ListCreatedArtifacts.go b/service/migrationhub/api_op_ListCreatedArtifacts.go index a06bcdeed58..23000c901cf 100644 --- a/service/migrationhub/api_op_ListCreatedArtifacts.go +++ b/service/migrationhub/api_op_ListCreatedArtifacts.go @@ -5,7 +5,6 @@ package migrationhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/migrationhub/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) ListCreatedArtifacts(ctx context.Context, params *ListCreatedAr addawsAwsjson11_serdeOpListCreatedArtifactsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhub/api_op_ListDiscoveredResources.go b/service/migrationhub/api_op_ListDiscoveredResources.go index 99cd8d9303f..f084598d9c0 100644 --- a/service/migrationhub/api_op_ListDiscoveredResources.go +++ b/service/migrationhub/api_op_ListDiscoveredResources.go @@ -5,7 +5,6 @@ package migrationhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/migrationhub/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDiscoveredResources(ctx context.Context, params *ListDiscov addawsAwsjson11_serdeOpListDiscoveredResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhub/api_op_ListMigrationTasks.go b/service/migrationhub/api_op_ListMigrationTasks.go index 314bc49e28d..643cce17fd2 100644 --- a/service/migrationhub/api_op_ListMigrationTasks.go +++ b/service/migrationhub/api_op_ListMigrationTasks.go @@ -5,7 +5,6 @@ package migrationhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/migrationhub/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) ListMigrationTasks(ctx context.Context, params *ListMigrationTa addawsAwsjson11_serdeOpListMigrationTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhub/api_op_ListProgressUpdateStreams.go b/service/migrationhub/api_op_ListProgressUpdateStreams.go index 8f2deea9d09..e830043c546 100644 --- a/service/migrationhub/api_op_ListProgressUpdateStreams.go +++ b/service/migrationhub/api_op_ListProgressUpdateStreams.go @@ -5,7 +5,6 @@ package migrationhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/migrationhub/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListProgressUpdateStreams(ctx context.Context, params *ListProg addawsAwsjson11_serdeOpListProgressUpdateStreamsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhub/api_op_NotifyApplicationState.go b/service/migrationhub/api_op_NotifyApplicationState.go index 7049f6b6c40..604f8cacbbd 100644 --- a/service/migrationhub/api_op_NotifyApplicationState.go +++ b/service/migrationhub/api_op_NotifyApplicationState.go @@ -5,7 +5,6 @@ package migrationhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/migrationhub/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) NotifyApplicationState(ctx context.Context, params *NotifyAppli addawsAwsjson11_serdeOpNotifyApplicationStateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhub/api_op_NotifyMigrationTaskState.go b/service/migrationhub/api_op_NotifyMigrationTaskState.go index 1bc67cbead8..5a4f24dc207 100644 --- a/service/migrationhub/api_op_NotifyMigrationTaskState.go +++ b/service/migrationhub/api_op_NotifyMigrationTaskState.go @@ -5,7 +5,6 @@ package migrationhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/migrationhub/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) NotifyMigrationTaskState(ctx context.Context, params *NotifyMig addawsAwsjson11_serdeOpNotifyMigrationTaskStateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhub/api_op_PutResourceAttributes.go b/service/migrationhub/api_op_PutResourceAttributes.go index 387a2fd95f3..cc48eab493c 100644 --- a/service/migrationhub/api_op_PutResourceAttributes.go +++ b/service/migrationhub/api_op_PutResourceAttributes.go @@ -5,7 +5,6 @@ package migrationhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/migrationhub/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) PutResourceAttributes(ctx context.Context, params *PutResourceA addawsAwsjson11_serdeOpPutResourceAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhub/endpoints.go b/service/migrationhub/endpoints.go index d26d8222057..70b6c11a460 100644 --- a/service/migrationhub/endpoints.go +++ b/service/migrationhub/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/migrationhubconfig/api_client.go b/service/migrationhubconfig/api_client.go index 54f408dc199..b7a48048e30 100644 --- a/service/migrationhubconfig/api_client.go +++ b/service/migrationhubconfig/api_client.go @@ -88,30 +88,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -177,6 +153,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/migrationhubconfig/api_op_CreateHomeRegionControl.go b/service/migrationhubconfig/api_op_CreateHomeRegionControl.go index 9591de7ff71..75467a8136e 100644 --- a/service/migrationhubconfig/api_op_CreateHomeRegionControl.go +++ b/service/migrationhubconfig/api_op_CreateHomeRegionControl.go @@ -5,7 +5,6 @@ package migrationhubconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/migrationhubconfig/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateHomeRegionControl(ctx context.Context, params *CreateHome addawsAwsjson11_serdeOpCreateHomeRegionControlMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhubconfig/api_op_DescribeHomeRegionControls.go b/service/migrationhubconfig/api_op_DescribeHomeRegionControls.go index f2573c2c1e9..1de982e306a 100644 --- a/service/migrationhubconfig/api_op_DescribeHomeRegionControls.go +++ b/service/migrationhubconfig/api_op_DescribeHomeRegionControls.go @@ -5,7 +5,6 @@ package migrationhubconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/migrationhubconfig/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeHomeRegionControls(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeHomeRegionControlsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhubconfig/api_op_GetHomeRegion.go b/service/migrationhubconfig/api_op_GetHomeRegion.go index 193e56c7964..288f8396d9a 100644 --- a/service/migrationhubconfig/api_op_GetHomeRegion.go +++ b/service/migrationhubconfig/api_op_GetHomeRegion.go @@ -5,7 +5,6 @@ package migrationhubconfig import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) GetHomeRegion(ctx context.Context, params *GetHomeRegionInput, addawsAwsjson11_serdeOpGetHomeRegionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/migrationhubconfig/endpoints.go b/service/migrationhubconfig/endpoints.go index 9f8fad81cd6..10564420bee 100644 --- a/service/migrationhubconfig/endpoints.go +++ b/service/migrationhubconfig/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/mobile/api_client.go b/service/mobile/api_client.go index d9651d36a82..b6a5c22fc7e 100644 --- a/service/mobile/api_client.go +++ b/service/mobile/api_client.go @@ -80,30 +80,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -169,6 +145,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/mobile/api_op_CreateProject.go b/service/mobile/api_op_CreateProject.go index adfb5a815fc..0b349b71f81 100644 --- a/service/mobile/api_op_CreateProject.go +++ b/service/mobile/api_op_CreateProject.go @@ -5,7 +5,6 @@ package mobile import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mobile/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateProject(ctx context.Context, params *CreateProjectInput, addawsRestjson1_serdeOpCreateProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mobile/api_op_DeleteProject.go b/service/mobile/api_op_DeleteProject.go index ab5c46cdcc5..7300e589583 100644 --- a/service/mobile/api_op_DeleteProject.go +++ b/service/mobile/api_op_DeleteProject.go @@ -5,7 +5,6 @@ package mobile import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mobile/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteProject(ctx context.Context, params *DeleteProjectInput, addawsRestjson1_serdeOpDeleteProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mobile/api_op_DescribeBundle.go b/service/mobile/api_op_DescribeBundle.go index 740ecaec10e..34cdcbf898d 100644 --- a/service/mobile/api_op_DescribeBundle.go +++ b/service/mobile/api_op_DescribeBundle.go @@ -5,7 +5,6 @@ package mobile import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mobile/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeBundle(ctx context.Context, params *DescribeBundleInput addawsRestjson1_serdeOpDescribeBundleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mobile/api_op_DescribeProject.go b/service/mobile/api_op_DescribeProject.go index 64ce66fdc8a..c0571c0cf5b 100644 --- a/service/mobile/api_op_DescribeProject.go +++ b/service/mobile/api_op_DescribeProject.go @@ -5,7 +5,6 @@ package mobile import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mobile/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeProject(ctx context.Context, params *DescribeProjectInp addawsRestjson1_serdeOpDescribeProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mobile/api_op_ExportBundle.go b/service/mobile/api_op_ExportBundle.go index c764a4713bb..673e1991526 100644 --- a/service/mobile/api_op_ExportBundle.go +++ b/service/mobile/api_op_ExportBundle.go @@ -5,7 +5,6 @@ package mobile import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mobile/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ExportBundle(ctx context.Context, params *ExportBundleInput, op addawsRestjson1_serdeOpExportBundleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mobile/api_op_ExportProject.go b/service/mobile/api_op_ExportProject.go index 3f65ba131da..5bbfc4ded87 100644 --- a/service/mobile/api_op_ExportProject.go +++ b/service/mobile/api_op_ExportProject.go @@ -5,7 +5,6 @@ package mobile import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ExportProject(ctx context.Context, params *ExportProjectInput, addawsRestjson1_serdeOpExportProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mobile/api_op_ListBundles.go b/service/mobile/api_op_ListBundles.go index 0941d0b7266..b0f4b0ed7d4 100644 --- a/service/mobile/api_op_ListBundles.go +++ b/service/mobile/api_op_ListBundles.go @@ -5,7 +5,6 @@ package mobile import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mobile/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListBundles(ctx context.Context, params *ListBundlesInput, optF addawsRestjson1_serdeOpListBundlesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mobile/api_op_ListProjects.go b/service/mobile/api_op_ListProjects.go index f72c061e0a8..832bbc20e95 100644 --- a/service/mobile/api_op_ListProjects.go +++ b/service/mobile/api_op_ListProjects.go @@ -5,7 +5,6 @@ package mobile import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mobile/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListProjects(ctx context.Context, params *ListProjectsInput, op addawsRestjson1_serdeOpListProjectsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mobile/api_op_UpdateProject.go b/service/mobile/api_op_UpdateProject.go index 10884e236f9..cbbce41ea4f 100644 --- a/service/mobile/api_op_UpdateProject.go +++ b/service/mobile/api_op_UpdateProject.go @@ -5,7 +5,6 @@ package mobile import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mobile/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateProject(ctx context.Context, params *UpdateProjectInput, addawsRestjson1_serdeOpUpdateProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mobile/endpoints.go b/service/mobile/endpoints.go index 051a59e6499..af5d19289ad 100644 --- a/service/mobile/endpoints.go +++ b/service/mobile/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/mq/api_client.go b/service/mq/api_client.go index 5f54ded5e5d..c77a2b63df8 100644 --- a/service/mq/api_client.go +++ b/service/mq/api_client.go @@ -88,34 +88,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -188,6 +160,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/mq/api_op_CreateBroker.go b/service/mq/api_op_CreateBroker.go index 8e4e71f916c..46e47e27c1d 100644 --- a/service/mq/api_op_CreateBroker.go +++ b/service/mq/api_op_CreateBroker.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mq/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateBroker(ctx context.Context, params *CreateBrokerInput, op addawsRestjson1_serdeOpCreateBrokerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_CreateConfiguration.go b/service/mq/api_op_CreateConfiguration.go index 3afad88c7e6..b3499e6bb64 100644 --- a/service/mq/api_op_CreateConfiguration.go +++ b/service/mq/api_op_CreateConfiguration.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mq/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateConfiguration(ctx context.Context, params *CreateConfigur addawsRestjson1_serdeOpCreateConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_CreateTags.go b/service/mq/api_op_CreateTags.go index c57188dc84a..0ea73cf0fcb 100644 --- a/service/mq/api_op_CreateTags.go +++ b/service/mq/api_op_CreateTags.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateTags(ctx context.Context, params *CreateTagsInput, optFns addawsRestjson1_serdeOpCreateTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_CreateUser.go b/service/mq/api_op_CreateUser.go index 0d00815b011..ad551ee883d 100644 --- a/service/mq/api_op_CreateUser.go +++ b/service/mq/api_op_CreateUser.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateUser(ctx context.Context, params *CreateUserInput, optFns addawsRestjson1_serdeOpCreateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_DeleteBroker.go b/service/mq/api_op_DeleteBroker.go index 76df404411c..ab1be533fa2 100644 --- a/service/mq/api_op_DeleteBroker.go +++ b/service/mq/api_op_DeleteBroker.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteBroker(ctx context.Context, params *DeleteBrokerInput, op addawsRestjson1_serdeOpDeleteBrokerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_DeleteTags.go b/service/mq/api_op_DeleteTags.go index 32d74947efe..376f50a95ad 100644 --- a/service/mq/api_op_DeleteTags.go +++ b/service/mq/api_op_DeleteTags.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteTags(ctx context.Context, params *DeleteTagsInput, optFns addawsRestjson1_serdeOpDeleteTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_DeleteUser.go b/service/mq/api_op_DeleteUser.go index ae3ff53d338..fb2fc2c8f37 100644 --- a/service/mq/api_op_DeleteUser.go +++ b/service/mq/api_op_DeleteUser.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteUser(ctx context.Context, params *DeleteUserInput, optFns addawsRestjson1_serdeOpDeleteUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_DescribeBroker.go b/service/mq/api_op_DescribeBroker.go index cd2fb89e16b..f4278961b95 100644 --- a/service/mq/api_op_DescribeBroker.go +++ b/service/mq/api_op_DescribeBroker.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mq/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeBroker(ctx context.Context, params *DescribeBrokerInput addawsRestjson1_serdeOpDescribeBrokerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_DescribeBrokerEngineTypes.go b/service/mq/api_op_DescribeBrokerEngineTypes.go index 59443f8ed32..9df001b967c 100644 --- a/service/mq/api_op_DescribeBrokerEngineTypes.go +++ b/service/mq/api_op_DescribeBrokerEngineTypes.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mq/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeBrokerEngineTypes(ctx context.Context, params *Describe addawsRestjson1_serdeOpDescribeBrokerEngineTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_DescribeBrokerInstanceOptions.go b/service/mq/api_op_DescribeBrokerInstanceOptions.go index 2f432dcea85..43fd7875f54 100644 --- a/service/mq/api_op_DescribeBrokerInstanceOptions.go +++ b/service/mq/api_op_DescribeBrokerInstanceOptions.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mq/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeBrokerInstanceOptions(ctx context.Context, params *Desc addawsRestjson1_serdeOpDescribeBrokerInstanceOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_DescribeConfiguration.go b/service/mq/api_op_DescribeConfiguration.go index 960eff92a42..4df332c290a 100644 --- a/service/mq/api_op_DescribeConfiguration.go +++ b/service/mq/api_op_DescribeConfiguration.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mq/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeConfiguration(ctx context.Context, params *DescribeConf addawsRestjson1_serdeOpDescribeConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_DescribeConfigurationRevision.go b/service/mq/api_op_DescribeConfigurationRevision.go index dedd4db9c83..54b0ecab36a 100644 --- a/service/mq/api_op_DescribeConfigurationRevision.go +++ b/service/mq/api_op_DescribeConfigurationRevision.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DescribeConfigurationRevision(ctx context.Context, params *Desc addawsRestjson1_serdeOpDescribeConfigurationRevisionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_DescribeUser.go b/service/mq/api_op_DescribeUser.go index 15a4aa44127..5d011ed2429 100644 --- a/service/mq/api_op_DescribeUser.go +++ b/service/mq/api_op_DescribeUser.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mq/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeUser(ctx context.Context, params *DescribeUserInput, op addawsRestjson1_serdeOpDescribeUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_ListBrokers.go b/service/mq/api_op_ListBrokers.go index 6a65ff3aa5a..56b3ab8ca7c 100644 --- a/service/mq/api_op_ListBrokers.go +++ b/service/mq/api_op_ListBrokers.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mq/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListBrokers(ctx context.Context, params *ListBrokersInput, optF addawsRestjson1_serdeOpListBrokersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_ListConfigurationRevisions.go b/service/mq/api_op_ListConfigurationRevisions.go index 31a8f11f907..a133c9bb420 100644 --- a/service/mq/api_op_ListConfigurationRevisions.go +++ b/service/mq/api_op_ListConfigurationRevisions.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mq/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListConfigurationRevisions(ctx context.Context, params *ListCon addawsRestjson1_serdeOpListConfigurationRevisionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_ListConfigurations.go b/service/mq/api_op_ListConfigurations.go index 953a8d2fd01..a0714bdee56 100644 --- a/service/mq/api_op_ListConfigurations.go +++ b/service/mq/api_op_ListConfigurations.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mq/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListConfigurations(ctx context.Context, params *ListConfigurati addawsRestjson1_serdeOpListConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_ListTags.go b/service/mq/api_op_ListTags.go index 45afadb49d4..a02c439bcd7 100644 --- a/service/mq/api_op_ListTags.go +++ b/service/mq/api_op_ListTags.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTags(ctx context.Context, params *ListTagsInput, optFns ... addawsRestjson1_serdeOpListTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_ListUsers.go b/service/mq/api_op_ListUsers.go index 069ff050353..a4f170c934e 100644 --- a/service/mq/api_op_ListUsers.go +++ b/service/mq/api_op_ListUsers.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mq/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListUsers(ctx context.Context, params *ListUsersInput, optFns . addawsRestjson1_serdeOpListUsersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_RebootBroker.go b/service/mq/api_op_RebootBroker.go index 4bcda557621..6515c9e3215 100644 --- a/service/mq/api_op_RebootBroker.go +++ b/service/mq/api_op_RebootBroker.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RebootBroker(ctx context.Context, params *RebootBrokerInput, op addawsRestjson1_serdeOpRebootBrokerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_UpdateBroker.go b/service/mq/api_op_UpdateBroker.go index 4c943f8061f..b6b4c20650a 100644 --- a/service/mq/api_op_UpdateBroker.go +++ b/service/mq/api_op_UpdateBroker.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mq/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateBroker(ctx context.Context, params *UpdateBrokerInput, op addawsRestjson1_serdeOpUpdateBrokerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_UpdateConfiguration.go b/service/mq/api_op_UpdateConfiguration.go index 315fe99f8fa..7d5e89d1ad1 100644 --- a/service/mq/api_op_UpdateConfiguration.go +++ b/service/mq/api_op_UpdateConfiguration.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mq/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateConfiguration(ctx context.Context, params *UpdateConfigur addawsRestjson1_serdeOpUpdateConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/api_op_UpdateUser.go b/service/mq/api_op_UpdateUser.go index b1d54acf118..4af6b448a6f 100644 --- a/service/mq/api_op_UpdateUser.go +++ b/service/mq/api_op_UpdateUser.go @@ -5,7 +5,6 @@ package mq import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateUser(ctx context.Context, params *UpdateUserInput, optFns addawsRestjson1_serdeOpUpdateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mq/endpoints.go b/service/mq/endpoints.go index b3d23c143d4..97a561b5c37 100644 --- a/service/mq/endpoints.go +++ b/service/mq/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/mturk/api_client.go b/service/mturk/api_client.go index 06a7c295d39..5da2c5f04b3 100644 --- a/service/mturk/api_client.go +++ b/service/mturk/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/mturk/api_op_AcceptQualificationRequest.go b/service/mturk/api_op_AcceptQualificationRequest.go index 605ad036501..c3dc7862d6f 100644 --- a/service/mturk/api_op_AcceptQualificationRequest.go +++ b/service/mturk/api_op_AcceptQualificationRequest.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) AcceptQualificationRequest(ctx context.Context, params *AcceptQ addawsAwsjson11_serdeOpAcceptQualificationRequestMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_ApproveAssignment.go b/service/mturk/api_op_ApproveAssignment.go index 8daf48c81a0..fffe81e94a4 100644 --- a/service/mturk/api_op_ApproveAssignment.go +++ b/service/mturk/api_op_ApproveAssignment.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -39,9 +38,9 @@ func (c *Client) ApproveAssignment(ctx context.Context, params *ApproveAssignmen addawsAwsjson11_serdeOpApproveAssignmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_AssociateQualificationWithWorker.go b/service/mturk/api_op_AssociateQualificationWithWorker.go index a5e723247b6..db53cecf325 100644 --- a/service/mturk/api_op_AssociateQualificationWithWorker.go +++ b/service/mturk/api_op_AssociateQualificationWithWorker.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) AssociateQualificationWithWorker(ctx context.Context, params *A addawsAwsjson11_serdeOpAssociateQualificationWithWorkerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_CreateAdditionalAssignmentsForHIT.go b/service/mturk/api_op_CreateAdditionalAssignmentsForHIT.go index 0f2a86bbfa7..cb11fcca0c7 100644 --- a/service/mturk/api_op_CreateAdditionalAssignmentsForHIT.go +++ b/service/mturk/api_op_CreateAdditionalAssignmentsForHIT.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) CreateAdditionalAssignmentsForHIT(ctx context.Context, params * addawsAwsjson11_serdeOpCreateAdditionalAssignmentsForHITMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_CreateHIT.go b/service/mturk/api_op_CreateHIT.go index 7d344619b79..14be4e0d0d5 100644 --- a/service/mturk/api_op_CreateHIT.go +++ b/service/mturk/api_op_CreateHIT.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) CreateHIT(ctx context.Context, params *CreateHITInput, optFns . addawsAwsjson11_serdeOpCreateHITMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_CreateHITType.go b/service/mturk/api_op_CreateHITType.go index e4bbdff535a..abe1ced8637 100644 --- a/service/mturk/api_op_CreateHITType.go +++ b/service/mturk/api_op_CreateHITType.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateHITType(ctx context.Context, params *CreateHITTypeInput, addawsAwsjson11_serdeOpCreateHITTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_CreateHITWithHITType.go b/service/mturk/api_op_CreateHITWithHITType.go index 9de2c381faf..c049b6fbe8b 100644 --- a/service/mturk/api_op_CreateHITWithHITType.go +++ b/service/mturk/api_op_CreateHITWithHITType.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) CreateHITWithHITType(ctx context.Context, params *CreateHITWith addawsAwsjson11_serdeOpCreateHITWithHITTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_CreateQualificationType.go b/service/mturk/api_op_CreateQualificationType.go index b89d26370dc..6a33a181ba9 100644 --- a/service/mturk/api_op_CreateQualificationType.go +++ b/service/mturk/api_op_CreateQualificationType.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateQualificationType(ctx context.Context, params *CreateQual addawsAwsjson11_serdeOpCreateQualificationTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_CreateWorkerBlock.go b/service/mturk/api_op_CreateWorkerBlock.go index 04c7a517191..b0dfbcfdd5b 100644 --- a/service/mturk/api_op_CreateWorkerBlock.go +++ b/service/mturk/api_op_CreateWorkerBlock.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CreateWorkerBlock(ctx context.Context, params *CreateWorkerBloc addawsAwsjson11_serdeOpCreateWorkerBlockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_DeleteHIT.go b/service/mturk/api_op_DeleteHIT.go index ff2dc70ae12..f6ca123f845 100644 --- a/service/mturk/api_op_DeleteHIT.go +++ b/service/mturk/api_op_DeleteHIT.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) DeleteHIT(ctx context.Context, params *DeleteHITInput, optFns . addawsAwsjson11_serdeOpDeleteHITMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_DeleteQualificationType.go b/service/mturk/api_op_DeleteQualificationType.go index 8ea9d0405ec..bf5bb8fc29b 100644 --- a/service/mturk/api_op_DeleteQualificationType.go +++ b/service/mturk/api_op_DeleteQualificationType.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) DeleteQualificationType(ctx context.Context, params *DeleteQual addawsAwsjson11_serdeOpDeleteQualificationTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_DeleteWorkerBlock.go b/service/mturk/api_op_DeleteWorkerBlock.go index 19db2231478..acaff4d02de 100644 --- a/service/mturk/api_op_DeleteWorkerBlock.go +++ b/service/mturk/api_op_DeleteWorkerBlock.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteWorkerBlock(ctx context.Context, params *DeleteWorkerBloc addawsAwsjson11_serdeOpDeleteWorkerBlockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_DisassociateQualificationFromWorker.go b/service/mturk/api_op_DisassociateQualificationFromWorker.go index 2bb0feee81c..2ba31907b6a 100644 --- a/service/mturk/api_op_DisassociateQualificationFromWorker.go +++ b/service/mturk/api_op_DisassociateQualificationFromWorker.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DisassociateQualificationFromWorker(ctx context.Context, params addawsAwsjson11_serdeOpDisassociateQualificationFromWorkerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_GetAccountBalance.go b/service/mturk/api_op_GetAccountBalance.go index 4272afb3d90..7ecf22e38bb 100644 --- a/service/mturk/api_op_GetAccountBalance.go +++ b/service/mturk/api_op_GetAccountBalance.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetAccountBalance(ctx context.Context, params *GetAccountBalanc addawsAwsjson11_serdeOpGetAccountBalanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_GetAssignment.go b/service/mturk/api_op_GetAssignment.go index 1406f965864..9358d6c17fe 100644 --- a/service/mturk/api_op_GetAssignment.go +++ b/service/mturk/api_op_GetAssignment.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetAssignment(ctx context.Context, params *GetAssignmentInput, addawsAwsjson11_serdeOpGetAssignmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_GetFileUploadURL.go b/service/mturk/api_op_GetFileUploadURL.go index e9d49ded824..2ff28e6f406 100644 --- a/service/mturk/api_op_GetFileUploadURL.go +++ b/service/mturk/api_op_GetFileUploadURL.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) GetFileUploadURL(ctx context.Context, params *GetFileUploadURLI addawsAwsjson11_serdeOpGetFileUploadURLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_GetHIT.go b/service/mturk/api_op_GetHIT.go index 53bd69eaab4..9947ec975f2 100644 --- a/service/mturk/api_op_GetHIT.go +++ b/service/mturk/api_op_GetHIT.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetHIT(ctx context.Context, params *GetHITInput, optFns ...func addawsAwsjson11_serdeOpGetHITMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_GetQualificationScore.go b/service/mturk/api_op_GetQualificationScore.go index 2f68aed8fec..6bba7e5a587 100644 --- a/service/mturk/api_op_GetQualificationScore.go +++ b/service/mturk/api_op_GetQualificationScore.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetQualificationScore(ctx context.Context, params *GetQualifica addawsAwsjson11_serdeOpGetQualificationScoreMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_GetQualificationType.go b/service/mturk/api_op_GetQualificationType.go index 06d9b994331..f8d80f7d4d8 100644 --- a/service/mturk/api_op_GetQualificationType.go +++ b/service/mturk/api_op_GetQualificationType.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetQualificationType(ctx context.Context, params *GetQualificat addawsAwsjson11_serdeOpGetQualificationTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_ListAssignmentsForHIT.go b/service/mturk/api_op_ListAssignmentsForHIT.go index 9982ac432ae..2c4cbc318d7 100644 --- a/service/mturk/api_op_ListAssignmentsForHIT.go +++ b/service/mturk/api_op_ListAssignmentsForHIT.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) ListAssignmentsForHIT(ctx context.Context, params *ListAssignme addawsAwsjson11_serdeOpListAssignmentsForHITMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_ListBonusPayments.go b/service/mturk/api_op_ListBonusPayments.go index 899a6c165bf..9a2d043bf8c 100644 --- a/service/mturk/api_op_ListBonusPayments.go +++ b/service/mturk/api_op_ListBonusPayments.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListBonusPayments(ctx context.Context, params *ListBonusPayment addawsAwsjson11_serdeOpListBonusPaymentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_ListHITs.go b/service/mturk/api_op_ListHITs.go index 7ff2c7014ec..05a40e27259 100644 --- a/service/mturk/api_op_ListHITs.go +++ b/service/mturk/api_op_ListHITs.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListHITs(ctx context.Context, params *ListHITsInput, optFns ... addawsAwsjson11_serdeOpListHITsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_ListHITsForQualificationType.go b/service/mturk/api_op_ListHITsForQualificationType.go index 0ded9673f2f..ffd17487a84 100644 --- a/service/mturk/api_op_ListHITsForQualificationType.go +++ b/service/mturk/api_op_ListHITsForQualificationType.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListHITsForQualificationType(ctx context.Context, params *ListH addawsAwsjson11_serdeOpListHITsForQualificationTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_ListQualificationRequests.go b/service/mturk/api_op_ListQualificationRequests.go index 265f4e4fc13..5ab45f161f7 100644 --- a/service/mturk/api_op_ListQualificationRequests.go +++ b/service/mturk/api_op_ListQualificationRequests.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListQualificationRequests(ctx context.Context, params *ListQual addawsAwsjson11_serdeOpListQualificationRequestsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_ListQualificationTypes.go b/service/mturk/api_op_ListQualificationTypes.go index 178bb318cfb..c3fed7a2a62 100644 --- a/service/mturk/api_op_ListQualificationTypes.go +++ b/service/mturk/api_op_ListQualificationTypes.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListQualificationTypes(ctx context.Context, params *ListQualifi addawsAwsjson11_serdeOpListQualificationTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_ListReviewPolicyResultsForHIT.go b/service/mturk/api_op_ListReviewPolicyResultsForHIT.go index fc238bc0262..cf9909d52d2 100644 --- a/service/mturk/api_op_ListReviewPolicyResultsForHIT.go +++ b/service/mturk/api_op_ListReviewPolicyResultsForHIT.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListReviewPolicyResultsForHIT(ctx context.Context, params *List addawsAwsjson11_serdeOpListReviewPolicyResultsForHITMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_ListReviewableHITs.go b/service/mturk/api_op_ListReviewableHITs.go index 3ec8682b2a6..12980ef1810 100644 --- a/service/mturk/api_op_ListReviewableHITs.go +++ b/service/mturk/api_op_ListReviewableHITs.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListReviewableHITs(ctx context.Context, params *ListReviewableH addawsAwsjson11_serdeOpListReviewableHITsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_ListWorkerBlocks.go b/service/mturk/api_op_ListWorkerBlocks.go index e6b586947ae..8f3cd624dbc 100644 --- a/service/mturk/api_op_ListWorkerBlocks.go +++ b/service/mturk/api_op_ListWorkerBlocks.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListWorkerBlocks(ctx context.Context, params *ListWorkerBlocksI addawsAwsjson11_serdeOpListWorkerBlocksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_ListWorkersWithQualificationType.go b/service/mturk/api_op_ListWorkersWithQualificationType.go index 246335f5bf3..a8870996aa5 100644 --- a/service/mturk/api_op_ListWorkersWithQualificationType.go +++ b/service/mturk/api_op_ListWorkersWithQualificationType.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListWorkersWithQualificationType(ctx context.Context, params *L addawsAwsjson11_serdeOpListWorkersWithQualificationTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_NotifyWorkers.go b/service/mturk/api_op_NotifyWorkers.go index 3241b49e157..ace63b2401a 100644 --- a/service/mturk/api_op_NotifyWorkers.go +++ b/service/mturk/api_op_NotifyWorkers.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) NotifyWorkers(ctx context.Context, params *NotifyWorkersInput, addawsAwsjson11_serdeOpNotifyWorkersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_RejectAssignment.go b/service/mturk/api_op_RejectAssignment.go index 85bece22df3..030d0adba46 100644 --- a/service/mturk/api_op_RejectAssignment.go +++ b/service/mturk/api_op_RejectAssignment.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) RejectAssignment(ctx context.Context, params *RejectAssignmentI addawsAwsjson11_serdeOpRejectAssignmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_RejectQualificationRequest.go b/service/mturk/api_op_RejectQualificationRequest.go index 715235f7c88..0a11f4ef7fd 100644 --- a/service/mturk/api_op_RejectQualificationRequest.go +++ b/service/mturk/api_op_RejectQualificationRequest.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) RejectQualificationRequest(ctx context.Context, params *RejectQ addawsAwsjson11_serdeOpRejectQualificationRequestMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_SendBonus.go b/service/mturk/api_op_SendBonus.go index c0189fee673..be27198a827 100644 --- a/service/mturk/api_op_SendBonus.go +++ b/service/mturk/api_op_SendBonus.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) SendBonus(ctx context.Context, params *SendBonusInput, optFns . addawsAwsjson11_serdeOpSendBonusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_SendTestEventNotification.go b/service/mturk/api_op_SendTestEventNotification.go index a0d245eb7d7..181abdc30f7 100644 --- a/service/mturk/api_op_SendTestEventNotification.go +++ b/service/mturk/api_op_SendTestEventNotification.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) SendTestEventNotification(ctx context.Context, params *SendTest addawsAwsjson11_serdeOpSendTestEventNotificationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_UpdateExpirationForHIT.go b/service/mturk/api_op_UpdateExpirationForHIT.go index 72b480d1718..6937bd55d44 100644 --- a/service/mturk/api_op_UpdateExpirationForHIT.go +++ b/service/mturk/api_op_UpdateExpirationForHIT.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) UpdateExpirationForHIT(ctx context.Context, params *UpdateExpir addawsAwsjson11_serdeOpUpdateExpirationForHITMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_UpdateHITReviewStatus.go b/service/mturk/api_op_UpdateHITReviewStatus.go index 2afcd99429c..8fa2afce7d8 100644 --- a/service/mturk/api_op_UpdateHITReviewStatus.go +++ b/service/mturk/api_op_UpdateHITReviewStatus.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) UpdateHITReviewStatus(ctx context.Context, params *UpdateHITRev addawsAwsjson11_serdeOpUpdateHITReviewStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_UpdateHITTypeOfHIT.go b/service/mturk/api_op_UpdateHITTypeOfHIT.go index c92d5fc980b..84dacd55512 100644 --- a/service/mturk/api_op_UpdateHITTypeOfHIT.go +++ b/service/mturk/api_op_UpdateHITTypeOfHIT.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) UpdateHITTypeOfHIT(ctx context.Context, params *UpdateHITTypeOf addawsAwsjson11_serdeOpUpdateHITTypeOfHITMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_UpdateNotificationSettings.go b/service/mturk/api_op_UpdateNotificationSettings.go index 8ffd85f737b..3b0d89972ea 100644 --- a/service/mturk/api_op_UpdateNotificationSettings.go +++ b/service/mturk/api_op_UpdateNotificationSettings.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) UpdateNotificationSettings(ctx context.Context, params *UpdateN addawsAwsjson11_serdeOpUpdateNotificationSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/api_op_UpdateQualificationType.go b/service/mturk/api_op_UpdateQualificationType.go index 139d507fe96..8a193e8c961 100644 --- a/service/mturk/api_op_UpdateQualificationType.go +++ b/service/mturk/api_op_UpdateQualificationType.go @@ -5,7 +5,6 @@ package mturk import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/mturk/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) UpdateQualificationType(ctx context.Context, params *UpdateQual addawsAwsjson11_serdeOpUpdateQualificationTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/mturk/endpoints.go b/service/mturk/endpoints.go index fec30b243d5..0614a234911 100644 --- a/service/mturk/endpoints.go +++ b/service/mturk/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/neptune/api_client.go b/service/neptune/api_client.go index deb669bc3d0..1b2067ef8d4 100644 --- a/service/neptune/api_client.go +++ b/service/neptune/api_client.go @@ -94,30 +94,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -183,6 +159,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/neptune/api_op_AddRoleToDBCluster.go b/service/neptune/api_op_AddRoleToDBCluster.go index e550c0722e1..7ea858c774f 100644 --- a/service/neptune/api_op_AddRoleToDBCluster.go +++ b/service/neptune/api_op_AddRoleToDBCluster.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AddRoleToDBCluster(ctx context.Context, params *AddRoleToDBClus addawsAwsquery_serdeOpAddRoleToDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_AddSourceIdentifierToSubscription.go b/service/neptune/api_op_AddSourceIdentifierToSubscription.go index 92355983113..7a6b2ca0904 100644 --- a/service/neptune/api_op_AddSourceIdentifierToSubscription.go +++ b/service/neptune/api_op_AddSourceIdentifierToSubscription.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) AddSourceIdentifierToSubscription(ctx context.Context, params * addawsAwsquery_serdeOpAddSourceIdentifierToSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_AddTagsToResource.go b/service/neptune/api_op_AddTagsToResource.go index 4fd18ec9a2a..ff84b879373 100644 --- a/service/neptune/api_op_AddTagsToResource.go +++ b/service/neptune/api_op_AddTagsToResource.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) AddTagsToResource(ctx context.Context, params *AddTagsToResourc addawsAwsquery_serdeOpAddTagsToResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_ApplyPendingMaintenanceAction.go b/service/neptune/api_op_ApplyPendingMaintenanceAction.go index 4a0dd923836..c7177738d52 100644 --- a/service/neptune/api_op_ApplyPendingMaintenanceAction.go +++ b/service/neptune/api_op_ApplyPendingMaintenanceAction.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ApplyPendingMaintenanceAction(ctx context.Context, params *Appl addawsAwsquery_serdeOpApplyPendingMaintenanceActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_CopyDBClusterParameterGroup.go b/service/neptune/api_op_CopyDBClusterParameterGroup.go index 80aae9c0123..2b9562f7a1d 100644 --- a/service/neptune/api_op_CopyDBClusterParameterGroup.go +++ b/service/neptune/api_op_CopyDBClusterParameterGroup.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CopyDBClusterParameterGroup(ctx context.Context, params *CopyDB addawsAwsquery_serdeOpCopyDBClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_CopyDBClusterSnapshot.go b/service/neptune/api_op_CopyDBClusterSnapshot.go index 7139e252bde..fcb7c5dec6e 100644 --- a/service/neptune/api_op_CopyDBClusterSnapshot.go +++ b/service/neptune/api_op_CopyDBClusterSnapshot.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CopyDBClusterSnapshot(ctx context.Context, params *CopyDBCluste addawsAwsquery_serdeOpCopyDBClusterSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_CopyDBParameterGroup.go b/service/neptune/api_op_CopyDBParameterGroup.go index 0c5bab0b2dc..877a453b7de 100644 --- a/service/neptune/api_op_CopyDBParameterGroup.go +++ b/service/neptune/api_op_CopyDBParameterGroup.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CopyDBParameterGroup(ctx context.Context, params *CopyDBParamet addawsAwsquery_serdeOpCopyDBParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_CreateDBCluster.go b/service/neptune/api_op_CreateDBCluster.go index 2afa6423f48..8729aea522f 100644 --- a/service/neptune/api_op_CreateDBCluster.go +++ b/service/neptune/api_op_CreateDBCluster.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateDBCluster(ctx context.Context, params *CreateDBClusterInp addawsAwsquery_serdeOpCreateDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_CreateDBClusterParameterGroup.go b/service/neptune/api_op_CreateDBClusterParameterGroup.go index 200ad4aad61..418b4888e4d 100644 --- a/service/neptune/api_op_CreateDBClusterParameterGroup.go +++ b/service/neptune/api_op_CreateDBClusterParameterGroup.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) CreateDBClusterParameterGroup(ctx context.Context, params *Crea addawsAwsquery_serdeOpCreateDBClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_CreateDBClusterSnapshot.go b/service/neptune/api_op_CreateDBClusterSnapshot.go index 74fdbda78c3..8fc31e67548 100644 --- a/service/neptune/api_op_CreateDBClusterSnapshot.go +++ b/service/neptune/api_op_CreateDBClusterSnapshot.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDBClusterSnapshot(ctx context.Context, params *CreateDBCl addawsAwsquery_serdeOpCreateDBClusterSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_CreateDBInstance.go b/service/neptune/api_op_CreateDBInstance.go index 9a9192ee666..6d683254404 100644 --- a/service/neptune/api_op_CreateDBInstance.go +++ b/service/neptune/api_op_CreateDBInstance.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDBInstance(ctx context.Context, params *CreateDBInstanceI addawsAwsquery_serdeOpCreateDBInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_CreateDBParameterGroup.go b/service/neptune/api_op_CreateDBParameterGroup.go index d56975c46b3..66cebe8a25d 100644 --- a/service/neptune/api_op_CreateDBParameterGroup.go +++ b/service/neptune/api_op_CreateDBParameterGroup.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) CreateDBParameterGroup(ctx context.Context, params *CreateDBPar addawsAwsquery_serdeOpCreateDBParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_CreateDBSubnetGroup.go b/service/neptune/api_op_CreateDBSubnetGroup.go index 5e7ae43b03a..3a84f99d1a1 100644 --- a/service/neptune/api_op_CreateDBSubnetGroup.go +++ b/service/neptune/api_op_CreateDBSubnetGroup.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateDBSubnetGroup(ctx context.Context, params *CreateDBSubnet addawsAwsquery_serdeOpCreateDBSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_CreateEventSubscription.go b/service/neptune/api_op_CreateEventSubscription.go index e960c04c3d8..3e01b37b7d9 100644 --- a/service/neptune/api_op_CreateEventSubscription.go +++ b/service/neptune/api_op_CreateEventSubscription.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) CreateEventSubscription(ctx context.Context, params *CreateEven addawsAwsquery_serdeOpCreateEventSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DeleteDBCluster.go b/service/neptune/api_op_DeleteDBCluster.go index 3e88d1caed3..e94b593d992 100644 --- a/service/neptune/api_op_DeleteDBCluster.go +++ b/service/neptune/api_op_DeleteDBCluster.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DeleteDBCluster(ctx context.Context, params *DeleteDBClusterInp addawsAwsquery_serdeOpDeleteDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DeleteDBClusterParameterGroup.go b/service/neptune/api_op_DeleteDBClusterParameterGroup.go index 631b8f37a50..f51fcb20115 100644 --- a/service/neptune/api_op_DeleteDBClusterParameterGroup.go +++ b/service/neptune/api_op_DeleteDBClusterParameterGroup.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDBClusterParameterGroup(ctx context.Context, params *Dele addawsAwsquery_serdeOpDeleteDBClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DeleteDBClusterSnapshot.go b/service/neptune/api_op_DeleteDBClusterSnapshot.go index ae84f62300d..6beb34679fe 100644 --- a/service/neptune/api_op_DeleteDBClusterSnapshot.go +++ b/service/neptune/api_op_DeleteDBClusterSnapshot.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DeleteDBClusterSnapshot(ctx context.Context, params *DeleteDBCl addawsAwsquery_serdeOpDeleteDBClusterSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DeleteDBInstance.go b/service/neptune/api_op_DeleteDBInstance.go index f006aa215e1..6b8f6d5eac3 100644 --- a/service/neptune/api_op_DeleteDBInstance.go +++ b/service/neptune/api_op_DeleteDBInstance.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) DeleteDBInstance(ctx context.Context, params *DeleteDBInstanceI addawsAwsquery_serdeOpDeleteDBInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DeleteDBParameterGroup.go b/service/neptune/api_op_DeleteDBParameterGroup.go index a8bbff1ae91..10c35ee8077 100644 --- a/service/neptune/api_op_DeleteDBParameterGroup.go +++ b/service/neptune/api_op_DeleteDBParameterGroup.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDBParameterGroup(ctx context.Context, params *DeleteDBPar addawsAwsquery_serdeOpDeleteDBParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DeleteDBSubnetGroup.go b/service/neptune/api_op_DeleteDBSubnetGroup.go index 78a003c45ff..d98c8f4adcf 100644 --- a/service/neptune/api_op_DeleteDBSubnetGroup.go +++ b/service/neptune/api_op_DeleteDBSubnetGroup.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDBSubnetGroup(ctx context.Context, params *DeleteDBSubnet addawsAwsquery_serdeOpDeleteDBSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DeleteEventSubscription.go b/service/neptune/api_op_DeleteEventSubscription.go index c16b90c9e9b..f3076edfa0d 100644 --- a/service/neptune/api_op_DeleteEventSubscription.go +++ b/service/neptune/api_op_DeleteEventSubscription.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteEventSubscription(ctx context.Context, params *DeleteEven addawsAwsquery_serdeOpDeleteEventSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DescribeDBClusterParameterGroups.go b/service/neptune/api_op_DescribeDBClusterParameterGroups.go index 951883816dc..0c86d44a0da 100644 --- a/service/neptune/api_op_DescribeDBClusterParameterGroups.go +++ b/service/neptune/api_op_DescribeDBClusterParameterGroups.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeDBClusterParameterGroups(ctx context.Context, params *D addawsAwsquery_serdeOpDescribeDBClusterParameterGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DescribeDBClusterParameters.go b/service/neptune/api_op_DescribeDBClusterParameters.go index 1dce096bfeb..91997773d05 100644 --- a/service/neptune/api_op_DescribeDBClusterParameters.go +++ b/service/neptune/api_op_DescribeDBClusterParameters.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDBClusterParameters(ctx context.Context, params *Descri addawsAwsquery_serdeOpDescribeDBClusterParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DescribeDBClusterSnapshotAttributes.go b/service/neptune/api_op_DescribeDBClusterSnapshotAttributes.go index 77e50639a2e..8994a3ffc6d 100644 --- a/service/neptune/api_op_DescribeDBClusterSnapshotAttributes.go +++ b/service/neptune/api_op_DescribeDBClusterSnapshotAttributes.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) DescribeDBClusterSnapshotAttributes(ctx context.Context, params addawsAwsquery_serdeOpDescribeDBClusterSnapshotAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DescribeDBClusterSnapshots.go b/service/neptune/api_op_DescribeDBClusterSnapshots.go index f75e142924f..3e5be9f4457 100644 --- a/service/neptune/api_op_DescribeDBClusterSnapshots.go +++ b/service/neptune/api_op_DescribeDBClusterSnapshots.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDBClusterSnapshots(ctx context.Context, params *Describ addawsAwsquery_serdeOpDescribeDBClusterSnapshotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DescribeDBClusters.go b/service/neptune/api_op_DescribeDBClusters.go index 797b8755f33..bb83bf61989 100644 --- a/service/neptune/api_op_DescribeDBClusters.go +++ b/service/neptune/api_op_DescribeDBClusters.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeDBClusters(ctx context.Context, params *DescribeDBClust addawsAwsquery_serdeOpDescribeDBClustersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DescribeDBEngineVersions.go b/service/neptune/api_op_DescribeDBEngineVersions.go index c848e14dd8f..c977f3a6e7d 100644 --- a/service/neptune/api_op_DescribeDBEngineVersions.go +++ b/service/neptune/api_op_DescribeDBEngineVersions.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDBEngineVersions(ctx context.Context, params *DescribeD addawsAwsquery_serdeOpDescribeDBEngineVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DescribeDBInstances.go b/service/neptune/api_op_DescribeDBInstances.go index 54dc9cad801..bfa7ea26a40 100644 --- a/service/neptune/api_op_DescribeDBInstances.go +++ b/service/neptune/api_op_DescribeDBInstances.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeDBInstances(ctx context.Context, params *DescribeDBInst addawsAwsquery_serdeOpDescribeDBInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DescribeDBParameterGroups.go b/service/neptune/api_op_DescribeDBParameterGroups.go index c74b257eda5..3e9d42a12c5 100644 --- a/service/neptune/api_op_DescribeDBParameterGroups.go +++ b/service/neptune/api_op_DescribeDBParameterGroups.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeDBParameterGroups(ctx context.Context, params *Describe addawsAwsquery_serdeOpDescribeDBParameterGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DescribeDBParameters.go b/service/neptune/api_op_DescribeDBParameters.go index 6c4939e7723..6567f0af2af 100644 --- a/service/neptune/api_op_DescribeDBParameters.go +++ b/service/neptune/api_op_DescribeDBParameters.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDBParameters(ctx context.Context, params *DescribeDBPar addawsAwsquery_serdeOpDescribeDBParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DescribeDBSubnetGroups.go b/service/neptune/api_op_DescribeDBSubnetGroups.go index 462b180ab5e..bc7ea1dc2fc 100644 --- a/service/neptune/api_op_DescribeDBSubnetGroups.go +++ b/service/neptune/api_op_DescribeDBSubnetGroups.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeDBSubnetGroups(ctx context.Context, params *DescribeDBS addawsAwsquery_serdeOpDescribeDBSubnetGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DescribeEngineDefaultClusterParameters.go b/service/neptune/api_op_DescribeEngineDefaultClusterParameters.go index 8f1652d5307..8f58162e7f7 100644 --- a/service/neptune/api_op_DescribeEngineDefaultClusterParameters.go +++ b/service/neptune/api_op_DescribeEngineDefaultClusterParameters.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEngineDefaultClusterParameters(ctx context.Context, par addawsAwsquery_serdeOpDescribeEngineDefaultClusterParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DescribeEngineDefaultParameters.go b/service/neptune/api_op_DescribeEngineDefaultParameters.go index 0f3265605c7..6e5d4abdaf1 100644 --- a/service/neptune/api_op_DescribeEngineDefaultParameters.go +++ b/service/neptune/api_op_DescribeEngineDefaultParameters.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEngineDefaultParameters(ctx context.Context, params *De addawsAwsquery_serdeOpDescribeEngineDefaultParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DescribeEventCategories.go b/service/neptune/api_op_DescribeEventCategories.go index 60b08260f5a..6e1fefd38cf 100644 --- a/service/neptune/api_op_DescribeEventCategories.go +++ b/service/neptune/api_op_DescribeEventCategories.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEventCategories(ctx context.Context, params *DescribeEv addawsAwsquery_serdeOpDescribeEventCategoriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DescribeEventSubscriptions.go b/service/neptune/api_op_DescribeEventSubscriptions.go index 59f8e2ad0f9..c952551e2d0 100644 --- a/service/neptune/api_op_DescribeEventSubscriptions.go +++ b/service/neptune/api_op_DescribeEventSubscriptions.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeEventSubscriptions(ctx context.Context, params *Describ addawsAwsquery_serdeOpDescribeEventSubscriptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DescribeEvents.go b/service/neptune/api_op_DescribeEvents.go index d1b8364ae09..e2431292bb9 100644 --- a/service/neptune/api_op_DescribeEvents.go +++ b/service/neptune/api_op_DescribeEvents.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeEvents(ctx context.Context, params *DescribeEventsInput addawsAwsquery_serdeOpDescribeEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DescribeOrderableDBInstanceOptions.go b/service/neptune/api_op_DescribeOrderableDBInstanceOptions.go index 9805408b74d..2ffd3700b1e 100644 --- a/service/neptune/api_op_DescribeOrderableDBInstanceOptions.go +++ b/service/neptune/api_op_DescribeOrderableDBInstanceOptions.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeOrderableDBInstanceOptions(ctx context.Context, params addawsAwsquery_serdeOpDescribeOrderableDBInstanceOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DescribePendingMaintenanceActions.go b/service/neptune/api_op_DescribePendingMaintenanceActions.go index f0199449592..ddd76958b20 100644 --- a/service/neptune/api_op_DescribePendingMaintenanceActions.go +++ b/service/neptune/api_op_DescribePendingMaintenanceActions.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribePendingMaintenanceActions(ctx context.Context, params * addawsAwsquery_serdeOpDescribePendingMaintenanceActionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_DescribeValidDBInstanceModifications.go b/service/neptune/api_op_DescribeValidDBInstanceModifications.go index c957ff03d27..5f3807dcd3b 100644 --- a/service/neptune/api_op_DescribeValidDBInstanceModifications.go +++ b/service/neptune/api_op_DescribeValidDBInstanceModifications.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeValidDBInstanceModifications(ctx context.Context, param addawsAwsquery_serdeOpDescribeValidDBInstanceModificationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_FailoverDBCluster.go b/service/neptune/api_op_FailoverDBCluster.go index 428c6c59306..ffbd07f2547 100644 --- a/service/neptune/api_op_FailoverDBCluster.go +++ b/service/neptune/api_op_FailoverDBCluster.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) FailoverDBCluster(ctx context.Context, params *FailoverDBCluste addawsAwsquery_serdeOpFailoverDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_ListTagsForResource.go b/service/neptune/api_op_ListTagsForResource.go index 4cea08efd80..2b057153b61 100644 --- a/service/neptune/api_op_ListTagsForResource.go +++ b/service/neptune/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsquery_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_ModifyDBCluster.go b/service/neptune/api_op_ModifyDBCluster.go index d0db3136b8a..51046702253 100644 --- a/service/neptune/api_op_ModifyDBCluster.go +++ b/service/neptune/api_op_ModifyDBCluster.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ModifyDBCluster(ctx context.Context, params *ModifyDBClusterInp addawsAwsquery_serdeOpModifyDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_ModifyDBClusterParameterGroup.go b/service/neptune/api_op_ModifyDBClusterParameterGroup.go index 189891bd38a..6235e96c21e 100644 --- a/service/neptune/api_op_ModifyDBClusterParameterGroup.go +++ b/service/neptune/api_op_ModifyDBClusterParameterGroup.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) ModifyDBClusterParameterGroup(ctx context.Context, params *Modi addawsAwsquery_serdeOpModifyDBClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_ModifyDBClusterSnapshotAttribute.go b/service/neptune/api_op_ModifyDBClusterSnapshotAttribute.go index 38fc1eb5477..1f5647eae32 100644 --- a/service/neptune/api_op_ModifyDBClusterSnapshotAttribute.go +++ b/service/neptune/api_op_ModifyDBClusterSnapshotAttribute.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) ModifyDBClusterSnapshotAttribute(ctx context.Context, params *M addawsAwsquery_serdeOpModifyDBClusterSnapshotAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_ModifyDBInstance.go b/service/neptune/api_op_ModifyDBInstance.go index d4cbe01aefc..9773ca5fba7 100644 --- a/service/neptune/api_op_ModifyDBInstance.go +++ b/service/neptune/api_op_ModifyDBInstance.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ModifyDBInstance(ctx context.Context, params *ModifyDBInstanceI addawsAwsquery_serdeOpModifyDBInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_ModifyDBParameterGroup.go b/service/neptune/api_op_ModifyDBParameterGroup.go index 57e7c6037c2..3821bea7f65 100644 --- a/service/neptune/api_op_ModifyDBParameterGroup.go +++ b/service/neptune/api_op_ModifyDBParameterGroup.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) ModifyDBParameterGroup(ctx context.Context, params *ModifyDBPar addawsAwsquery_serdeOpModifyDBParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_ModifyDBSubnetGroup.go b/service/neptune/api_op_ModifyDBSubnetGroup.go index 422bca85af8..fb844e22770 100644 --- a/service/neptune/api_op_ModifyDBSubnetGroup.go +++ b/service/neptune/api_op_ModifyDBSubnetGroup.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ModifyDBSubnetGroup(ctx context.Context, params *ModifyDBSubnet addawsAwsquery_serdeOpModifyDBSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_ModifyEventSubscription.go b/service/neptune/api_op_ModifyEventSubscription.go index b926945c24f..072e7af5bcf 100644 --- a/service/neptune/api_op_ModifyEventSubscription.go +++ b/service/neptune/api_op_ModifyEventSubscription.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ModifyEventSubscription(ctx context.Context, params *ModifyEven addawsAwsquery_serdeOpModifyEventSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_PromoteReadReplicaDBCluster.go b/service/neptune/api_op_PromoteReadReplicaDBCluster.go index 9828a6096fc..791822cbfb4 100644 --- a/service/neptune/api_op_PromoteReadReplicaDBCluster.go +++ b/service/neptune/api_op_PromoteReadReplicaDBCluster.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PromoteReadReplicaDBCluster(ctx context.Context, params *Promot addawsAwsquery_serdeOpPromoteReadReplicaDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_RebootDBInstance.go b/service/neptune/api_op_RebootDBInstance.go index 46aa3b79e63..52632183361 100644 --- a/service/neptune/api_op_RebootDBInstance.go +++ b/service/neptune/api_op_RebootDBInstance.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) RebootDBInstance(ctx context.Context, params *RebootDBInstanceI addawsAwsquery_serdeOpRebootDBInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_RemoveRoleFromDBCluster.go b/service/neptune/api_op_RemoveRoleFromDBCluster.go index 051b7f15791..52cbc168521 100644 --- a/service/neptune/api_op_RemoveRoleFromDBCluster.go +++ b/service/neptune/api_op_RemoveRoleFromDBCluster.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RemoveRoleFromDBCluster(ctx context.Context, params *RemoveRole addawsAwsquery_serdeOpRemoveRoleFromDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_RemoveSourceIdentifierFromSubscription.go b/service/neptune/api_op_RemoveSourceIdentifierFromSubscription.go index 8e8362aefd8..e8211800cf6 100644 --- a/service/neptune/api_op_RemoveSourceIdentifierFromSubscription.go +++ b/service/neptune/api_op_RemoveSourceIdentifierFromSubscription.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RemoveSourceIdentifierFromSubscription(ctx context.Context, par addawsAwsquery_serdeOpRemoveSourceIdentifierFromSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_RemoveTagsFromResource.go b/service/neptune/api_op_RemoveTagsFromResource.go index 2224cc3ab57..30c5d8ed2a7 100644 --- a/service/neptune/api_op_RemoveTagsFromResource.go +++ b/service/neptune/api_op_RemoveTagsFromResource.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RemoveTagsFromResource(ctx context.Context, params *RemoveTagsF addawsAwsquery_serdeOpRemoveTagsFromResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_ResetDBClusterParameterGroup.go b/service/neptune/api_op_ResetDBClusterParameterGroup.go index 4b42a25e183..3cadf9b897f 100644 --- a/service/neptune/api_op_ResetDBClusterParameterGroup.go +++ b/service/neptune/api_op_ResetDBClusterParameterGroup.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) ResetDBClusterParameterGroup(ctx context.Context, params *Reset addawsAwsquery_serdeOpResetDBClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_ResetDBParameterGroup.go b/service/neptune/api_op_ResetDBParameterGroup.go index 51a3a4a303a..1543af1eb72 100644 --- a/service/neptune/api_op_ResetDBParameterGroup.go +++ b/service/neptune/api_op_ResetDBParameterGroup.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ResetDBParameterGroup(ctx context.Context, params *ResetDBParam addawsAwsquery_serdeOpResetDBParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_RestoreDBClusterFromSnapshot.go b/service/neptune/api_op_RestoreDBClusterFromSnapshot.go index adeec021622..3bd7dfca4ef 100644 --- a/service/neptune/api_op_RestoreDBClusterFromSnapshot.go +++ b/service/neptune/api_op_RestoreDBClusterFromSnapshot.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) RestoreDBClusterFromSnapshot(ctx context.Context, params *Resto addawsAwsquery_serdeOpRestoreDBClusterFromSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_RestoreDBClusterToPointInTime.go b/service/neptune/api_op_RestoreDBClusterToPointInTime.go index 588bf499cfd..5e0e190dd58 100644 --- a/service/neptune/api_op_RestoreDBClusterToPointInTime.go +++ b/service/neptune/api_op_RestoreDBClusterToPointInTime.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) RestoreDBClusterToPointInTime(ctx context.Context, params *Rest addawsAwsquery_serdeOpRestoreDBClusterToPointInTimeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_StartDBCluster.go b/service/neptune/api_op_StartDBCluster.go index 44fe0960a97..2697bb263e1 100644 --- a/service/neptune/api_op_StartDBCluster.go +++ b/service/neptune/api_op_StartDBCluster.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) StartDBCluster(ctx context.Context, params *StartDBClusterInput addawsAwsquery_serdeOpStartDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/api_op_StopDBCluster.go b/service/neptune/api_op_StopDBCluster.go index 9ad85e142bf..17cebe3dab3 100644 --- a/service/neptune/api_op_StopDBCluster.go +++ b/service/neptune/api_op_StopDBCluster.go @@ -5,7 +5,6 @@ package neptune import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/neptune/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) StopDBCluster(ctx context.Context, params *StopDBClusterInput, addawsAwsquery_serdeOpStopDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/neptune/endpoints.go b/service/neptune/endpoints.go index 587c1bfe01a..60d06cd797e 100644 --- a/service/neptune/endpoints.go +++ b/service/neptune/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/networkmanager/api_client.go b/service/networkmanager/api_client.go index 8084140f26d..91e7f72ac33 100644 --- a/service/networkmanager/api_client.go +++ b/service/networkmanager/api_client.go @@ -79,30 +79,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -168,6 +144,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/networkmanager/api_op_AssociateCustomerGateway.go b/service/networkmanager/api_op_AssociateCustomerGateway.go index 1a887cf9c4a..21727bd5a95 100644 --- a/service/networkmanager/api_op_AssociateCustomerGateway.go +++ b/service/networkmanager/api_op_AssociateCustomerGateway.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) AssociateCustomerGateway(ctx context.Context, params *Associate addawsRestjson1_serdeOpAssociateCustomerGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_AssociateLink.go b/service/networkmanager/api_op_AssociateLink.go index 2d1503314fa..bbb0be14f9f 100644 --- a/service/networkmanager/api_op_AssociateLink.go +++ b/service/networkmanager/api_op_AssociateLink.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) AssociateLink(ctx context.Context, params *AssociateLinkInput, addawsRestjson1_serdeOpAssociateLinkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_CreateDevice.go b/service/networkmanager/api_op_CreateDevice.go index 64e88714521..36a08e89149 100644 --- a/service/networkmanager/api_op_CreateDevice.go +++ b/service/networkmanager/api_op_CreateDevice.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateDevice(ctx context.Context, params *CreateDeviceInput, op addawsRestjson1_serdeOpCreateDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_CreateGlobalNetwork.go b/service/networkmanager/api_op_CreateGlobalNetwork.go index b68654fc96c..b37d86ca5cb 100644 --- a/service/networkmanager/api_op_CreateGlobalNetwork.go +++ b/service/networkmanager/api_op_CreateGlobalNetwork.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateGlobalNetwork(ctx context.Context, params *CreateGlobalNe addawsRestjson1_serdeOpCreateGlobalNetworkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_CreateLink.go b/service/networkmanager/api_op_CreateLink.go index 8680e6190c7..0227e3f576e 100644 --- a/service/networkmanager/api_op_CreateLink.go +++ b/service/networkmanager/api_op_CreateLink.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateLink(ctx context.Context, params *CreateLinkInput, optFns addawsRestjson1_serdeOpCreateLinkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_CreateSite.go b/service/networkmanager/api_op_CreateSite.go index 6f3d1b3bf02..fd6eccbad96 100644 --- a/service/networkmanager/api_op_CreateSite.go +++ b/service/networkmanager/api_op_CreateSite.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateSite(ctx context.Context, params *CreateSiteInput, optFns addawsRestjson1_serdeOpCreateSiteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_DeleteDevice.go b/service/networkmanager/api_op_DeleteDevice.go index a9942a1383c..2a8c93cf85e 100644 --- a/service/networkmanager/api_op_DeleteDevice.go +++ b/service/networkmanager/api_op_DeleteDevice.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteDevice(ctx context.Context, params *DeleteDeviceInput, op addawsRestjson1_serdeOpDeleteDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_DeleteGlobalNetwork.go b/service/networkmanager/api_op_DeleteGlobalNetwork.go index 36cf3ff36e1..61a9d1f32ba 100644 --- a/service/networkmanager/api_op_DeleteGlobalNetwork.go +++ b/service/networkmanager/api_op_DeleteGlobalNetwork.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteGlobalNetwork(ctx context.Context, params *DeleteGlobalNe addawsRestjson1_serdeOpDeleteGlobalNetworkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_DeleteLink.go b/service/networkmanager/api_op_DeleteLink.go index 3c6d3f3ca1c..06aebdf16ce 100644 --- a/service/networkmanager/api_op_DeleteLink.go +++ b/service/networkmanager/api_op_DeleteLink.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteLink(ctx context.Context, params *DeleteLinkInput, optFns addawsRestjson1_serdeOpDeleteLinkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_DeleteSite.go b/service/networkmanager/api_op_DeleteSite.go index 76ee703d85a..e984af1d58a 100644 --- a/service/networkmanager/api_op_DeleteSite.go +++ b/service/networkmanager/api_op_DeleteSite.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteSite(ctx context.Context, params *DeleteSiteInput, optFns addawsRestjson1_serdeOpDeleteSiteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_DeregisterTransitGateway.go b/service/networkmanager/api_op_DeregisterTransitGateway.go index 9aa2bf62882..45f87c843ff 100644 --- a/service/networkmanager/api_op_DeregisterTransitGateway.go +++ b/service/networkmanager/api_op_DeregisterTransitGateway.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DeregisterTransitGateway(ctx context.Context, params *Deregiste addawsRestjson1_serdeOpDeregisterTransitGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_DescribeGlobalNetworks.go b/service/networkmanager/api_op_DescribeGlobalNetworks.go index 50e148fee7d..7de2677bea2 100644 --- a/service/networkmanager/api_op_DescribeGlobalNetworks.go +++ b/service/networkmanager/api_op_DescribeGlobalNetworks.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeGlobalNetworks(ctx context.Context, params *DescribeGlo addawsRestjson1_serdeOpDescribeGlobalNetworksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_DisassociateCustomerGateway.go b/service/networkmanager/api_op_DisassociateCustomerGateway.go index 7a7d3d751a9..b07a899e4e4 100644 --- a/service/networkmanager/api_op_DisassociateCustomerGateway.go +++ b/service/networkmanager/api_op_DisassociateCustomerGateway.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DisassociateCustomerGateway(ctx context.Context, params *Disass addawsRestjson1_serdeOpDisassociateCustomerGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_DisassociateLink.go b/service/networkmanager/api_op_DisassociateLink.go index 4102e657302..63cfa88721c 100644 --- a/service/networkmanager/api_op_DisassociateLink.go +++ b/service/networkmanager/api_op_DisassociateLink.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DisassociateLink(ctx context.Context, params *DisassociateLinkI addawsRestjson1_serdeOpDisassociateLinkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_GetCustomerGatewayAssociations.go b/service/networkmanager/api_op_GetCustomerGatewayAssociations.go index 8f28d9261c6..fa03ba6f785 100644 --- a/service/networkmanager/api_op_GetCustomerGatewayAssociations.go +++ b/service/networkmanager/api_op_GetCustomerGatewayAssociations.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetCustomerGatewayAssociations(ctx context.Context, params *Get addawsRestjson1_serdeOpGetCustomerGatewayAssociationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_GetDevices.go b/service/networkmanager/api_op_GetDevices.go index 1bca44f8edb..11e88c74907 100644 --- a/service/networkmanager/api_op_GetDevices.go +++ b/service/networkmanager/api_op_GetDevices.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDevices(ctx context.Context, params *GetDevicesInput, optFns addawsRestjson1_serdeOpGetDevicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_GetLinkAssociations.go b/service/networkmanager/api_op_GetLinkAssociations.go index e0338aa5afc..b47f2cd3c29 100644 --- a/service/networkmanager/api_op_GetLinkAssociations.go +++ b/service/networkmanager/api_op_GetLinkAssociations.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetLinkAssociations(ctx context.Context, params *GetLinkAssocia addawsRestjson1_serdeOpGetLinkAssociationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_GetLinks.go b/service/networkmanager/api_op_GetLinks.go index ea126c55909..5d46e5a2d62 100644 --- a/service/networkmanager/api_op_GetLinks.go +++ b/service/networkmanager/api_op_GetLinks.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetLinks(ctx context.Context, params *GetLinksInput, optFns ... addawsRestjson1_serdeOpGetLinksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_GetSites.go b/service/networkmanager/api_op_GetSites.go index 5d02be63eaa..bf163025065 100644 --- a/service/networkmanager/api_op_GetSites.go +++ b/service/networkmanager/api_op_GetSites.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetSites(ctx context.Context, params *GetSitesInput, optFns ... addawsRestjson1_serdeOpGetSitesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_GetTransitGatewayRegistrations.go b/service/networkmanager/api_op_GetTransitGatewayRegistrations.go index ffa5d16b758..6857b2bb509 100644 --- a/service/networkmanager/api_op_GetTransitGatewayRegistrations.go +++ b/service/networkmanager/api_op_GetTransitGatewayRegistrations.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetTransitGatewayRegistrations(ctx context.Context, params *Get addawsRestjson1_serdeOpGetTransitGatewayRegistrationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_ListTagsForResource.go b/service/networkmanager/api_op_ListTagsForResource.go index f6232f479bc..0f92ba6e0fe 100644 --- a/service/networkmanager/api_op_ListTagsForResource.go +++ b/service/networkmanager/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_RegisterTransitGateway.go b/service/networkmanager/api_op_RegisterTransitGateway.go index 10a9dd7bd63..8ea8d00fe45 100644 --- a/service/networkmanager/api_op_RegisterTransitGateway.go +++ b/service/networkmanager/api_op_RegisterTransitGateway.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) RegisterTransitGateway(ctx context.Context, params *RegisterTra addawsRestjson1_serdeOpRegisterTransitGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_TagResource.go b/service/networkmanager/api_op_TagResource.go index bd379627671..8cf8f894fc9 100644 --- a/service/networkmanager/api_op_TagResource.go +++ b/service/networkmanager/api_op_TagResource.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_UntagResource.go b/service/networkmanager/api_op_UntagResource.go index 28fc9208cd9..353f4d76e79 100644 --- a/service/networkmanager/api_op_UntagResource.go +++ b/service/networkmanager/api_op_UntagResource.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_UpdateDevice.go b/service/networkmanager/api_op_UpdateDevice.go index 79aeec609ac..a8dcbd574c0 100644 --- a/service/networkmanager/api_op_UpdateDevice.go +++ b/service/networkmanager/api_op_UpdateDevice.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateDevice(ctx context.Context, params *UpdateDeviceInput, op addawsRestjson1_serdeOpUpdateDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_UpdateGlobalNetwork.go b/service/networkmanager/api_op_UpdateGlobalNetwork.go index 7b106bc7406..bf648f00751 100644 --- a/service/networkmanager/api_op_UpdateGlobalNetwork.go +++ b/service/networkmanager/api_op_UpdateGlobalNetwork.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateGlobalNetwork(ctx context.Context, params *UpdateGlobalNe addawsRestjson1_serdeOpUpdateGlobalNetworkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_UpdateLink.go b/service/networkmanager/api_op_UpdateLink.go index f2c4bcc0e81..be12497e231 100644 --- a/service/networkmanager/api_op_UpdateLink.go +++ b/service/networkmanager/api_op_UpdateLink.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateLink(ctx context.Context, params *UpdateLinkInput, optFns addawsRestjson1_serdeOpUpdateLinkMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/api_op_UpdateSite.go b/service/networkmanager/api_op_UpdateSite.go index 9e19ecf16bd..81a41a77c6e 100644 --- a/service/networkmanager/api_op_UpdateSite.go +++ b/service/networkmanager/api_op_UpdateSite.go @@ -5,7 +5,6 @@ package networkmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/networkmanager/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateSite(ctx context.Context, params *UpdateSiteInput, optFns addawsRestjson1_serdeOpUpdateSiteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/networkmanager/endpoints.go b/service/networkmanager/endpoints.go index 696edce6938..227318c99c3 100644 --- a/service/networkmanager/endpoints.go +++ b/service/networkmanager/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/opsworks/api_client.go b/service/opsworks/api_client.go index 082c473a958..87f7b2da5fe 100644 --- a/service/opsworks/api_client.go +++ b/service/opsworks/api_client.go @@ -127,30 +127,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -216,6 +192,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/opsworks/api_op_AssignInstance.go b/service/opsworks/api_op_AssignInstance.go index 53c40b2b072..a233e1c65c3 100644 --- a/service/opsworks/api_op_AssignInstance.go +++ b/service/opsworks/api_op_AssignInstance.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -38,9 +37,9 @@ func (c *Client) AssignInstance(ctx context.Context, params *AssignInstanceInput addawsAwsjson11_serdeOpAssignInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_AssignVolume.go b/service/opsworks/api_op_AssignVolume.go index 61a13ae8c73..d70a209e98a 100644 --- a/service/opsworks/api_op_AssignVolume.go +++ b/service/opsworks/api_op_AssignVolume.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) AssignVolume(ctx context.Context, params *AssignVolumeInput, op addawsAwsjson11_serdeOpAssignVolumeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_AssociateElasticIp.go b/service/opsworks/api_op_AssociateElasticIp.go index bc226abbcd5..d684ac0b938 100644 --- a/service/opsworks/api_op_AssociateElasticIp.go +++ b/service/opsworks/api_op_AssociateElasticIp.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) AssociateElasticIp(ctx context.Context, params *AssociateElasti addawsAwsjson11_serdeOpAssociateElasticIpMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_AttachElasticLoadBalancer.go b/service/opsworks/api_op_AttachElasticLoadBalancer.go index 7c171a5cdca..c89ed4ab884 100644 --- a/service/opsworks/api_op_AttachElasticLoadBalancer.go +++ b/service/opsworks/api_op_AttachElasticLoadBalancer.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) AttachElasticLoadBalancer(ctx context.Context, params *AttachEl addawsAwsjson11_serdeOpAttachElasticLoadBalancerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_CloneStack.go b/service/opsworks/api_op_CloneStack.go index 3e51f4ab0cf..fec86abd664 100644 --- a/service/opsworks/api_op_CloneStack.go +++ b/service/opsworks/api_op_CloneStack.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CloneStack(ctx context.Context, params *CloneStackInput, optFns addawsAwsjson11_serdeOpCloneStackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_CreateApp.go b/service/opsworks/api_op_CreateApp.go index 85a44e9b236..9eb1805e22e 100644 --- a/service/opsworks/api_op_CreateApp.go +++ b/service/opsworks/api_op_CreateApp.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateApp(ctx context.Context, params *CreateAppInput, optFns . addawsAwsjson11_serdeOpCreateAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_CreateDeployment.go b/service/opsworks/api_op_CreateDeployment.go index 64a11adb366..f5c395cd3a9 100644 --- a/service/opsworks/api_op_CreateDeployment.go +++ b/service/opsworks/api_op_CreateDeployment.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateDeployment(ctx context.Context, params *CreateDeploymentI addawsAwsjson11_serdeOpCreateDeploymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_CreateInstance.go b/service/opsworks/api_op_CreateInstance.go index c7199a3c083..bda46c446f1 100644 --- a/service/opsworks/api_op_CreateInstance.go +++ b/service/opsworks/api_op_CreateInstance.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateInstance(ctx context.Context, params *CreateInstanceInput addawsAwsjson11_serdeOpCreateInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_CreateLayer.go b/service/opsworks/api_op_CreateLayer.go index 3ef4201afec..68005935f7c 100644 --- a/service/opsworks/api_op_CreateLayer.go +++ b/service/opsworks/api_op_CreateLayer.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) CreateLayer(ctx context.Context, params *CreateLayerInput, optF addawsAwsjson11_serdeOpCreateLayerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_CreateStack.go b/service/opsworks/api_op_CreateStack.go index 12b05433213..7fed1fe26dc 100644 --- a/service/opsworks/api_op_CreateStack.go +++ b/service/opsworks/api_op_CreateStack.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateStack(ctx context.Context, params *CreateStackInput, optF addawsAwsjson11_serdeOpCreateStackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_CreateUserProfile.go b/service/opsworks/api_op_CreateUserProfile.go index 105d16e3bb9..ff8ac8c3a1b 100644 --- a/service/opsworks/api_op_CreateUserProfile.go +++ b/service/opsworks/api_op_CreateUserProfile.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) CreateUserProfile(ctx context.Context, params *CreateUserProfil addawsAwsjson11_serdeOpCreateUserProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DeleteApp.go b/service/opsworks/api_op_DeleteApp.go index b969fce3d33..617c3f1ff54 100644 --- a/service/opsworks/api_op_DeleteApp.go +++ b/service/opsworks/api_op_DeleteApp.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteApp(ctx context.Context, params *DeleteAppInput, optFns . addawsAwsjson11_serdeOpDeleteAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DeleteInstance.go b/service/opsworks/api_op_DeleteInstance.go index 3400675a5c4..c9905499d58 100644 --- a/service/opsworks/api_op_DeleteInstance.go +++ b/service/opsworks/api_op_DeleteInstance.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) DeleteInstance(ctx context.Context, params *DeleteInstanceInput addawsAwsjson11_serdeOpDeleteInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DeleteLayer.go b/service/opsworks/api_op_DeleteLayer.go index f34fa489388..522b21d748f 100644 --- a/service/opsworks/api_op_DeleteLayer.go +++ b/service/opsworks/api_op_DeleteLayer.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) DeleteLayer(ctx context.Context, params *DeleteLayerInput, optF addawsAwsjson11_serdeOpDeleteLayerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DeleteStack.go b/service/opsworks/api_op_DeleteStack.go index b7a5d23f747..79f7632b12c 100644 --- a/service/opsworks/api_op_DeleteStack.go +++ b/service/opsworks/api_op_DeleteStack.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DeleteStack(ctx context.Context, params *DeleteStackInput, optF addawsAwsjson11_serdeOpDeleteStackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DeleteUserProfile.go b/service/opsworks/api_op_DeleteUserProfile.go index 1b91de3dffd..f1737cb4c7c 100644 --- a/service/opsworks/api_op_DeleteUserProfile.go +++ b/service/opsworks/api_op_DeleteUserProfile.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteUserProfile(ctx context.Context, params *DeleteUserProfil addawsAwsjson11_serdeOpDeleteUserProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DeregisterEcsCluster.go b/service/opsworks/api_op_DeregisterEcsCluster.go index 57ef7dc14c5..e84460ece17 100644 --- a/service/opsworks/api_op_DeregisterEcsCluster.go +++ b/service/opsworks/api_op_DeregisterEcsCluster.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DeregisterEcsCluster(ctx context.Context, params *DeregisterEcs addawsAwsjson11_serdeOpDeregisterEcsClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DeregisterElasticIp.go b/service/opsworks/api_op_DeregisterElasticIp.go index 9d08609738e..e8dc5dcd911 100644 --- a/service/opsworks/api_op_DeregisterElasticIp.go +++ b/service/opsworks/api_op_DeregisterElasticIp.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeregisterElasticIp(ctx context.Context, params *DeregisterElas addawsAwsjson11_serdeOpDeregisterElasticIpMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DeregisterInstance.go b/service/opsworks/api_op_DeregisterInstance.go index bd334cf2bb8..9cc20a26a9d 100644 --- a/service/opsworks/api_op_DeregisterInstance.go +++ b/service/opsworks/api_op_DeregisterInstance.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeregisterInstance(ctx context.Context, params *DeregisterInsta addawsAwsjson11_serdeOpDeregisterInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DeregisterRdsDbInstance.go b/service/opsworks/api_op_DeregisterRdsDbInstance.go index 007172a45e6..a20ebb75ec2 100644 --- a/service/opsworks/api_op_DeregisterRdsDbInstance.go +++ b/service/opsworks/api_op_DeregisterRdsDbInstance.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeregisterRdsDbInstance(ctx context.Context, params *Deregister addawsAwsjson11_serdeOpDeregisterRdsDbInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DeregisterVolume.go b/service/opsworks/api_op_DeregisterVolume.go index dff3a9dafe5..5e555ca8d3d 100644 --- a/service/opsworks/api_op_DeregisterVolume.go +++ b/service/opsworks/api_op_DeregisterVolume.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeregisterVolume(ctx context.Context, params *DeregisterVolumeI addawsAwsjson11_serdeOpDeregisterVolumeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeAgentVersions.go b/service/opsworks/api_op_DescribeAgentVersions.go index ff9f624e379..bfb65d8ee17 100644 --- a/service/opsworks/api_op_DescribeAgentVersions.go +++ b/service/opsworks/api_op_DescribeAgentVersions.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeAgentVersions(ctx context.Context, params *DescribeAgen addawsAwsjson11_serdeOpDescribeAgentVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeApps.go b/service/opsworks/api_op_DescribeApps.go index 5d79b9cd28d..6fa2e8fd346 100644 --- a/service/opsworks/api_op_DescribeApps.go +++ b/service/opsworks/api_op_DescribeApps.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeApps(ctx context.Context, params *DescribeAppsInput, op addawsAwsjson11_serdeOpDescribeAppsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeCommands.go b/service/opsworks/api_op_DescribeCommands.go index 44aaddef7db..c9427896aa8 100644 --- a/service/opsworks/api_op_DescribeCommands.go +++ b/service/opsworks/api_op_DescribeCommands.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeCommands(ctx context.Context, params *DescribeCommandsI addawsAwsjson11_serdeOpDescribeCommandsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeDeployments.go b/service/opsworks/api_op_DescribeDeployments.go index 37a4561467f..be12cd361c5 100644 --- a/service/opsworks/api_op_DescribeDeployments.go +++ b/service/opsworks/api_op_DescribeDeployments.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeDeployments(ctx context.Context, params *DescribeDeploy addawsAwsjson11_serdeOpDescribeDeploymentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeEcsClusters.go b/service/opsworks/api_op_DescribeEcsClusters.go index 1337c8f90a6..4f7810380d0 100644 --- a/service/opsworks/api_op_DescribeEcsClusters.go +++ b/service/opsworks/api_op_DescribeEcsClusters.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DescribeEcsClusters(ctx context.Context, params *DescribeEcsClu addawsAwsjson11_serdeOpDescribeEcsClustersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeElasticIps.go b/service/opsworks/api_op_DescribeElasticIps.go index 294924695c2..bd527b63c8b 100644 --- a/service/opsworks/api_op_DescribeElasticIps.go +++ b/service/opsworks/api_op_DescribeElasticIps.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeElasticIps(ctx context.Context, params *DescribeElastic addawsAwsjson11_serdeOpDescribeElasticIpsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeElasticLoadBalancers.go b/service/opsworks/api_op_DescribeElasticLoadBalancers.go index 1774f55fb2c..272300c67ef 100644 --- a/service/opsworks/api_op_DescribeElasticLoadBalancers.go +++ b/service/opsworks/api_op_DescribeElasticLoadBalancers.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeElasticLoadBalancers(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribeElasticLoadBalancersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeInstances.go b/service/opsworks/api_op_DescribeInstances.go index 47440b33bcb..f04102548c3 100644 --- a/service/opsworks/api_op_DescribeInstances.go +++ b/service/opsworks/api_op_DescribeInstances.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeInstances(ctx context.Context, params *DescribeInstance addawsAwsjson11_serdeOpDescribeInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeLayers.go b/service/opsworks/api_op_DescribeLayers.go index 2556aa2d1ee..2c9b16a5292 100644 --- a/service/opsworks/api_op_DescribeLayers.go +++ b/service/opsworks/api_op_DescribeLayers.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeLayers(ctx context.Context, params *DescribeLayersInput addawsAwsjson11_serdeOpDescribeLayersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeLoadBasedAutoScaling.go b/service/opsworks/api_op_DescribeLoadBasedAutoScaling.go index 9678da54892..1cd5b14686e 100644 --- a/service/opsworks/api_op_DescribeLoadBasedAutoScaling.go +++ b/service/opsworks/api_op_DescribeLoadBasedAutoScaling.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeLoadBasedAutoScaling(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribeLoadBasedAutoScalingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeMyUserProfile.go b/service/opsworks/api_op_DescribeMyUserProfile.go index 8a170187282..2a61bc237cc 100644 --- a/service/opsworks/api_op_DescribeMyUserProfile.go +++ b/service/opsworks/api_op_DescribeMyUserProfile.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeMyUserProfile(ctx context.Context, params *DescribeMyUs addawsAwsjson11_serdeOpDescribeMyUserProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeOperatingSystems.go b/service/opsworks/api_op_DescribeOperatingSystems.go index 69234433acf..e309365fd00 100644 --- a/service/opsworks/api_op_DescribeOperatingSystems.go +++ b/service/opsworks/api_op_DescribeOperatingSystems.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeOperatingSystems(ctx context.Context, params *DescribeO addawsAwsjson11_serdeOpDescribeOperatingSystemsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribePermissions.go b/service/opsworks/api_op_DescribePermissions.go index 5e8ccea9447..ca0f7958d31 100644 --- a/service/opsworks/api_op_DescribePermissions.go +++ b/service/opsworks/api_op_DescribePermissions.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribePermissions(ctx context.Context, params *DescribePermis addawsAwsjson11_serdeOpDescribePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeRaidArrays.go b/service/opsworks/api_op_DescribeRaidArrays.go index 2949736b708..aeb20a8a3bd 100644 --- a/service/opsworks/api_op_DescribeRaidArrays.go +++ b/service/opsworks/api_op_DescribeRaidArrays.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeRaidArrays(ctx context.Context, params *DescribeRaidArr addawsAwsjson11_serdeOpDescribeRaidArraysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeRdsDbInstances.go b/service/opsworks/api_op_DescribeRdsDbInstances.go index 48e09f150a2..22fff2635b3 100644 --- a/service/opsworks/api_op_DescribeRdsDbInstances.go +++ b/service/opsworks/api_op_DescribeRdsDbInstances.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeRdsDbInstances(ctx context.Context, params *DescribeRds addawsAwsjson11_serdeOpDescribeRdsDbInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeServiceErrors.go b/service/opsworks/api_op_DescribeServiceErrors.go index d2a2cef4793..336c9cad2c2 100644 --- a/service/opsworks/api_op_DescribeServiceErrors.go +++ b/service/opsworks/api_op_DescribeServiceErrors.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeServiceErrors(ctx context.Context, params *DescribeServ addawsAwsjson11_serdeOpDescribeServiceErrorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeStackProvisioningParameters.go b/service/opsworks/api_op_DescribeStackProvisioningParameters.go index 90fee6d7690..065a2d8d00c 100644 --- a/service/opsworks/api_op_DescribeStackProvisioningParameters.go +++ b/service/opsworks/api_op_DescribeStackProvisioningParameters.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DescribeStackProvisioningParameters(ctx context.Context, params addawsAwsjson11_serdeOpDescribeStackProvisioningParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeStackSummary.go b/service/opsworks/api_op_DescribeStackSummary.go index d6780d51fa9..9c951e5183b 100644 --- a/service/opsworks/api_op_DescribeStackSummary.go +++ b/service/opsworks/api_op_DescribeStackSummary.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeStackSummary(ctx context.Context, params *DescribeStack addawsAwsjson11_serdeOpDescribeStackSummaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeStacks.go b/service/opsworks/api_op_DescribeStacks.go index 67202c7fbed..640cd8a1d63 100644 --- a/service/opsworks/api_op_DescribeStacks.go +++ b/service/opsworks/api_op_DescribeStacks.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeStacks(ctx context.Context, params *DescribeStacksInput addawsAwsjson11_serdeOpDescribeStacksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeTimeBasedAutoScaling.go b/service/opsworks/api_op_DescribeTimeBasedAutoScaling.go index 78eb15673e8..a71be049ec7 100644 --- a/service/opsworks/api_op_DescribeTimeBasedAutoScaling.go +++ b/service/opsworks/api_op_DescribeTimeBasedAutoScaling.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeTimeBasedAutoScaling(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribeTimeBasedAutoScalingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeUserProfiles.go b/service/opsworks/api_op_DescribeUserProfiles.go index 8e519d58a05..205e3d7ff99 100644 --- a/service/opsworks/api_op_DescribeUserProfiles.go +++ b/service/opsworks/api_op_DescribeUserProfiles.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeUserProfiles(ctx context.Context, params *DescribeUserP addawsAwsjson11_serdeOpDescribeUserProfilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DescribeVolumes.go b/service/opsworks/api_op_DescribeVolumes.go index b56a8e5316e..8437a3bd4e0 100644 --- a/service/opsworks/api_op_DescribeVolumes.go +++ b/service/opsworks/api_op_DescribeVolumes.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeVolumes(ctx context.Context, params *DescribeVolumesInp addawsAwsjson11_serdeOpDescribeVolumesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DetachElasticLoadBalancer.go b/service/opsworks/api_op_DetachElasticLoadBalancer.go index 0ed25b38ddd..f0c194bb3ca 100644 --- a/service/opsworks/api_op_DetachElasticLoadBalancer.go +++ b/service/opsworks/api_op_DetachElasticLoadBalancer.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DetachElasticLoadBalancer(ctx context.Context, params *DetachEl addawsAwsjson11_serdeOpDetachElasticLoadBalancerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_DisassociateElasticIp.go b/service/opsworks/api_op_DisassociateElasticIp.go index 848769be718..cb4c49126a8 100644 --- a/service/opsworks/api_op_DisassociateElasticIp.go +++ b/service/opsworks/api_op_DisassociateElasticIp.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DisassociateElasticIp(ctx context.Context, params *Disassociate addawsAwsjson11_serdeOpDisassociateElasticIpMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_GetHostnameSuggestion.go b/service/opsworks/api_op_GetHostnameSuggestion.go index 67039b9a1e8..18cfb631e56 100644 --- a/service/opsworks/api_op_GetHostnameSuggestion.go +++ b/service/opsworks/api_op_GetHostnameSuggestion.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) GetHostnameSuggestion(ctx context.Context, params *GetHostnameS addawsAwsjson11_serdeOpGetHostnameSuggestionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_GrantAccess.go b/service/opsworks/api_op_GrantAccess.go index b53c10b89b5..f3f3a6abd6e 100644 --- a/service/opsworks/api_op_GrantAccess.go +++ b/service/opsworks/api_op_GrantAccess.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GrantAccess(ctx context.Context, params *GrantAccessInput, optF addawsAwsjson11_serdeOpGrantAccessMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_ListTags.go b/service/opsworks/api_op_ListTags.go index cab329dc574..da8f27d91af 100644 --- a/service/opsworks/api_op_ListTags.go +++ b/service/opsworks/api_op_ListTags.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTags(ctx context.Context, params *ListTagsInput, optFns ... addawsAwsjson11_serdeOpListTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_RebootInstance.go b/service/opsworks/api_op_RebootInstance.go index b7a210c2244..3163bd023b8 100644 --- a/service/opsworks/api_op_RebootInstance.go +++ b/service/opsworks/api_op_RebootInstance.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) RebootInstance(ctx context.Context, params *RebootInstanceInput addawsAwsjson11_serdeOpRebootInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_RegisterEcsCluster.go b/service/opsworks/api_op_RegisterEcsCluster.go index 46e1d24fa55..ba10e2904a0 100644 --- a/service/opsworks/api_op_RegisterEcsCluster.go +++ b/service/opsworks/api_op_RegisterEcsCluster.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) RegisterEcsCluster(ctx context.Context, params *RegisterEcsClus addawsAwsjson11_serdeOpRegisterEcsClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_RegisterElasticIp.go b/service/opsworks/api_op_RegisterElasticIp.go index eecab43c111..4488fc6959c 100644 --- a/service/opsworks/api_op_RegisterElasticIp.go +++ b/service/opsworks/api_op_RegisterElasticIp.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) RegisterElasticIp(ctx context.Context, params *RegisterElasticI addawsAwsjson11_serdeOpRegisterElasticIpMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_RegisterInstance.go b/service/opsworks/api_op_RegisterInstance.go index bde01edc7ac..9e94c953868 100644 --- a/service/opsworks/api_op_RegisterInstance.go +++ b/service/opsworks/api_op_RegisterInstance.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) RegisterInstance(ctx context.Context, params *RegisterInstanceI addawsAwsjson11_serdeOpRegisterInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_RegisterRdsDbInstance.go b/service/opsworks/api_op_RegisterRdsDbInstance.go index 5c14b1e030c..29496bfb7fa 100644 --- a/service/opsworks/api_op_RegisterRdsDbInstance.go +++ b/service/opsworks/api_op_RegisterRdsDbInstance.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) RegisterRdsDbInstance(ctx context.Context, params *RegisterRdsD addawsAwsjson11_serdeOpRegisterRdsDbInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_RegisterVolume.go b/service/opsworks/api_op_RegisterVolume.go index 9e8faab24d6..b971afe3701 100644 --- a/service/opsworks/api_op_RegisterVolume.go +++ b/service/opsworks/api_op_RegisterVolume.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) RegisterVolume(ctx context.Context, params *RegisterVolumeInput addawsAwsjson11_serdeOpRegisterVolumeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_SetLoadBasedAutoScaling.go b/service/opsworks/api_op_SetLoadBasedAutoScaling.go index bc2aa768161..fa2a3a80883 100644 --- a/service/opsworks/api_op_SetLoadBasedAutoScaling.go +++ b/service/opsworks/api_op_SetLoadBasedAutoScaling.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) SetLoadBasedAutoScaling(ctx context.Context, params *SetLoadBas addawsAwsjson11_serdeOpSetLoadBasedAutoScalingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_SetPermission.go b/service/opsworks/api_op_SetPermission.go index ef3018db8d4..b263ac8701e 100644 --- a/service/opsworks/api_op_SetPermission.go +++ b/service/opsworks/api_op_SetPermission.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) SetPermission(ctx context.Context, params *SetPermissionInput, addawsAwsjson11_serdeOpSetPermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_SetTimeBasedAutoScaling.go b/service/opsworks/api_op_SetTimeBasedAutoScaling.go index 0690ab503d4..37a3a97ef1b 100644 --- a/service/opsworks/api_op_SetTimeBasedAutoScaling.go +++ b/service/opsworks/api_op_SetTimeBasedAutoScaling.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) SetTimeBasedAutoScaling(ctx context.Context, params *SetTimeBas addawsAwsjson11_serdeOpSetTimeBasedAutoScalingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_StartInstance.go b/service/opsworks/api_op_StartInstance.go index 301be344209..4673585c077 100644 --- a/service/opsworks/api_op_StartInstance.go +++ b/service/opsworks/api_op_StartInstance.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) StartInstance(ctx context.Context, params *StartInstanceInput, addawsAwsjson11_serdeOpStartInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_StartStack.go b/service/opsworks/api_op_StartStack.go index a7994dab169..90f42ae090f 100644 --- a/service/opsworks/api_op_StartStack.go +++ b/service/opsworks/api_op_StartStack.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) StartStack(ctx context.Context, params *StartStackInput, optFns addawsAwsjson11_serdeOpStartStackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_StopInstance.go b/service/opsworks/api_op_StopInstance.go index 5c0b22f11b9..987c28ec0df 100644 --- a/service/opsworks/api_op_StopInstance.go +++ b/service/opsworks/api_op_StopInstance.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) StopInstance(ctx context.Context, params *StopInstanceInput, op addawsAwsjson11_serdeOpStopInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_StopStack.go b/service/opsworks/api_op_StopStack.go index 82797a76a74..c24c7594f2b 100644 --- a/service/opsworks/api_op_StopStack.go +++ b/service/opsworks/api_op_StopStack.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) StopStack(ctx context.Context, params *StopStackInput, optFns . addawsAwsjson11_serdeOpStopStackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_TagResource.go b/service/opsworks/api_op_TagResource.go index 00146a89819..e8f081f2ff3 100644 --- a/service/opsworks/api_op_TagResource.go +++ b/service/opsworks/api_op_TagResource.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_UnassignInstance.go b/service/opsworks/api_op_UnassignInstance.go index 421f392de51..f6f4d45d4f3 100644 --- a/service/opsworks/api_op_UnassignInstance.go +++ b/service/opsworks/api_op_UnassignInstance.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) UnassignInstance(ctx context.Context, params *UnassignInstanceI addawsAwsjson11_serdeOpUnassignInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_UnassignVolume.go b/service/opsworks/api_op_UnassignVolume.go index dfa408f53f8..699f926bd17 100644 --- a/service/opsworks/api_op_UnassignVolume.go +++ b/service/opsworks/api_op_UnassignVolume.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) UnassignVolume(ctx context.Context, params *UnassignVolumeInput addawsAwsjson11_serdeOpUnassignVolumeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_UntagResource.go b/service/opsworks/api_op_UntagResource.go index f6fba80f2cc..e108b6b4f17 100644 --- a/service/opsworks/api_op_UntagResource.go +++ b/service/opsworks/api_op_UntagResource.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_UpdateApp.go b/service/opsworks/api_op_UpdateApp.go index e832e92afa3..127e75bb88e 100644 --- a/service/opsworks/api_op_UpdateApp.go +++ b/service/opsworks/api_op_UpdateApp.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateApp(ctx context.Context, params *UpdateAppInput, optFns . addawsAwsjson11_serdeOpUpdateAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_UpdateElasticIp.go b/service/opsworks/api_op_UpdateElasticIp.go index f6614986d91..b745320311e 100644 --- a/service/opsworks/api_op_UpdateElasticIp.go +++ b/service/opsworks/api_op_UpdateElasticIp.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) UpdateElasticIp(ctx context.Context, params *UpdateElasticIpInp addawsAwsjson11_serdeOpUpdateElasticIpMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_UpdateInstance.go b/service/opsworks/api_op_UpdateInstance.go index c1b00460539..b1fbe67aff3 100644 --- a/service/opsworks/api_op_UpdateInstance.go +++ b/service/opsworks/api_op_UpdateInstance.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateInstance(ctx context.Context, params *UpdateInstanceInput addawsAwsjson11_serdeOpUpdateInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_UpdateLayer.go b/service/opsworks/api_op_UpdateLayer.go index 82af19c3c8f..30703d33ab0 100644 --- a/service/opsworks/api_op_UpdateLayer.go +++ b/service/opsworks/api_op_UpdateLayer.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateLayer(ctx context.Context, params *UpdateLayerInput, optF addawsAwsjson11_serdeOpUpdateLayerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_UpdateMyUserProfile.go b/service/opsworks/api_op_UpdateMyUserProfile.go index 89f317447b1..385333096a9 100644 --- a/service/opsworks/api_op_UpdateMyUserProfile.go +++ b/service/opsworks/api_op_UpdateMyUserProfile.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) UpdateMyUserProfile(ctx context.Context, params *UpdateMyUserPr addawsAwsjson11_serdeOpUpdateMyUserProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_UpdateRdsDbInstance.go b/service/opsworks/api_op_UpdateRdsDbInstance.go index f2da3a1412c..cf7992dc3f5 100644 --- a/service/opsworks/api_op_UpdateRdsDbInstance.go +++ b/service/opsworks/api_op_UpdateRdsDbInstance.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) UpdateRdsDbInstance(ctx context.Context, params *UpdateRdsDbIns addawsAwsjson11_serdeOpUpdateRdsDbInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_UpdateStack.go b/service/opsworks/api_op_UpdateStack.go index 3f902edccd9..739959825b1 100644 --- a/service/opsworks/api_op_UpdateStack.go +++ b/service/opsworks/api_op_UpdateStack.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworks/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateStack(ctx context.Context, params *UpdateStackInput, optF addawsAwsjson11_serdeOpUpdateStackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_UpdateUserProfile.go b/service/opsworks/api_op_UpdateUserProfile.go index f0a893b19b2..8ba196c0452 100644 --- a/service/opsworks/api_op_UpdateUserProfile.go +++ b/service/opsworks/api_op_UpdateUserProfile.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) UpdateUserProfile(ctx context.Context, params *UpdateUserProfil addawsAwsjson11_serdeOpUpdateUserProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/api_op_UpdateVolume.go b/service/opsworks/api_op_UpdateVolume.go index 5f126a43042..85a0bdc89d6 100644 --- a/service/opsworks/api_op_UpdateVolume.go +++ b/service/opsworks/api_op_UpdateVolume.go @@ -5,7 +5,6 @@ package opsworks import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) UpdateVolume(ctx context.Context, params *UpdateVolumeInput, op addawsAwsjson11_serdeOpUpdateVolumeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworks/endpoints.go b/service/opsworks/endpoints.go index 9a6825e31b6..0c2774ffa2a 100644 --- a/service/opsworks/endpoints.go +++ b/service/opsworks/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/opsworkscm/api_client.go b/service/opsworkscm/api_client.go index 3a8a46e75ea..b81bc6623ca 100644 --- a/service/opsworkscm/api_client.go +++ b/service/opsworkscm/api_client.go @@ -145,30 +145,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -234,6 +210,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/opsworkscm/api_op_AssociateNode.go b/service/opsworkscm/api_op_AssociateNode.go index af749ef512d..f9e07c5de1a 100644 --- a/service/opsworkscm/api_op_AssociateNode.go +++ b/service/opsworkscm/api_op_AssociateNode.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworkscm/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) AssociateNode(ctx context.Context, params *AssociateNodeInput, addawsAwsjson11_serdeOpAssociateNodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/api_op_CreateBackup.go b/service/opsworkscm/api_op_CreateBackup.go index 7a19bdf89e6..4da6a9cc9ac 100644 --- a/service/opsworkscm/api_op_CreateBackup.go +++ b/service/opsworkscm/api_op_CreateBackup.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworkscm/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateBackup(ctx context.Context, params *CreateBackupInput, op addawsAwsjson11_serdeOpCreateBackupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/api_op_CreateServer.go b/service/opsworkscm/api_op_CreateServer.go index 4511f9b4e78..f8616343515 100644 --- a/service/opsworkscm/api_op_CreateServer.go +++ b/service/opsworkscm/api_op_CreateServer.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworkscm/types" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) CreateServer(ctx context.Context, params *CreateServerInput, op addawsAwsjson11_serdeOpCreateServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/api_op_DeleteBackup.go b/service/opsworkscm/api_op_DeleteBackup.go index 3d045621ce9..a3c4c125148 100644 --- a/service/opsworkscm/api_op_DeleteBackup.go +++ b/service/opsworkscm/api_op_DeleteBackup.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteBackup(ctx context.Context, params *DeleteBackupInput, op addawsAwsjson11_serdeOpDeleteBackupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/api_op_DeleteServer.go b/service/opsworkscm/api_op_DeleteServer.go index 555c18cb52f..4c03cd43e65 100644 --- a/service/opsworkscm/api_op_DeleteServer.go +++ b/service/opsworkscm/api_op_DeleteServer.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DeleteServer(ctx context.Context, params *DeleteServerInput, op addawsAwsjson11_serdeOpDeleteServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/api_op_DescribeAccountAttributes.go b/service/opsworkscm/api_op_DescribeAccountAttributes.go index e646777aae7..084b5629e6d 100644 --- a/service/opsworkscm/api_op_DescribeAccountAttributes.go +++ b/service/opsworkscm/api_op_DescribeAccountAttributes.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworkscm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeAccountAttributes(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeAccountAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/api_op_DescribeBackups.go b/service/opsworkscm/api_op_DescribeBackups.go index f52fdb8ffa8..a6ffda1d913 100644 --- a/service/opsworkscm/api_op_DescribeBackups.go +++ b/service/opsworkscm/api_op_DescribeBackups.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworkscm/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeBackups(ctx context.Context, params *DescribeBackupsInp addawsAwsjson11_serdeOpDescribeBackupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/api_op_DescribeEvents.go b/service/opsworkscm/api_op_DescribeEvents.go index 00c5f46ba44..e64be9a4e32 100644 --- a/service/opsworkscm/api_op_DescribeEvents.go +++ b/service/opsworkscm/api_op_DescribeEvents.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworkscm/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeEvents(ctx context.Context, params *DescribeEventsInput addawsAwsjson11_serdeOpDescribeEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/api_op_DescribeNodeAssociationStatus.go b/service/opsworkscm/api_op_DescribeNodeAssociationStatus.go index 6122e571824..bfe4fcdd504 100644 --- a/service/opsworkscm/api_op_DescribeNodeAssociationStatus.go +++ b/service/opsworkscm/api_op_DescribeNodeAssociationStatus.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworkscm/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeNodeAssociationStatus(ctx context.Context, params *Desc addawsAwsjson11_serdeOpDescribeNodeAssociationStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/api_op_DescribeServers.go b/service/opsworkscm/api_op_DescribeServers.go index b08ec26922b..642806765ab 100644 --- a/service/opsworkscm/api_op_DescribeServers.go +++ b/service/opsworkscm/api_op_DescribeServers.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworkscm/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeServers(ctx context.Context, params *DescribeServersInp addawsAwsjson11_serdeOpDescribeServersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/api_op_DisassociateNode.go b/service/opsworkscm/api_op_DisassociateNode.go index 7c2953e9aaf..f0b1987469a 100644 --- a/service/opsworkscm/api_op_DisassociateNode.go +++ b/service/opsworkscm/api_op_DisassociateNode.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworkscm/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DisassociateNode(ctx context.Context, params *DisassociateNodeI addawsAwsjson11_serdeOpDisassociateNodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/api_op_ExportServerEngineAttribute.go b/service/opsworkscm/api_op_ExportServerEngineAttribute.go index 398dc65b473..e4d7a5e6ff7 100644 --- a/service/opsworkscm/api_op_ExportServerEngineAttribute.go +++ b/service/opsworkscm/api_op_ExportServerEngineAttribute.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworkscm/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ExportServerEngineAttribute(ctx context.Context, params *Export addawsAwsjson11_serdeOpExportServerEngineAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/api_op_ListTagsForResource.go b/service/opsworkscm/api_op_ListTagsForResource.go index a9679ad9db8..56a334c7f52 100644 --- a/service/opsworkscm/api_op_ListTagsForResource.go +++ b/service/opsworkscm/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworkscm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/api_op_RestoreServer.go b/service/opsworkscm/api_op_RestoreServer.go index 59ef620a577..101862ceff1 100644 --- a/service/opsworkscm/api_op_RestoreServer.go +++ b/service/opsworkscm/api_op_RestoreServer.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -34,9 +33,9 @@ func (c *Client) RestoreServer(ctx context.Context, params *RestoreServerInput, addawsAwsjson11_serdeOpRestoreServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/api_op_StartMaintenance.go b/service/opsworkscm/api_op_StartMaintenance.go index 0e918e5cebc..a9601615e98 100644 --- a/service/opsworkscm/api_op_StartMaintenance.go +++ b/service/opsworkscm/api_op_StartMaintenance.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworkscm/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) StartMaintenance(ctx context.Context, params *StartMaintenanceI addawsAwsjson11_serdeOpStartMaintenanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/api_op_TagResource.go b/service/opsworkscm/api_op_TagResource.go index 588fa14e3cf..b87d3ddf99f 100644 --- a/service/opsworkscm/api_op_TagResource.go +++ b/service/opsworkscm/api_op_TagResource.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworkscm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/api_op_UntagResource.go b/service/opsworkscm/api_op_UntagResource.go index 56826836724..669e103ad00 100644 --- a/service/opsworkscm/api_op_UntagResource.go +++ b/service/opsworkscm/api_op_UntagResource.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/api_op_UpdateServer.go b/service/opsworkscm/api_op_UpdateServer.go index 75fdd6c48ad..fa712fab27a 100644 --- a/service/opsworkscm/api_op_UpdateServer.go +++ b/service/opsworkscm/api_op_UpdateServer.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworkscm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateServer(ctx context.Context, params *UpdateServerInput, op addawsAwsjson11_serdeOpUpdateServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/api_op_UpdateServerEngineAttributes.go b/service/opsworkscm/api_op_UpdateServerEngineAttributes.go index 22d1b31b85a..f0f2cad4d60 100644 --- a/service/opsworkscm/api_op_UpdateServerEngineAttributes.go +++ b/service/opsworkscm/api_op_UpdateServerEngineAttributes.go @@ -5,7 +5,6 @@ package opsworkscm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/opsworkscm/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) UpdateServerEngineAttributes(ctx context.Context, params *Updat addawsAwsjson11_serdeOpUpdateServerEngineAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/opsworkscm/endpoints.go b/service/opsworkscm/endpoints.go index 1037ee744ff..cc8430edd22 100644 --- a/service/opsworkscm/endpoints.go +++ b/service/opsworkscm/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/organizations/api_client.go b/service/organizations/api_client.go index c17726479ec..7bc1e20a572 100644 --- a/service/organizations/api_client.go +++ b/service/organizations/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/organizations/api_op_AcceptHandshake.go b/service/organizations/api_op_AcceptHandshake.go index f92fa3ce046..8ce4bb8f5dd 100644 --- a/service/organizations/api_op_AcceptHandshake.go +++ b/service/organizations/api_op_AcceptHandshake.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -51,9 +50,9 @@ func (c *Client) AcceptHandshake(ctx context.Context, params *AcceptHandshakeInp addawsAwsjson11_serdeOpAcceptHandshakeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_AttachPolicy.go b/service/organizations/api_op_AttachPolicy.go index f7644077c11..2fb4e7229c4 100644 --- a/service/organizations/api_op_AttachPolicy.go +++ b/service/organizations/api_op_AttachPolicy.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -43,9 +42,9 @@ func (c *Client) AttachPolicy(ctx context.Context, params *AttachPolicyInput, op addawsAwsjson11_serdeOpAttachPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_CancelHandshake.go b/service/organizations/api_op_CancelHandshake.go index 6c8d56b581b..8d1f7f3f057 100644 --- a/service/organizations/api_op_CancelHandshake.go +++ b/service/organizations/api_op_CancelHandshake.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CancelHandshake(ctx context.Context, params *CancelHandshakeInp addawsAwsjson11_serdeOpCancelHandshakeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_CreateAccount.go b/service/organizations/api_op_CreateAccount.go index a67846b974e..b69e56a6ba8 100644 --- a/service/organizations/api_op_CreateAccount.go +++ b/service/organizations/api_op_CreateAccount.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -92,9 +91,9 @@ func (c *Client) CreateAccount(ctx context.Context, params *CreateAccountInput, addawsAwsjson11_serdeOpCreateAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_CreateGovCloudAccount.go b/service/organizations/api_op_CreateGovCloudAccount.go index e5ae4f0b90b..325c51be040 100644 --- a/service/organizations/api_op_CreateGovCloudAccount.go +++ b/service/organizations/api_op_CreateGovCloudAccount.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -127,9 +126,9 @@ func (c *Client) CreateGovCloudAccount(ctx context.Context, params *CreateGovClo addawsAwsjson11_serdeOpCreateGovCloudAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_CreateOrganization.go b/service/organizations/api_op_CreateOrganization.go index 095a549b5f6..53398d54597 100644 --- a/service/organizations/api_op_CreateOrganization.go +++ b/service/organizations/api_op_CreateOrganization.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) CreateOrganization(ctx context.Context, params *CreateOrganizat addawsAwsjson11_serdeOpCreateOrganizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_CreateOrganizationalUnit.go b/service/organizations/api_op_CreateOrganizationalUnit.go index e29de148aba..18345c5ec84 100644 --- a/service/organizations/api_op_CreateOrganizationalUnit.go +++ b/service/organizations/api_op_CreateOrganizationalUnit.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateOrganizationalUnit(ctx context.Context, params *CreateOrg addawsAwsjson11_serdeOpCreateOrganizationalUnitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_CreatePolicy.go b/service/organizations/api_op_CreatePolicy.go index 1f511a0f97e..7d7d311a5df 100644 --- a/service/organizations/api_op_CreatePolicy.go +++ b/service/organizations/api_op_CreatePolicy.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreatePolicy(ctx context.Context, params *CreatePolicyInput, op addawsAwsjson11_serdeOpCreatePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_DeclineHandshake.go b/service/organizations/api_op_DeclineHandshake.go index f4df444c37f..d9eef635666 100644 --- a/service/organizations/api_op_DeclineHandshake.go +++ b/service/organizations/api_op_DeclineHandshake.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DeclineHandshake(ctx context.Context, params *DeclineHandshakeI addawsAwsjson11_serdeOpDeclineHandshakeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_DeleteOrganization.go b/service/organizations/api_op_DeleteOrganization.go index a0d654bfa18..c373d803227 100644 --- a/service/organizations/api_op_DeleteOrganization.go +++ b/service/organizations/api_op_DeleteOrganization.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteOrganization(ctx context.Context, params *DeleteOrganizat addawsAwsjson11_serdeOpDeleteOrganizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_DeleteOrganizationalUnit.go b/service/organizations/api_op_DeleteOrganizationalUnit.go index 45844092273..0ee17b3ad64 100644 --- a/service/organizations/api_op_DeleteOrganizationalUnit.go +++ b/service/organizations/api_op_DeleteOrganizationalUnit.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteOrganizationalUnit(ctx context.Context, params *DeleteOrg addawsAwsjson11_serdeOpDeleteOrganizationalUnitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_DeletePolicy.go b/service/organizations/api_op_DeletePolicy.go index c3439bd3581..b2c224ab078 100644 --- a/service/organizations/api_op_DeletePolicy.go +++ b/service/organizations/api_op_DeletePolicy.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeletePolicy(ctx context.Context, params *DeletePolicyInput, op addawsAwsjson11_serdeOpDeletePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_DeregisterDelegatedAdministrator.go b/service/organizations/api_op_DeregisterDelegatedAdministrator.go index 1b3e5f9e41f..17fd6a706da 100644 --- a/service/organizations/api_op_DeregisterDelegatedAdministrator.go +++ b/service/organizations/api_op_DeregisterDelegatedAdministrator.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) DeregisterDelegatedAdministrator(ctx context.Context, params *D addawsAwsjson11_serdeOpDeregisterDelegatedAdministratorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_DescribeAccount.go b/service/organizations/api_op_DescribeAccount.go index 3adaf1bdf80..085017261a6 100644 --- a/service/organizations/api_op_DescribeAccount.go +++ b/service/organizations/api_op_DescribeAccount.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeAccount(ctx context.Context, params *DescribeAccountInp addawsAwsjson11_serdeOpDescribeAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_DescribeCreateAccountStatus.go b/service/organizations/api_op_DescribeCreateAccountStatus.go index 05876ff0e60..d2491cca020 100644 --- a/service/organizations/api_op_DescribeCreateAccountStatus.go +++ b/service/organizations/api_op_DescribeCreateAccountStatus.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeCreateAccountStatus(ctx context.Context, params *Descri addawsAwsjson11_serdeOpDescribeCreateAccountStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_DescribeEffectivePolicy.go b/service/organizations/api_op_DescribeEffectivePolicy.go index bd95d17e4cd..deeeec0789f 100644 --- a/service/organizations/api_op_DescribeEffectivePolicy.go +++ b/service/organizations/api_op_DescribeEffectivePolicy.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) DescribeEffectivePolicy(ctx context.Context, params *DescribeEf addawsAwsjson11_serdeOpDescribeEffectivePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_DescribeHandshake.go b/service/organizations/api_op_DescribeHandshake.go index b6fb9254efe..ee5830a934f 100644 --- a/service/organizations/api_op_DescribeHandshake.go +++ b/service/organizations/api_op_DescribeHandshake.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeHandshake(ctx context.Context, params *DescribeHandshak addawsAwsjson11_serdeOpDescribeHandshakeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_DescribeOrganization.go b/service/organizations/api_op_DescribeOrganization.go index 7d767b5a723..9873d19aaa6 100644 --- a/service/organizations/api_op_DescribeOrganization.go +++ b/service/organizations/api_op_DescribeOrganization.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeOrganization(ctx context.Context, params *DescribeOrgan addawsAwsjson11_serdeOpDescribeOrganizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_DescribeOrganizationalUnit.go b/service/organizations/api_op_DescribeOrganizationalUnit.go index 165918c63a7..a1b39786999 100644 --- a/service/organizations/api_op_DescribeOrganizationalUnit.go +++ b/service/organizations/api_op_DescribeOrganizationalUnit.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeOrganizationalUnit(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeOrganizationalUnitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_DescribePolicy.go b/service/organizations/api_op_DescribePolicy.go index 3c2f0acecad..359e42b17ab 100644 --- a/service/organizations/api_op_DescribePolicy.go +++ b/service/organizations/api_op_DescribePolicy.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribePolicy(ctx context.Context, params *DescribePolicyInput addawsAwsjson11_serdeOpDescribePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_DetachPolicy.go b/service/organizations/api_op_DetachPolicy.go index d99d69c581d..089706bdffc 100644 --- a/service/organizations/api_op_DetachPolicy.go +++ b/service/organizations/api_op_DetachPolicy.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -36,9 +35,9 @@ func (c *Client) DetachPolicy(ctx context.Context, params *DetachPolicyInput, op addawsAwsjson11_serdeOpDetachPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_DisableAWSServiceAccess.go b/service/organizations/api_op_DisableAWSServiceAccess.go index 436d2341dce..85145970b40 100644 --- a/service/organizations/api_op_DisableAWSServiceAccess.go +++ b/service/organizations/api_op_DisableAWSServiceAccess.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -44,9 +43,9 @@ func (c *Client) DisableAWSServiceAccess(ctx context.Context, params *DisableAWS addawsAwsjson11_serdeOpDisableAWSServiceAccessMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_DisablePolicyType.go b/service/organizations/api_op_DisablePolicyType.go index 267e4794a2c..8c9383f6e8e 100644 --- a/service/organizations/api_op_DisablePolicyType.go +++ b/service/organizations/api_op_DisablePolicyType.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) DisablePolicyType(ctx context.Context, params *DisablePolicyTyp addawsAwsjson11_serdeOpDisablePolicyTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_EnableAWSServiceAccess.go b/service/organizations/api_op_EnableAWSServiceAccess.go index a00dd8471c8..78bfb001803 100644 --- a/service/organizations/api_op_EnableAWSServiceAccess.go +++ b/service/organizations/api_op_EnableAWSServiceAccess.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -40,9 +39,9 @@ func (c *Client) EnableAWSServiceAccess(ctx context.Context, params *EnableAWSSe addawsAwsjson11_serdeOpEnableAWSServiceAccessMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_EnableAllFeatures.go b/service/organizations/api_op_EnableAllFeatures.go index 9525479ab1f..fb1401ac84b 100644 --- a/service/organizations/api_op_EnableAllFeatures.go +++ b/service/organizations/api_op_EnableAllFeatures.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) EnableAllFeatures(ctx context.Context, params *EnableAllFeature addawsAwsjson11_serdeOpEnableAllFeaturesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_EnablePolicyType.go b/service/organizations/api_op_EnablePolicyType.go index c5bd7f56544..eca2c741257 100644 --- a/service/organizations/api_op_EnablePolicyType.go +++ b/service/organizations/api_op_EnablePolicyType.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) EnablePolicyType(ctx context.Context, params *EnablePolicyTypeI addawsAwsjson11_serdeOpEnablePolicyTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_InviteAccountToOrganization.go b/service/organizations/api_op_InviteAccountToOrganization.go index 81b7075858b..a6ccdd37fe4 100644 --- a/service/organizations/api_op_InviteAccountToOrganization.go +++ b/service/organizations/api_op_InviteAccountToOrganization.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) InviteAccountToOrganization(ctx context.Context, params *Invite addawsAwsjson11_serdeOpInviteAccountToOrganizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_LeaveOrganization.go b/service/organizations/api_op_LeaveOrganization.go index 4193a5aa290..71145471e9d 100644 --- a/service/organizations/api_op_LeaveOrganization.go +++ b/service/organizations/api_op_LeaveOrganization.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -63,9 +62,9 @@ func (c *Client) LeaveOrganization(ctx context.Context, params *LeaveOrganizatio addawsAwsjson11_serdeOpLeaveOrganizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_ListAWSServiceAccessForOrganization.go b/service/organizations/api_op_ListAWSServiceAccessForOrganization.go index 3cc96543ed9..30a575937b2 100644 --- a/service/organizations/api_op_ListAWSServiceAccessForOrganization.go +++ b/service/organizations/api_op_ListAWSServiceAccessForOrganization.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) ListAWSServiceAccessForOrganization(ctx context.Context, params addawsAwsjson11_serdeOpListAWSServiceAccessForOrganizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_ListAccounts.go b/service/organizations/api_op_ListAccounts.go index 2be49d5226c..7d91fd54590 100644 --- a/service/organizations/api_op_ListAccounts.go +++ b/service/organizations/api_op_ListAccounts.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) ListAccounts(ctx context.Context, params *ListAccountsInput, op addawsAwsjson11_serdeOpListAccountsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_ListAccountsForParent.go b/service/organizations/api_op_ListAccountsForParent.go index f4ad11b9497..2689030163a 100644 --- a/service/organizations/api_op_ListAccountsForParent.go +++ b/service/organizations/api_op_ListAccountsForParent.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) ListAccountsForParent(ctx context.Context, params *ListAccounts addawsAwsjson11_serdeOpListAccountsForParentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_ListChildren.go b/service/organizations/api_op_ListChildren.go index 06e57a6d6a8..cd1fe16aa0f 100644 --- a/service/organizations/api_op_ListChildren.go +++ b/service/organizations/api_op_ListChildren.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) ListChildren(ctx context.Context, params *ListChildrenInput, op addawsAwsjson11_serdeOpListChildrenMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_ListCreateAccountStatus.go b/service/organizations/api_op_ListCreateAccountStatus.go index 7a4692143cd..8ffc6645c04 100644 --- a/service/organizations/api_op_ListCreateAccountStatus.go +++ b/service/organizations/api_op_ListCreateAccountStatus.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListCreateAccountStatus(ctx context.Context, params *ListCreate addawsAwsjson11_serdeOpListCreateAccountStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_ListDelegatedAdministrators.go b/service/organizations/api_op_ListDelegatedAdministrators.go index 98eb0b18700..fcf6eb70171 100644 --- a/service/organizations/api_op_ListDelegatedAdministrators.go +++ b/service/organizations/api_op_ListDelegatedAdministrators.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListDelegatedAdministrators(ctx context.Context, params *ListDe addawsAwsjson11_serdeOpListDelegatedAdministratorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_ListDelegatedServicesForAccount.go b/service/organizations/api_op_ListDelegatedServicesForAccount.go index 13e665a6ad3..7029e1ff3fd 100644 --- a/service/organizations/api_op_ListDelegatedServicesForAccount.go +++ b/service/organizations/api_op_ListDelegatedServicesForAccount.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListDelegatedServicesForAccount(ctx context.Context, params *Li addawsAwsjson11_serdeOpListDelegatedServicesForAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_ListHandshakesForAccount.go b/service/organizations/api_op_ListHandshakesForAccount.go index 8e5f559691b..579f92388c1 100644 --- a/service/organizations/api_op_ListHandshakesForAccount.go +++ b/service/organizations/api_op_ListHandshakesForAccount.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) ListHandshakesForAccount(ctx context.Context, params *ListHands addawsAwsjson11_serdeOpListHandshakesForAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_ListHandshakesForOrganization.go b/service/organizations/api_op_ListHandshakesForOrganization.go index fd51d8b7c12..becd8aefaeb 100644 --- a/service/organizations/api_op_ListHandshakesForOrganization.go +++ b/service/organizations/api_op_ListHandshakesForOrganization.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) ListHandshakesForOrganization(ctx context.Context, params *List addawsAwsjson11_serdeOpListHandshakesForOrganizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_ListOrganizationalUnitsForParent.go b/service/organizations/api_op_ListOrganizationalUnitsForParent.go index d85b9050cce..764bf85e496 100644 --- a/service/organizations/api_op_ListOrganizationalUnitsForParent.go +++ b/service/organizations/api_op_ListOrganizationalUnitsForParent.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListOrganizationalUnitsForParent(ctx context.Context, params *L addawsAwsjson11_serdeOpListOrganizationalUnitsForParentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_ListParents.go b/service/organizations/api_op_ListParents.go index 1133760cea9..192f0d39dee 100644 --- a/service/organizations/api_op_ListParents.go +++ b/service/organizations/api_op_ListParents.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) ListParents(ctx context.Context, params *ListParentsInput, optF addawsAwsjson11_serdeOpListParentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_ListPolicies.go b/service/organizations/api_op_ListPolicies.go index 06e4800fff5..76a516d0d9d 100644 --- a/service/organizations/api_op_ListPolicies.go +++ b/service/organizations/api_op_ListPolicies.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListPolicies(ctx context.Context, params *ListPoliciesInput, op addawsAwsjson11_serdeOpListPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_ListPoliciesForTarget.go b/service/organizations/api_op_ListPoliciesForTarget.go index 89014dbb02e..50426f867b8 100644 --- a/service/organizations/api_op_ListPoliciesForTarget.go +++ b/service/organizations/api_op_ListPoliciesForTarget.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) ListPoliciesForTarget(ctx context.Context, params *ListPolicies addawsAwsjson11_serdeOpListPoliciesForTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_ListRoots.go b/service/organizations/api_op_ListRoots.go index 47854c22275..5b1af55bffb 100644 --- a/service/organizations/api_op_ListRoots.go +++ b/service/organizations/api_op_ListRoots.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) ListRoots(ctx context.Context, params *ListRootsInput, optFns . addawsAwsjson11_serdeOpListRootsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_ListTagsForResource.go b/service/organizations/api_op_ListTagsForResource.go index 043367c6a4e..dddb741fb59 100644 --- a/service/organizations/api_op_ListTagsForResource.go +++ b/service/organizations/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_ListTargetsForPolicy.go b/service/organizations/api_op_ListTargetsForPolicy.go index a6480b4b8d0..43693fde4cf 100644 --- a/service/organizations/api_op_ListTargetsForPolicy.go +++ b/service/organizations/api_op_ListTargetsForPolicy.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListTargetsForPolicy(ctx context.Context, params *ListTargetsFo addawsAwsjson11_serdeOpListTargetsForPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_MoveAccount.go b/service/organizations/api_op_MoveAccount.go index edc2e643a54..0478a120e56 100644 --- a/service/organizations/api_op_MoveAccount.go +++ b/service/organizations/api_op_MoveAccount.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) MoveAccount(ctx context.Context, params *MoveAccountInput, optF addawsAwsjson11_serdeOpMoveAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_RegisterDelegatedAdministrator.go b/service/organizations/api_op_RegisterDelegatedAdministrator.go index 79153e0a96e..f7e7e4d1555 100644 --- a/service/organizations/api_op_RegisterDelegatedAdministrator.go +++ b/service/organizations/api_op_RegisterDelegatedAdministrator.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) RegisterDelegatedAdministrator(ctx context.Context, params *Reg addawsAwsjson11_serdeOpRegisterDelegatedAdministratorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_RemoveAccountFromOrganization.go b/service/organizations/api_op_RemoveAccountFromOrganization.go index 9d854f8aeda..4674abd333c 100644 --- a/service/organizations/api_op_RemoveAccountFromOrganization.go +++ b/service/organizations/api_op_RemoveAccountFromOrganization.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -42,9 +41,9 @@ func (c *Client) RemoveAccountFromOrganization(ctx context.Context, params *Remo addawsAwsjson11_serdeOpRemoveAccountFromOrganizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_TagResource.go b/service/organizations/api_op_TagResource.go index be569c5f3a9..8b9c310cae2 100644 --- a/service/organizations/api_op_TagResource.go +++ b/service/organizations/api_op_TagResource.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_UntagResource.go b/service/organizations/api_op_UntagResource.go index 8cb8a593094..aff9ffafa6e 100644 --- a/service/organizations/api_op_UntagResource.go +++ b/service/organizations/api_op_UntagResource.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_UpdateOrganizationalUnit.go b/service/organizations/api_op_UpdateOrganizationalUnit.go index 1c324d61337..571ab4f2c27 100644 --- a/service/organizations/api_op_UpdateOrganizationalUnit.go +++ b/service/organizations/api_op_UpdateOrganizationalUnit.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateOrganizationalUnit(ctx context.Context, params *UpdateOrg addawsAwsjson11_serdeOpUpdateOrganizationalUnitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/api_op_UpdatePolicy.go b/service/organizations/api_op_UpdatePolicy.go index caee9b50ddc..91a990bd3ea 100644 --- a/service/organizations/api_op_UpdatePolicy.go +++ b/service/organizations/api_op_UpdatePolicy.go @@ -5,7 +5,6 @@ package organizations import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/organizations/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdatePolicy(ctx context.Context, params *UpdatePolicyInput, op addawsAwsjson11_serdeOpUpdatePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/organizations/endpoints.go b/service/organizations/endpoints.go index 6690917fb8f..33454a3237b 100644 --- a/service/organizations/endpoints.go +++ b/service/organizations/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/outposts/api_client.go b/service/outposts/api_client.go index b3e0a50b06a..6ea72c76c9e 100644 --- a/service/outposts/api_client.go +++ b/service/outposts/api_client.go @@ -82,30 +82,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -171,6 +147,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/outposts/api_op_CreateOutpost.go b/service/outposts/api_op_CreateOutpost.go index 17e4a4ad6d2..97a318f2dbf 100644 --- a/service/outposts/api_op_CreateOutpost.go +++ b/service/outposts/api_op_CreateOutpost.go @@ -5,7 +5,6 @@ package outposts import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/outposts/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateOutpost(ctx context.Context, params *CreateOutpostInput, addawsRestjson1_serdeOpCreateOutpostMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/outposts/api_op_DeleteOutpost.go b/service/outposts/api_op_DeleteOutpost.go index 2b316c04728..a0a2a04c431 100644 --- a/service/outposts/api_op_DeleteOutpost.go +++ b/service/outposts/api_op_DeleteOutpost.go @@ -5,7 +5,6 @@ package outposts import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteOutpost(ctx context.Context, params *DeleteOutpostInput, addawsRestjson1_serdeOpDeleteOutpostMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/outposts/api_op_DeleteSite.go b/service/outposts/api_op_DeleteSite.go index c52f0b47035..53f5b99d6ac 100644 --- a/service/outposts/api_op_DeleteSite.go +++ b/service/outposts/api_op_DeleteSite.go @@ -5,7 +5,6 @@ package outposts import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSite(ctx context.Context, params *DeleteSiteInput, optFns addawsRestjson1_serdeOpDeleteSiteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/outposts/api_op_GetOutpost.go b/service/outposts/api_op_GetOutpost.go index bd1cee3955d..9ca471e86d9 100644 --- a/service/outposts/api_op_GetOutpost.go +++ b/service/outposts/api_op_GetOutpost.go @@ -5,7 +5,6 @@ package outposts import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/outposts/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetOutpost(ctx context.Context, params *GetOutpostInput, optFns addawsRestjson1_serdeOpGetOutpostMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/outposts/api_op_GetOutpostInstanceTypes.go b/service/outposts/api_op_GetOutpostInstanceTypes.go index 0bc810a05ac..4f121207187 100644 --- a/service/outposts/api_op_GetOutpostInstanceTypes.go +++ b/service/outposts/api_op_GetOutpostInstanceTypes.go @@ -5,7 +5,6 @@ package outposts import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/outposts/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetOutpostInstanceTypes(ctx context.Context, params *GetOutpost addawsRestjson1_serdeOpGetOutpostInstanceTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/outposts/api_op_ListOutposts.go b/service/outposts/api_op_ListOutposts.go index dbde878eec1..bdf9e4a7ecf 100644 --- a/service/outposts/api_op_ListOutposts.go +++ b/service/outposts/api_op_ListOutposts.go @@ -5,7 +5,6 @@ package outposts import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/outposts/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListOutposts(ctx context.Context, params *ListOutpostsInput, op addawsRestjson1_serdeOpListOutpostsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/outposts/api_op_ListSites.go b/service/outposts/api_op_ListSites.go index f0848bd618d..39a4e945e4e 100644 --- a/service/outposts/api_op_ListSites.go +++ b/service/outposts/api_op_ListSites.go @@ -5,7 +5,6 @@ package outposts import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/outposts/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListSites(ctx context.Context, params *ListSitesInput, optFns . addawsRestjson1_serdeOpListSitesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/outposts/endpoints.go b/service/outposts/endpoints.go index 9d176bb9ca8..972d8d042ef 100644 --- a/service/outposts/endpoints.go +++ b/service/outposts/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/personalize/api_client.go b/service/personalize/api_client.go index c3ea6c0f009..09227740ef4 100644 --- a/service/personalize/api_client.go +++ b/service/personalize/api_client.go @@ -78,30 +78,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -167,6 +143,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/personalize/api_op_CreateBatchInferenceJob.go b/service/personalize/api_op_CreateBatchInferenceJob.go index b9d1a1ded6d..f4685faa520 100644 --- a/service/personalize/api_op_CreateBatchInferenceJob.go +++ b/service/personalize/api_op_CreateBatchInferenceJob.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateBatchInferenceJob(ctx context.Context, params *CreateBatc addawsAwsjson11_serdeOpCreateBatchInferenceJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_CreateCampaign.go b/service/personalize/api_op_CreateCampaign.go index 805c8990f3e..1464d0a845d 100644 --- a/service/personalize/api_op_CreateCampaign.go +++ b/service/personalize/api_op_CreateCampaign.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -48,9 +47,9 @@ func (c *Client) CreateCampaign(ctx context.Context, params *CreateCampaignInput addawsAwsjson11_serdeOpCreateCampaignMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_CreateDataset.go b/service/personalize/api_op_CreateDataset.go index aa06b1a487f..999fb886446 100644 --- a/service/personalize/api_op_CreateDataset.go +++ b/service/personalize/api_op_CreateDataset.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -53,9 +52,9 @@ func (c *Client) CreateDataset(ctx context.Context, params *CreateDatasetInput, addawsAwsjson11_serdeOpCreateDatasetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_CreateDatasetGroup.go b/service/personalize/api_op_CreateDatasetGroup.go index b40e11e9c69..84fba9e4274 100644 --- a/service/personalize/api_op_CreateDatasetGroup.go +++ b/service/personalize/api_op_CreateDatasetGroup.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -66,9 +65,9 @@ func (c *Client) CreateDatasetGroup(ctx context.Context, params *CreateDatasetGr addawsAwsjson11_serdeOpCreateDatasetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_CreateDatasetImportJob.go b/service/personalize/api_op_CreateDatasetImportJob.go index fe5eda32e3b..7e5635ceb04 100644 --- a/service/personalize/api_op_CreateDatasetImportJob.go +++ b/service/personalize/api_op_CreateDatasetImportJob.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) CreateDatasetImportJob(ctx context.Context, params *CreateDatas addawsAwsjson11_serdeOpCreateDatasetImportJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_CreateEventTracker.go b/service/personalize/api_op_CreateEventTracker.go index f8044214875..0772753ec56 100644 --- a/service/personalize/api_op_CreateEventTracker.go +++ b/service/personalize/api_op_CreateEventTracker.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -50,9 +49,9 @@ func (c *Client) CreateEventTracker(ctx context.Context, params *CreateEventTrac addawsAwsjson11_serdeOpCreateEventTrackerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_CreateFilter.go b/service/personalize/api_op_CreateFilter.go index 50b253d7b98..56807b2cae0 100644 --- a/service/personalize/api_op_CreateFilter.go +++ b/service/personalize/api_op_CreateFilter.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateFilter(ctx context.Context, params *CreateFilterInput, op addawsAwsjson11_serdeOpCreateFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_CreateSchema.go b/service/personalize/api_op_CreateSchema.go index 25da741e100..8e077cb3cd8 100644 --- a/service/personalize/api_op_CreateSchema.go +++ b/service/personalize/api_op_CreateSchema.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) CreateSchema(ctx context.Context, params *CreateSchemaInput, op addawsAwsjson11_serdeOpCreateSchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_CreateSolution.go b/service/personalize/api_op_CreateSolution.go index 1a72f3f1de8..02c17cc5f10 100644 --- a/service/personalize/api_op_CreateSolution.go +++ b/service/personalize/api_op_CreateSolution.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -51,9 +50,9 @@ func (c *Client) CreateSolution(ctx context.Context, params *CreateSolutionInput addawsAwsjson11_serdeOpCreateSolutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_CreateSolutionVersion.go b/service/personalize/api_op_CreateSolutionVersion.go index fb694f690cd..baf96f8a192 100644 --- a/service/personalize/api_op_CreateSolutionVersion.go +++ b/service/personalize/api_op_CreateSolutionVersion.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -49,9 +48,9 @@ func (c *Client) CreateSolutionVersion(ctx context.Context, params *CreateSoluti addawsAwsjson11_serdeOpCreateSolutionVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DeleteCampaign.go b/service/personalize/api_op_DeleteCampaign.go index df266f35a2b..453d7d773f5 100644 --- a/service/personalize/api_op_DeleteCampaign.go +++ b/service/personalize/api_op_DeleteCampaign.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteCampaign(ctx context.Context, params *DeleteCampaignInput addawsAwsjson11_serdeOpDeleteCampaignMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DeleteDataset.go b/service/personalize/api_op_DeleteDataset.go index c847f53f487..c691f7ab6b5 100644 --- a/service/personalize/api_op_DeleteDataset.go +++ b/service/personalize/api_op_DeleteDataset.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteDataset(ctx context.Context, params *DeleteDatasetInput, addawsAwsjson11_serdeOpDeleteDatasetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DeleteDatasetGroup.go b/service/personalize/api_op_DeleteDatasetGroup.go index d58c982e07a..e917a3a395a 100644 --- a/service/personalize/api_op_DeleteDatasetGroup.go +++ b/service/personalize/api_op_DeleteDatasetGroup.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) DeleteDatasetGroup(ctx context.Context, params *DeleteDatasetGr addawsAwsjson11_serdeOpDeleteDatasetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DeleteEventTracker.go b/service/personalize/api_op_DeleteEventTracker.go index c7c14924030..e5b40d645d0 100644 --- a/service/personalize/api_op_DeleteEventTracker.go +++ b/service/personalize/api_op_DeleteEventTracker.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteEventTracker(ctx context.Context, params *DeleteEventTrac addawsAwsjson11_serdeOpDeleteEventTrackerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DeleteFilter.go b/service/personalize/api_op_DeleteFilter.go index 36e578772b6..5da6cb3ed9a 100644 --- a/service/personalize/api_op_DeleteFilter.go +++ b/service/personalize/api_op_DeleteFilter.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteFilter(ctx context.Context, params *DeleteFilterInput, op addawsAwsjson11_serdeOpDeleteFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DeleteSchema.go b/service/personalize/api_op_DeleteSchema.go index f5c711230d6..637a6ae04a1 100644 --- a/service/personalize/api_op_DeleteSchema.go +++ b/service/personalize/api_op_DeleteSchema.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteSchema(ctx context.Context, params *DeleteSchemaInput, op addawsAwsjson11_serdeOpDeleteSchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DeleteSolution.go b/service/personalize/api_op_DeleteSolution.go index 53c0db42287..3a1957fbd4b 100644 --- a/service/personalize/api_op_DeleteSolution.go +++ b/service/personalize/api_op_DeleteSolution.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteSolution(ctx context.Context, params *DeleteSolutionInput addawsAwsjson11_serdeOpDeleteSolutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DescribeAlgorithm.go b/service/personalize/api_op_DescribeAlgorithm.go index eb12b887701..7fb7bcb2fc6 100644 --- a/service/personalize/api_op_DescribeAlgorithm.go +++ b/service/personalize/api_op_DescribeAlgorithm.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeAlgorithm(ctx context.Context, params *DescribeAlgorith addawsAwsjson11_serdeOpDescribeAlgorithmMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DescribeBatchInferenceJob.go b/service/personalize/api_op_DescribeBatchInferenceJob.go index 88f648374a0..b6b72b82df0 100644 --- a/service/personalize/api_op_DescribeBatchInferenceJob.go +++ b/service/personalize/api_op_DescribeBatchInferenceJob.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeBatchInferenceJob(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeBatchInferenceJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DescribeCampaign.go b/service/personalize/api_op_DescribeCampaign.go index 6925d1c55dc..100726c698e 100644 --- a/service/personalize/api_op_DescribeCampaign.go +++ b/service/personalize/api_op_DescribeCampaign.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) DescribeCampaign(ctx context.Context, params *DescribeCampaignI addawsAwsjson11_serdeOpDescribeCampaignMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DescribeDataset.go b/service/personalize/api_op_DescribeDataset.go index 34c75334e08..3d8dc418048 100644 --- a/service/personalize/api_op_DescribeDataset.go +++ b/service/personalize/api_op_DescribeDataset.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDataset(ctx context.Context, params *DescribeDatasetInp addawsAwsjson11_serdeOpDescribeDatasetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DescribeDatasetGroup.go b/service/personalize/api_op_DescribeDatasetGroup.go index 3e0d6400207..fad803d4ee3 100644 --- a/service/personalize/api_op_DescribeDatasetGroup.go +++ b/service/personalize/api_op_DescribeDatasetGroup.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDatasetGroup(ctx context.Context, params *DescribeDatas addawsAwsjson11_serdeOpDescribeDatasetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DescribeDatasetImportJob.go b/service/personalize/api_op_DescribeDatasetImportJob.go index 50ca969a1be..276f08d2517 100644 --- a/service/personalize/api_op_DescribeDatasetImportJob.go +++ b/service/personalize/api_op_DescribeDatasetImportJob.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDatasetImportJob(ctx context.Context, params *DescribeD addawsAwsjson11_serdeOpDescribeDatasetImportJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DescribeEventTracker.go b/service/personalize/api_op_DescribeEventTracker.go index 0bc80d584e7..fd7855e5f6f 100644 --- a/service/personalize/api_op_DescribeEventTracker.go +++ b/service/personalize/api_op_DescribeEventTracker.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeEventTracker(ctx context.Context, params *DescribeEvent addawsAwsjson11_serdeOpDescribeEventTrackerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DescribeFeatureTransformation.go b/service/personalize/api_op_DescribeFeatureTransformation.go index f354e6c7e6e..8d5f31d995a 100644 --- a/service/personalize/api_op_DescribeFeatureTransformation.go +++ b/service/personalize/api_op_DescribeFeatureTransformation.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeFeatureTransformation(ctx context.Context, params *Desc addawsAwsjson11_serdeOpDescribeFeatureTransformationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DescribeFilter.go b/service/personalize/api_op_DescribeFilter.go index 0465458a3fc..c4c2382a616 100644 --- a/service/personalize/api_op_DescribeFilter.go +++ b/service/personalize/api_op_DescribeFilter.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeFilter(ctx context.Context, params *DescribeFilterInput addawsAwsjson11_serdeOpDescribeFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DescribeRecipe.go b/service/personalize/api_op_DescribeRecipe.go index 6efc51e58b0..5b948c589dc 100644 --- a/service/personalize/api_op_DescribeRecipe.go +++ b/service/personalize/api_op_DescribeRecipe.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) DescribeRecipe(ctx context.Context, params *DescribeRecipeInput addawsAwsjson11_serdeOpDescribeRecipeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DescribeSchema.go b/service/personalize/api_op_DescribeSchema.go index 4d54ba1a298..b1c664198da 100644 --- a/service/personalize/api_op_DescribeSchema.go +++ b/service/personalize/api_op_DescribeSchema.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeSchema(ctx context.Context, params *DescribeSchemaInput addawsAwsjson11_serdeOpDescribeSchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DescribeSolution.go b/service/personalize/api_op_DescribeSolution.go index 1de6814e750..7e7cfe6ac43 100644 --- a/service/personalize/api_op_DescribeSolution.go +++ b/service/personalize/api_op_DescribeSolution.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeSolution(ctx context.Context, params *DescribeSolutionI addawsAwsjson11_serdeOpDescribeSolutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_DescribeSolutionVersion.go b/service/personalize/api_op_DescribeSolutionVersion.go index 3d11aa1cd0d..9ca2208be62 100644 --- a/service/personalize/api_op_DescribeSolutionVersion.go +++ b/service/personalize/api_op_DescribeSolutionVersion.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeSolutionVersion(ctx context.Context, params *DescribeSo addawsAwsjson11_serdeOpDescribeSolutionVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_GetSolutionMetrics.go b/service/personalize/api_op_GetSolutionMetrics.go index 638b85daab3..ee59195cea4 100644 --- a/service/personalize/api_op_GetSolutionMetrics.go +++ b/service/personalize/api_op_GetSolutionMetrics.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetSolutionMetrics(ctx context.Context, params *GetSolutionMetr addawsAwsjson11_serdeOpGetSolutionMetricsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_ListBatchInferenceJobs.go b/service/personalize/api_op_ListBatchInferenceJobs.go index 30dc742a35d..610216635d1 100644 --- a/service/personalize/api_op_ListBatchInferenceJobs.go +++ b/service/personalize/api_op_ListBatchInferenceJobs.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListBatchInferenceJobs(ctx context.Context, params *ListBatchIn addawsAwsjson11_serdeOpListBatchInferenceJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_ListCampaigns.go b/service/personalize/api_op_ListCampaigns.go index a7de7a36238..e179226f7e0 100644 --- a/service/personalize/api_op_ListCampaigns.go +++ b/service/personalize/api_op_ListCampaigns.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListCampaigns(ctx context.Context, params *ListCampaignsInput, addawsAwsjson11_serdeOpListCampaignsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_ListDatasetGroups.go b/service/personalize/api_op_ListDatasetGroups.go index a0c17f6637f..4690827385a 100644 --- a/service/personalize/api_op_ListDatasetGroups.go +++ b/service/personalize/api_op_ListDatasetGroups.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListDatasetGroups(ctx context.Context, params *ListDatasetGroup addawsAwsjson11_serdeOpListDatasetGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_ListDatasetImportJobs.go b/service/personalize/api_op_ListDatasetImportJobs.go index 4c19b8ab451..9ecf9c51b80 100644 --- a/service/personalize/api_op_ListDatasetImportJobs.go +++ b/service/personalize/api_op_ListDatasetImportJobs.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListDatasetImportJobs(ctx context.Context, params *ListDatasetI addawsAwsjson11_serdeOpListDatasetImportJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_ListDatasets.go b/service/personalize/api_op_ListDatasets.go index 1a7b124005f..d4775896c19 100644 --- a/service/personalize/api_op_ListDatasets.go +++ b/service/personalize/api_op_ListDatasets.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListDatasets(ctx context.Context, params *ListDatasetsInput, op addawsAwsjson11_serdeOpListDatasetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_ListEventTrackers.go b/service/personalize/api_op_ListEventTrackers.go index 1b74078d4f7..99b7d72c8ca 100644 --- a/service/personalize/api_op_ListEventTrackers.go +++ b/service/personalize/api_op_ListEventTrackers.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListEventTrackers(ctx context.Context, params *ListEventTracker addawsAwsjson11_serdeOpListEventTrackersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_ListFilters.go b/service/personalize/api_op_ListFilters.go index 86f991b9f5b..6f277be85cd 100644 --- a/service/personalize/api_op_ListFilters.go +++ b/service/personalize/api_op_ListFilters.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListFilters(ctx context.Context, params *ListFiltersInput, optF addawsAwsjson11_serdeOpListFiltersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_ListRecipes.go b/service/personalize/api_op_ListRecipes.go index 7b65f78a1b7..59ca20cbaf6 100644 --- a/service/personalize/api_op_ListRecipes.go +++ b/service/personalize/api_op_ListRecipes.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListRecipes(ctx context.Context, params *ListRecipesInput, optF addawsAwsjson11_serdeOpListRecipesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_ListSchemas.go b/service/personalize/api_op_ListSchemas.go index 7a9f9513777..182d87550a0 100644 --- a/service/personalize/api_op_ListSchemas.go +++ b/service/personalize/api_op_ListSchemas.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListSchemas(ctx context.Context, params *ListSchemasInput, optF addawsAwsjson11_serdeOpListSchemasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_ListSolutionVersions.go b/service/personalize/api_op_ListSolutionVersions.go index baa1615f96a..48048252602 100644 --- a/service/personalize/api_op_ListSolutionVersions.go +++ b/service/personalize/api_op_ListSolutionVersions.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListSolutionVersions(ctx context.Context, params *ListSolutionV addawsAwsjson11_serdeOpListSolutionVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_ListSolutions.go b/service/personalize/api_op_ListSolutions.go index c7023c64530..273f7e7947e 100644 --- a/service/personalize/api_op_ListSolutions.go +++ b/service/personalize/api_op_ListSolutions.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalize/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListSolutions(ctx context.Context, params *ListSolutionsInput, addawsAwsjson11_serdeOpListSolutionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/api_op_UpdateCampaign.go b/service/personalize/api_op_UpdateCampaign.go index 3725f6c95c9..bcd1284beb4 100644 --- a/service/personalize/api_op_UpdateCampaign.go +++ b/service/personalize/api_op_UpdateCampaign.go @@ -5,7 +5,6 @@ package personalize import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) UpdateCampaign(ctx context.Context, params *UpdateCampaignInput addawsAwsjson11_serdeOpUpdateCampaignMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalize/endpoints.go b/service/personalize/endpoints.go index ebc81a37fd0..ac68272c9a6 100644 --- a/service/personalize/endpoints.go +++ b/service/personalize/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/personalizeevents/api_client.go b/service/personalizeevents/api_client.go index 0d114ce180b..8893109b6eb 100644 --- a/service/personalizeevents/api_client.go +++ b/service/personalizeevents/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/personalizeevents/api_op_PutEvents.go b/service/personalizeevents/api_op_PutEvents.go index e2c9d733c35..4e398f04e30 100644 --- a/service/personalizeevents/api_op_PutEvents.go +++ b/service/personalizeevents/api_op_PutEvents.go @@ -5,7 +5,6 @@ package personalizeevents import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalizeevents/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutEvents(ctx context.Context, params *PutEventsInput, optFns . addawsRestjson1_serdeOpPutEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalizeevents/endpoints.go b/service/personalizeevents/endpoints.go index e2d946c3371..2075bcde933 100644 --- a/service/personalizeevents/endpoints.go +++ b/service/personalizeevents/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/personalizeruntime/api_client.go b/service/personalizeruntime/api_client.go index e3689ca1e73..3480d0f9196 100644 --- a/service/personalizeruntime/api_client.go +++ b/service/personalizeruntime/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/personalizeruntime/api_op_GetPersonalizedRanking.go b/service/personalizeruntime/api_op_GetPersonalizedRanking.go index 2ea7f3962e6..9be644c40fb 100644 --- a/service/personalizeruntime/api_op_GetPersonalizedRanking.go +++ b/service/personalizeruntime/api_op_GetPersonalizedRanking.go @@ -5,7 +5,6 @@ package personalizeruntime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalizeruntime/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetPersonalizedRanking(ctx context.Context, params *GetPersonal addawsRestjson1_serdeOpGetPersonalizedRankingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalizeruntime/api_op_GetRecommendations.go b/service/personalizeruntime/api_op_GetRecommendations.go index 04d2e1d913b..303e72af9e9 100644 --- a/service/personalizeruntime/api_op_GetRecommendations.go +++ b/service/personalizeruntime/api_op_GetRecommendations.go @@ -5,7 +5,6 @@ package personalizeruntime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/personalizeruntime/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) GetRecommendations(ctx context.Context, params *GetRecommendati addawsRestjson1_serdeOpGetRecommendationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/personalizeruntime/endpoints.go b/service/personalizeruntime/endpoints.go index 2bfaa0cdb82..fe54d3c97b3 100644 --- a/service/personalizeruntime/endpoints.go +++ b/service/personalizeruntime/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/pi/api_client.go b/service/pi/api_client.go index c2dd180f03c..2133a0b94df 100644 --- a/service/pi/api_client.go +++ b/service/pi/api_client.go @@ -92,30 +92,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -181,6 +157,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/pi/api_op_DescribeDimensionKeys.go b/service/pi/api_op_DescribeDimensionKeys.go index abe1e3697ae..86f9cb34628 100644 --- a/service/pi/api_op_DescribeDimensionKeys.go +++ b/service/pi/api_op_DescribeDimensionKeys.go @@ -5,7 +5,6 @@ package pi import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pi/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDimensionKeys(ctx context.Context, params *DescribeDime addawsAwsjson11_serdeOpDescribeDimensionKeysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pi/api_op_GetResourceMetrics.go b/service/pi/api_op_GetResourceMetrics.go index c0b64d33689..1bcf43446ab 100644 --- a/service/pi/api_op_GetResourceMetrics.go +++ b/service/pi/api_op_GetResourceMetrics.go @@ -5,7 +5,6 @@ package pi import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pi/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetResourceMetrics(ctx context.Context, params *GetResourceMetr addawsAwsjson11_serdeOpGetResourceMetricsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pi/endpoints.go b/service/pi/endpoints.go index 4ead444363a..adf41d376e5 100644 --- a/service/pi/endpoints.go +++ b/service/pi/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/pinpoint/api_client.go b/service/pinpoint/api_client.go index e2ead0ed7b1..81ef4fcbc99 100644 --- a/service/pinpoint/api_client.go +++ b/service/pinpoint/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/pinpoint/api_op_CreateApp.go b/service/pinpoint/api_op_CreateApp.go index fa8d4da1260..77296972d7a 100644 --- a/service/pinpoint/api_op_CreateApp.go +++ b/service/pinpoint/api_op_CreateApp.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateApp(ctx context.Context, params *CreateAppInput, optFns . addawsRestjson1_serdeOpCreateAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_CreateCampaign.go b/service/pinpoint/api_op_CreateCampaign.go index da35e9ff048..a37d35baba2 100644 --- a/service/pinpoint/api_op_CreateCampaign.go +++ b/service/pinpoint/api_op_CreateCampaign.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateCampaign(ctx context.Context, params *CreateCampaignInput addawsRestjson1_serdeOpCreateCampaignMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_CreateEmailTemplate.go b/service/pinpoint/api_op_CreateEmailTemplate.go index 5982f863823..cad7dc7ad75 100644 --- a/service/pinpoint/api_op_CreateEmailTemplate.go +++ b/service/pinpoint/api_op_CreateEmailTemplate.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateEmailTemplate(ctx context.Context, params *CreateEmailTem addawsRestjson1_serdeOpCreateEmailTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_CreateExportJob.go b/service/pinpoint/api_op_CreateExportJob.go index 219561581fd..f07ab552349 100644 --- a/service/pinpoint/api_op_CreateExportJob.go +++ b/service/pinpoint/api_op_CreateExportJob.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateExportJob(ctx context.Context, params *CreateExportJobInp addawsRestjson1_serdeOpCreateExportJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_CreateImportJob.go b/service/pinpoint/api_op_CreateImportJob.go index 2d2220149c4..1a13cb4762b 100644 --- a/service/pinpoint/api_op_CreateImportJob.go +++ b/service/pinpoint/api_op_CreateImportJob.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateImportJob(ctx context.Context, params *CreateImportJobInp addawsRestjson1_serdeOpCreateImportJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_CreateJourney.go b/service/pinpoint/api_op_CreateJourney.go index 1c53bf6b3a8..d882eb2dc33 100644 --- a/service/pinpoint/api_op_CreateJourney.go +++ b/service/pinpoint/api_op_CreateJourney.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateJourney(ctx context.Context, params *CreateJourneyInput, addawsRestjson1_serdeOpCreateJourneyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_CreatePushTemplate.go b/service/pinpoint/api_op_CreatePushTemplate.go index b17076516fa..722b86c48fc 100644 --- a/service/pinpoint/api_op_CreatePushTemplate.go +++ b/service/pinpoint/api_op_CreatePushTemplate.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreatePushTemplate(ctx context.Context, params *CreatePushTempl addawsRestjson1_serdeOpCreatePushTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_CreateRecommenderConfiguration.go b/service/pinpoint/api_op_CreateRecommenderConfiguration.go index c3cc35af86c..06047aa58b1 100644 --- a/service/pinpoint/api_op_CreateRecommenderConfiguration.go +++ b/service/pinpoint/api_op_CreateRecommenderConfiguration.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateRecommenderConfiguration(ctx context.Context, params *Cre addawsRestjson1_serdeOpCreateRecommenderConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_CreateSegment.go b/service/pinpoint/api_op_CreateSegment.go index 00cac9e83d1..66c077d4677 100644 --- a/service/pinpoint/api_op_CreateSegment.go +++ b/service/pinpoint/api_op_CreateSegment.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateSegment(ctx context.Context, params *CreateSegmentInput, addawsRestjson1_serdeOpCreateSegmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_CreateSmsTemplate.go b/service/pinpoint/api_op_CreateSmsTemplate.go index 7bb6292faa7..25bdd552d51 100644 --- a/service/pinpoint/api_op_CreateSmsTemplate.go +++ b/service/pinpoint/api_op_CreateSmsTemplate.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateSmsTemplate(ctx context.Context, params *CreateSmsTemplat addawsRestjson1_serdeOpCreateSmsTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_CreateVoiceTemplate.go b/service/pinpoint/api_op_CreateVoiceTemplate.go index 88445edc661..db32161c9f2 100644 --- a/service/pinpoint/api_op_CreateVoiceTemplate.go +++ b/service/pinpoint/api_op_CreateVoiceTemplate.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateVoiceTemplate(ctx context.Context, params *CreateVoiceTem addawsRestjson1_serdeOpCreateVoiceTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteAdmChannel.go b/service/pinpoint/api_op_DeleteAdmChannel.go index cb12bc4757b..6bf31feb737 100644 --- a/service/pinpoint/api_op_DeleteAdmChannel.go +++ b/service/pinpoint/api_op_DeleteAdmChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteAdmChannel(ctx context.Context, params *DeleteAdmChannelI addawsRestjson1_serdeOpDeleteAdmChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteApnsChannel.go b/service/pinpoint/api_op_DeleteApnsChannel.go index 84668ba8528..f9ddd9abc7f 100644 --- a/service/pinpoint/api_op_DeleteApnsChannel.go +++ b/service/pinpoint/api_op_DeleteApnsChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteApnsChannel(ctx context.Context, params *DeleteApnsChanne addawsRestjson1_serdeOpDeleteApnsChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteApnsSandboxChannel.go b/service/pinpoint/api_op_DeleteApnsSandboxChannel.go index 861b29361e8..796d843ba57 100644 --- a/service/pinpoint/api_op_DeleteApnsSandboxChannel.go +++ b/service/pinpoint/api_op_DeleteApnsSandboxChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteApnsSandboxChannel(ctx context.Context, params *DeleteApn addawsRestjson1_serdeOpDeleteApnsSandboxChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteApnsVoipChannel.go b/service/pinpoint/api_op_DeleteApnsVoipChannel.go index 4761ab44ea2..282945418a7 100644 --- a/service/pinpoint/api_op_DeleteApnsVoipChannel.go +++ b/service/pinpoint/api_op_DeleteApnsVoipChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteApnsVoipChannel(ctx context.Context, params *DeleteApnsVo addawsRestjson1_serdeOpDeleteApnsVoipChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteApnsVoipSandboxChannel.go b/service/pinpoint/api_op_DeleteApnsVoipSandboxChannel.go index bcef3f174cd..3b3a6f36e1c 100644 --- a/service/pinpoint/api_op_DeleteApnsVoipSandboxChannel.go +++ b/service/pinpoint/api_op_DeleteApnsVoipSandboxChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteApnsVoipSandboxChannel(ctx context.Context, params *Delet addawsRestjson1_serdeOpDeleteApnsVoipSandboxChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteApp.go b/service/pinpoint/api_op_DeleteApp.go index 819ccce8826..5b2a112d566 100644 --- a/service/pinpoint/api_op_DeleteApp.go +++ b/service/pinpoint/api_op_DeleteApp.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteApp(ctx context.Context, params *DeleteAppInput, optFns . addawsRestjson1_serdeOpDeleteAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteBaiduChannel.go b/service/pinpoint/api_op_DeleteBaiduChannel.go index de5aeab7e8c..e5e3779d9df 100644 --- a/service/pinpoint/api_op_DeleteBaiduChannel.go +++ b/service/pinpoint/api_op_DeleteBaiduChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteBaiduChannel(ctx context.Context, params *DeleteBaiduChan addawsRestjson1_serdeOpDeleteBaiduChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteCampaign.go b/service/pinpoint/api_op_DeleteCampaign.go index 79b8f41fb7c..5e48cc7a8a9 100644 --- a/service/pinpoint/api_op_DeleteCampaign.go +++ b/service/pinpoint/api_op_DeleteCampaign.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteCampaign(ctx context.Context, params *DeleteCampaignInput addawsRestjson1_serdeOpDeleteCampaignMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteEmailChannel.go b/service/pinpoint/api_op_DeleteEmailChannel.go index f9099f7c560..543ced2bec0 100644 --- a/service/pinpoint/api_op_DeleteEmailChannel.go +++ b/service/pinpoint/api_op_DeleteEmailChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteEmailChannel(ctx context.Context, params *DeleteEmailChan addawsRestjson1_serdeOpDeleteEmailChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteEmailTemplate.go b/service/pinpoint/api_op_DeleteEmailTemplate.go index 8991567d5a4..2b4569cfde5 100644 --- a/service/pinpoint/api_op_DeleteEmailTemplate.go +++ b/service/pinpoint/api_op_DeleteEmailTemplate.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteEmailTemplate(ctx context.Context, params *DeleteEmailTem addawsRestjson1_serdeOpDeleteEmailTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteEndpoint.go b/service/pinpoint/api_op_DeleteEndpoint.go index d28c1a32b66..b87fa2c3ce5 100644 --- a/service/pinpoint/api_op_DeleteEndpoint.go +++ b/service/pinpoint/api_op_DeleteEndpoint.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteEndpoint(ctx context.Context, params *DeleteEndpointInput addawsRestjson1_serdeOpDeleteEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteEventStream.go b/service/pinpoint/api_op_DeleteEventStream.go index eb120c9f000..b98f927173c 100644 --- a/service/pinpoint/api_op_DeleteEventStream.go +++ b/service/pinpoint/api_op_DeleteEventStream.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteEventStream(ctx context.Context, params *DeleteEventStrea addawsRestjson1_serdeOpDeleteEventStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteGcmChannel.go b/service/pinpoint/api_op_DeleteGcmChannel.go index 1641c175fab..47a033d1709 100644 --- a/service/pinpoint/api_op_DeleteGcmChannel.go +++ b/service/pinpoint/api_op_DeleteGcmChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteGcmChannel(ctx context.Context, params *DeleteGcmChannelI addawsRestjson1_serdeOpDeleteGcmChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteJourney.go b/service/pinpoint/api_op_DeleteJourney.go index d7bb6107626..66aae2fab5a 100644 --- a/service/pinpoint/api_op_DeleteJourney.go +++ b/service/pinpoint/api_op_DeleteJourney.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteJourney(ctx context.Context, params *DeleteJourneyInput, addawsRestjson1_serdeOpDeleteJourneyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeletePushTemplate.go b/service/pinpoint/api_op_DeletePushTemplate.go index d2d43095018..c4023efc1af 100644 --- a/service/pinpoint/api_op_DeletePushTemplate.go +++ b/service/pinpoint/api_op_DeletePushTemplate.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeletePushTemplate(ctx context.Context, params *DeletePushTempl addawsRestjson1_serdeOpDeletePushTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteRecommenderConfiguration.go b/service/pinpoint/api_op_DeleteRecommenderConfiguration.go index 64165bec5a8..1c65edc5430 100644 --- a/service/pinpoint/api_op_DeleteRecommenderConfiguration.go +++ b/service/pinpoint/api_op_DeleteRecommenderConfiguration.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteRecommenderConfiguration(ctx context.Context, params *Del addawsRestjson1_serdeOpDeleteRecommenderConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteSegment.go b/service/pinpoint/api_op_DeleteSegment.go index bf98d2f6cbb..c38eb027cfc 100644 --- a/service/pinpoint/api_op_DeleteSegment.go +++ b/service/pinpoint/api_op_DeleteSegment.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteSegment(ctx context.Context, params *DeleteSegmentInput, addawsRestjson1_serdeOpDeleteSegmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteSmsChannel.go b/service/pinpoint/api_op_DeleteSmsChannel.go index 6e7f344251e..472ce2b39b4 100644 --- a/service/pinpoint/api_op_DeleteSmsChannel.go +++ b/service/pinpoint/api_op_DeleteSmsChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteSmsChannel(ctx context.Context, params *DeleteSmsChannelI addawsRestjson1_serdeOpDeleteSmsChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteSmsTemplate.go b/service/pinpoint/api_op_DeleteSmsTemplate.go index 5a0ced8554f..45ec5fb578c 100644 --- a/service/pinpoint/api_op_DeleteSmsTemplate.go +++ b/service/pinpoint/api_op_DeleteSmsTemplate.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteSmsTemplate(ctx context.Context, params *DeleteSmsTemplat addawsRestjson1_serdeOpDeleteSmsTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteUserEndpoints.go b/service/pinpoint/api_op_DeleteUserEndpoints.go index 4c5c76c0086..24d2114697c 100644 --- a/service/pinpoint/api_op_DeleteUserEndpoints.go +++ b/service/pinpoint/api_op_DeleteUserEndpoints.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteUserEndpoints(ctx context.Context, params *DeleteUserEndp addawsRestjson1_serdeOpDeleteUserEndpointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteVoiceChannel.go b/service/pinpoint/api_op_DeleteVoiceChannel.go index 19da5e40f97..dd373ac6608 100644 --- a/service/pinpoint/api_op_DeleteVoiceChannel.go +++ b/service/pinpoint/api_op_DeleteVoiceChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteVoiceChannel(ctx context.Context, params *DeleteVoiceChan addawsRestjson1_serdeOpDeleteVoiceChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_DeleteVoiceTemplate.go b/service/pinpoint/api_op_DeleteVoiceTemplate.go index dd5e95d62c5..324f250ee62 100644 --- a/service/pinpoint/api_op_DeleteVoiceTemplate.go +++ b/service/pinpoint/api_op_DeleteVoiceTemplate.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteVoiceTemplate(ctx context.Context, params *DeleteVoiceTem addawsRestjson1_serdeOpDeleteVoiceTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetAdmChannel.go b/service/pinpoint/api_op_GetAdmChannel.go index b27a0c0559b..6a2b315d414 100644 --- a/service/pinpoint/api_op_GetAdmChannel.go +++ b/service/pinpoint/api_op_GetAdmChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetAdmChannel(ctx context.Context, params *GetAdmChannelInput, addawsRestjson1_serdeOpGetAdmChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetApnsChannel.go b/service/pinpoint/api_op_GetApnsChannel.go index 0008674485d..07ad75b88b2 100644 --- a/service/pinpoint/api_op_GetApnsChannel.go +++ b/service/pinpoint/api_op_GetApnsChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetApnsChannel(ctx context.Context, params *GetApnsChannelInput addawsRestjson1_serdeOpGetApnsChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetApnsSandboxChannel.go b/service/pinpoint/api_op_GetApnsSandboxChannel.go index 57177023583..2dd36b9411f 100644 --- a/service/pinpoint/api_op_GetApnsSandboxChannel.go +++ b/service/pinpoint/api_op_GetApnsSandboxChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetApnsSandboxChannel(ctx context.Context, params *GetApnsSandb addawsRestjson1_serdeOpGetApnsSandboxChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetApnsVoipChannel.go b/service/pinpoint/api_op_GetApnsVoipChannel.go index 282b64c74e0..d983c9005d3 100644 --- a/service/pinpoint/api_op_GetApnsVoipChannel.go +++ b/service/pinpoint/api_op_GetApnsVoipChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetApnsVoipChannel(ctx context.Context, params *GetApnsVoipChan addawsRestjson1_serdeOpGetApnsVoipChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetApnsVoipSandboxChannel.go b/service/pinpoint/api_op_GetApnsVoipSandboxChannel.go index 8f008a108fb..94e0ce2f41a 100644 --- a/service/pinpoint/api_op_GetApnsVoipSandboxChannel.go +++ b/service/pinpoint/api_op_GetApnsVoipSandboxChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetApnsVoipSandboxChannel(ctx context.Context, params *GetApnsV addawsRestjson1_serdeOpGetApnsVoipSandboxChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetApp.go b/service/pinpoint/api_op_GetApp.go index cf11b38abaf..aec4875c7af 100644 --- a/service/pinpoint/api_op_GetApp.go +++ b/service/pinpoint/api_op_GetApp.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetApp(ctx context.Context, params *GetAppInput, optFns ...func addawsRestjson1_serdeOpGetAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetApplicationDateRangeKpi.go b/service/pinpoint/api_op_GetApplicationDateRangeKpi.go index 0f3e1a4ba49..d6da346eded 100644 --- a/service/pinpoint/api_op_GetApplicationDateRangeKpi.go +++ b/service/pinpoint/api_op_GetApplicationDateRangeKpi.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetApplicationDateRangeKpi(ctx context.Context, params *GetAppl addawsRestjson1_serdeOpGetApplicationDateRangeKpiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetApplicationSettings.go b/service/pinpoint/api_op_GetApplicationSettings.go index 7f4ac9d1996..f8dba33085e 100644 --- a/service/pinpoint/api_op_GetApplicationSettings.go +++ b/service/pinpoint/api_op_GetApplicationSettings.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetApplicationSettings(ctx context.Context, params *GetApplicat addawsRestjson1_serdeOpGetApplicationSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetApps.go b/service/pinpoint/api_op_GetApps.go index 153be76d52c..c3a9ea4ac1d 100644 --- a/service/pinpoint/api_op_GetApps.go +++ b/service/pinpoint/api_op_GetApps.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetApps(ctx context.Context, params *GetAppsInput, optFns ...fu addawsRestjson1_serdeOpGetAppsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetBaiduChannel.go b/service/pinpoint/api_op_GetBaiduChannel.go index 6ce46107860..567fde30383 100644 --- a/service/pinpoint/api_op_GetBaiduChannel.go +++ b/service/pinpoint/api_op_GetBaiduChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetBaiduChannel(ctx context.Context, params *GetBaiduChannelInp addawsRestjson1_serdeOpGetBaiduChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetCampaign.go b/service/pinpoint/api_op_GetCampaign.go index 3e3f08a6e9f..65b36e1dffa 100644 --- a/service/pinpoint/api_op_GetCampaign.go +++ b/service/pinpoint/api_op_GetCampaign.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetCampaign(ctx context.Context, params *GetCampaignInput, optF addawsRestjson1_serdeOpGetCampaignMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetCampaignActivities.go b/service/pinpoint/api_op_GetCampaignActivities.go index e3c91c94258..62b9911ac29 100644 --- a/service/pinpoint/api_op_GetCampaignActivities.go +++ b/service/pinpoint/api_op_GetCampaignActivities.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetCampaignActivities(ctx context.Context, params *GetCampaignA addawsRestjson1_serdeOpGetCampaignActivitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetCampaignDateRangeKpi.go b/service/pinpoint/api_op_GetCampaignDateRangeKpi.go index 62c3b83616f..2cf1adca9f9 100644 --- a/service/pinpoint/api_op_GetCampaignDateRangeKpi.go +++ b/service/pinpoint/api_op_GetCampaignDateRangeKpi.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetCampaignDateRangeKpi(ctx context.Context, params *GetCampaig addawsRestjson1_serdeOpGetCampaignDateRangeKpiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetCampaignVersion.go b/service/pinpoint/api_op_GetCampaignVersion.go index 82cc298816d..b87ea18bfab 100644 --- a/service/pinpoint/api_op_GetCampaignVersion.go +++ b/service/pinpoint/api_op_GetCampaignVersion.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetCampaignVersion(ctx context.Context, params *GetCampaignVers addawsRestjson1_serdeOpGetCampaignVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetCampaignVersions.go b/service/pinpoint/api_op_GetCampaignVersions.go index 4b3b1d897b1..5c4f242791c 100644 --- a/service/pinpoint/api_op_GetCampaignVersions.go +++ b/service/pinpoint/api_op_GetCampaignVersions.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetCampaignVersions(ctx context.Context, params *GetCampaignVer addawsRestjson1_serdeOpGetCampaignVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetCampaigns.go b/service/pinpoint/api_op_GetCampaigns.go index c03aad2a2fc..7ff1af26d5f 100644 --- a/service/pinpoint/api_op_GetCampaigns.go +++ b/service/pinpoint/api_op_GetCampaigns.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetCampaigns(ctx context.Context, params *GetCampaignsInput, op addawsRestjson1_serdeOpGetCampaignsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetChannels.go b/service/pinpoint/api_op_GetChannels.go index c06f6665d90..8b25e8a4de9 100644 --- a/service/pinpoint/api_op_GetChannels.go +++ b/service/pinpoint/api_op_GetChannels.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetChannels(ctx context.Context, params *GetChannelsInput, optF addawsRestjson1_serdeOpGetChannelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetEmailChannel.go b/service/pinpoint/api_op_GetEmailChannel.go index c41ec44b4d9..cc1eacf55ca 100644 --- a/service/pinpoint/api_op_GetEmailChannel.go +++ b/service/pinpoint/api_op_GetEmailChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetEmailChannel(ctx context.Context, params *GetEmailChannelInp addawsRestjson1_serdeOpGetEmailChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetEmailTemplate.go b/service/pinpoint/api_op_GetEmailTemplate.go index 4144eb88e58..bac29d143a8 100644 --- a/service/pinpoint/api_op_GetEmailTemplate.go +++ b/service/pinpoint/api_op_GetEmailTemplate.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetEmailTemplate(ctx context.Context, params *GetEmailTemplateI addawsRestjson1_serdeOpGetEmailTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetEndpoint.go b/service/pinpoint/api_op_GetEndpoint.go index df3a1e8f9f5..723c3bbb9e6 100644 --- a/service/pinpoint/api_op_GetEndpoint.go +++ b/service/pinpoint/api_op_GetEndpoint.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetEndpoint(ctx context.Context, params *GetEndpointInput, optF addawsRestjson1_serdeOpGetEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetEventStream.go b/service/pinpoint/api_op_GetEventStream.go index 4e20d657a6f..f2d948d211b 100644 --- a/service/pinpoint/api_op_GetEventStream.go +++ b/service/pinpoint/api_op_GetEventStream.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetEventStream(ctx context.Context, params *GetEventStreamInput addawsRestjson1_serdeOpGetEventStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetExportJob.go b/service/pinpoint/api_op_GetExportJob.go index 16b6d154bb9..5fc75eda184 100644 --- a/service/pinpoint/api_op_GetExportJob.go +++ b/service/pinpoint/api_op_GetExportJob.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetExportJob(ctx context.Context, params *GetExportJobInput, op addawsRestjson1_serdeOpGetExportJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetExportJobs.go b/service/pinpoint/api_op_GetExportJobs.go index b36b2811368..59ba1ac206b 100644 --- a/service/pinpoint/api_op_GetExportJobs.go +++ b/service/pinpoint/api_op_GetExportJobs.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetExportJobs(ctx context.Context, params *GetExportJobsInput, addawsRestjson1_serdeOpGetExportJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetGcmChannel.go b/service/pinpoint/api_op_GetGcmChannel.go index 2ee1a4db4e9..af136956ab6 100644 --- a/service/pinpoint/api_op_GetGcmChannel.go +++ b/service/pinpoint/api_op_GetGcmChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetGcmChannel(ctx context.Context, params *GetGcmChannelInput, addawsRestjson1_serdeOpGetGcmChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetImportJob.go b/service/pinpoint/api_op_GetImportJob.go index 94445c43e13..f000d90a42f 100644 --- a/service/pinpoint/api_op_GetImportJob.go +++ b/service/pinpoint/api_op_GetImportJob.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetImportJob(ctx context.Context, params *GetImportJobInput, op addawsRestjson1_serdeOpGetImportJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetImportJobs.go b/service/pinpoint/api_op_GetImportJobs.go index 3f921fc127a..caf940ada72 100644 --- a/service/pinpoint/api_op_GetImportJobs.go +++ b/service/pinpoint/api_op_GetImportJobs.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetImportJobs(ctx context.Context, params *GetImportJobsInput, addawsRestjson1_serdeOpGetImportJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetJourney.go b/service/pinpoint/api_op_GetJourney.go index b127758d68c..4bdaa09312f 100644 --- a/service/pinpoint/api_op_GetJourney.go +++ b/service/pinpoint/api_op_GetJourney.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetJourney(ctx context.Context, params *GetJourneyInput, optFns addawsRestjson1_serdeOpGetJourneyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetJourneyDateRangeKpi.go b/service/pinpoint/api_op_GetJourneyDateRangeKpi.go index 6548418ebcb..b13f759a363 100644 --- a/service/pinpoint/api_op_GetJourneyDateRangeKpi.go +++ b/service/pinpoint/api_op_GetJourneyDateRangeKpi.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetJourneyDateRangeKpi(ctx context.Context, params *GetJourneyD addawsRestjson1_serdeOpGetJourneyDateRangeKpiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetJourneyExecutionActivityMetrics.go b/service/pinpoint/api_op_GetJourneyExecutionActivityMetrics.go index f47deb7ea73..a99c3eb24b1 100644 --- a/service/pinpoint/api_op_GetJourneyExecutionActivityMetrics.go +++ b/service/pinpoint/api_op_GetJourneyExecutionActivityMetrics.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetJourneyExecutionActivityMetrics(ctx context.Context, params addawsRestjson1_serdeOpGetJourneyExecutionActivityMetricsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetJourneyExecutionMetrics.go b/service/pinpoint/api_op_GetJourneyExecutionMetrics.go index 768ae772071..44bf0679ae6 100644 --- a/service/pinpoint/api_op_GetJourneyExecutionMetrics.go +++ b/service/pinpoint/api_op_GetJourneyExecutionMetrics.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetJourneyExecutionMetrics(ctx context.Context, params *GetJour addawsRestjson1_serdeOpGetJourneyExecutionMetricsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetPushTemplate.go b/service/pinpoint/api_op_GetPushTemplate.go index 2b68419bee3..def13f49b24 100644 --- a/service/pinpoint/api_op_GetPushTemplate.go +++ b/service/pinpoint/api_op_GetPushTemplate.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetPushTemplate(ctx context.Context, params *GetPushTemplateInp addawsRestjson1_serdeOpGetPushTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetRecommenderConfiguration.go b/service/pinpoint/api_op_GetRecommenderConfiguration.go index 5fb744743be..65ec4ec3b1a 100644 --- a/service/pinpoint/api_op_GetRecommenderConfiguration.go +++ b/service/pinpoint/api_op_GetRecommenderConfiguration.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetRecommenderConfiguration(ctx context.Context, params *GetRec addawsRestjson1_serdeOpGetRecommenderConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetRecommenderConfigurations.go b/service/pinpoint/api_op_GetRecommenderConfigurations.go index 39ae2fe5248..eb54bb707ba 100644 --- a/service/pinpoint/api_op_GetRecommenderConfigurations.go +++ b/service/pinpoint/api_op_GetRecommenderConfigurations.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetRecommenderConfigurations(ctx context.Context, params *GetRe addawsRestjson1_serdeOpGetRecommenderConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetSegment.go b/service/pinpoint/api_op_GetSegment.go index 7b65b253f52..4daa67b8d57 100644 --- a/service/pinpoint/api_op_GetSegment.go +++ b/service/pinpoint/api_op_GetSegment.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetSegment(ctx context.Context, params *GetSegmentInput, optFns addawsRestjson1_serdeOpGetSegmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetSegmentExportJobs.go b/service/pinpoint/api_op_GetSegmentExportJobs.go index 72f62d78b5d..b71279f73d2 100644 --- a/service/pinpoint/api_op_GetSegmentExportJobs.go +++ b/service/pinpoint/api_op_GetSegmentExportJobs.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetSegmentExportJobs(ctx context.Context, params *GetSegmentExp addawsRestjson1_serdeOpGetSegmentExportJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetSegmentImportJobs.go b/service/pinpoint/api_op_GetSegmentImportJobs.go index ef36b9d88c4..7ef295e139b 100644 --- a/service/pinpoint/api_op_GetSegmentImportJobs.go +++ b/service/pinpoint/api_op_GetSegmentImportJobs.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetSegmentImportJobs(ctx context.Context, params *GetSegmentImp addawsRestjson1_serdeOpGetSegmentImportJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetSegmentVersion.go b/service/pinpoint/api_op_GetSegmentVersion.go index b14d85f83be..8cc517ab0c7 100644 --- a/service/pinpoint/api_op_GetSegmentVersion.go +++ b/service/pinpoint/api_op_GetSegmentVersion.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetSegmentVersion(ctx context.Context, params *GetSegmentVersio addawsRestjson1_serdeOpGetSegmentVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetSegmentVersions.go b/service/pinpoint/api_op_GetSegmentVersions.go index 56de73480a3..343404a90de 100644 --- a/service/pinpoint/api_op_GetSegmentVersions.go +++ b/service/pinpoint/api_op_GetSegmentVersions.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetSegmentVersions(ctx context.Context, params *GetSegmentVersi addawsRestjson1_serdeOpGetSegmentVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetSegments.go b/service/pinpoint/api_op_GetSegments.go index c5ad99c3a5b..af1e2c8681a 100644 --- a/service/pinpoint/api_op_GetSegments.go +++ b/service/pinpoint/api_op_GetSegments.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetSegments(ctx context.Context, params *GetSegmentsInput, optF addawsRestjson1_serdeOpGetSegmentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetSmsChannel.go b/service/pinpoint/api_op_GetSmsChannel.go index 29b10a3cf08..13b7215cbc7 100644 --- a/service/pinpoint/api_op_GetSmsChannel.go +++ b/service/pinpoint/api_op_GetSmsChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetSmsChannel(ctx context.Context, params *GetSmsChannelInput, addawsRestjson1_serdeOpGetSmsChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetSmsTemplate.go b/service/pinpoint/api_op_GetSmsTemplate.go index f7f6923007d..4080900a963 100644 --- a/service/pinpoint/api_op_GetSmsTemplate.go +++ b/service/pinpoint/api_op_GetSmsTemplate.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetSmsTemplate(ctx context.Context, params *GetSmsTemplateInput addawsRestjson1_serdeOpGetSmsTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetUserEndpoints.go b/service/pinpoint/api_op_GetUserEndpoints.go index f0cc4e87432..c205a0f28cf 100644 --- a/service/pinpoint/api_op_GetUserEndpoints.go +++ b/service/pinpoint/api_op_GetUserEndpoints.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetUserEndpoints(ctx context.Context, params *GetUserEndpointsI addawsRestjson1_serdeOpGetUserEndpointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetVoiceChannel.go b/service/pinpoint/api_op_GetVoiceChannel.go index 9ba930704f3..92d7d639e13 100644 --- a/service/pinpoint/api_op_GetVoiceChannel.go +++ b/service/pinpoint/api_op_GetVoiceChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetVoiceChannel(ctx context.Context, params *GetVoiceChannelInp addawsRestjson1_serdeOpGetVoiceChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_GetVoiceTemplate.go b/service/pinpoint/api_op_GetVoiceTemplate.go index 9a8c8daf6d8..437b7c601f4 100644 --- a/service/pinpoint/api_op_GetVoiceTemplate.go +++ b/service/pinpoint/api_op_GetVoiceTemplate.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetVoiceTemplate(ctx context.Context, params *GetVoiceTemplateI addawsRestjson1_serdeOpGetVoiceTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_ListJourneys.go b/service/pinpoint/api_op_ListJourneys.go index 3fce43b7290..bfbea730801 100644 --- a/service/pinpoint/api_op_ListJourneys.go +++ b/service/pinpoint/api_op_ListJourneys.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListJourneys(ctx context.Context, params *ListJourneysInput, op addawsRestjson1_serdeOpListJourneysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_ListTagsForResource.go b/service/pinpoint/api_op_ListTagsForResource.go index bd5660168f9..9919374f864 100644 --- a/service/pinpoint/api_op_ListTagsForResource.go +++ b/service/pinpoint/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_ListTemplateVersions.go b/service/pinpoint/api_op_ListTemplateVersions.go index c1954c490bc..16aa4ffd2ef 100644 --- a/service/pinpoint/api_op_ListTemplateVersions.go +++ b/service/pinpoint/api_op_ListTemplateVersions.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTemplateVersions(ctx context.Context, params *ListTemplateV addawsRestjson1_serdeOpListTemplateVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_ListTemplates.go b/service/pinpoint/api_op_ListTemplates.go index f5d428dfc49..0f891c2506d 100644 --- a/service/pinpoint/api_op_ListTemplates.go +++ b/service/pinpoint/api_op_ListTemplates.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTemplates(ctx context.Context, params *ListTemplatesInput, addawsRestjson1_serdeOpListTemplatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_PhoneNumberValidate.go b/service/pinpoint/api_op_PhoneNumberValidate.go index d180360a4ac..7d4f4a4f49e 100644 --- a/service/pinpoint/api_op_PhoneNumberValidate.go +++ b/service/pinpoint/api_op_PhoneNumberValidate.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PhoneNumberValidate(ctx context.Context, params *PhoneNumberVal addawsRestjson1_serdeOpPhoneNumberValidateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_PutEventStream.go b/service/pinpoint/api_op_PutEventStream.go index bb5b57dbc3e..4253687044a 100644 --- a/service/pinpoint/api_op_PutEventStream.go +++ b/service/pinpoint/api_op_PutEventStream.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutEventStream(ctx context.Context, params *PutEventStreamInput addawsRestjson1_serdeOpPutEventStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_PutEvents.go b/service/pinpoint/api_op_PutEvents.go index 3e4673801a3..9a11c4c7755 100644 --- a/service/pinpoint/api_op_PutEvents.go +++ b/service/pinpoint/api_op_PutEvents.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutEvents(ctx context.Context, params *PutEventsInput, optFns . addawsRestjson1_serdeOpPutEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_RemoveAttributes.go b/service/pinpoint/api_op_RemoveAttributes.go index 8358b9c089d..2e4fab25a3e 100644 --- a/service/pinpoint/api_op_RemoveAttributes.go +++ b/service/pinpoint/api_op_RemoveAttributes.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) RemoveAttributes(ctx context.Context, params *RemoveAttributesI addawsRestjson1_serdeOpRemoveAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_SendMessages.go b/service/pinpoint/api_op_SendMessages.go index 4654193c543..1c33645c8e3 100644 --- a/service/pinpoint/api_op_SendMessages.go +++ b/service/pinpoint/api_op_SendMessages.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SendMessages(ctx context.Context, params *SendMessagesInput, op addawsRestjson1_serdeOpSendMessagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_SendUsersMessages.go b/service/pinpoint/api_op_SendUsersMessages.go index 0e1a6570df9..daafd21e425 100644 --- a/service/pinpoint/api_op_SendUsersMessages.go +++ b/service/pinpoint/api_op_SendUsersMessages.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SendUsersMessages(ctx context.Context, params *SendUsersMessage addawsRestjson1_serdeOpSendUsersMessagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_TagResource.go b/service/pinpoint/api_op_TagResource.go index 987699fa71f..319387b212a 100644 --- a/service/pinpoint/api_op_TagResource.go +++ b/service/pinpoint/api_op_TagResource.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UntagResource.go b/service/pinpoint/api_op_UntagResource.go index 621020a74f8..b5beef6d49b 100644 --- a/service/pinpoint/api_op_UntagResource.go +++ b/service/pinpoint/api_op_UntagResource.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateAdmChannel.go b/service/pinpoint/api_op_UpdateAdmChannel.go index 90502b6eb95..f4ed1faa38e 100644 --- a/service/pinpoint/api_op_UpdateAdmChannel.go +++ b/service/pinpoint/api_op_UpdateAdmChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateAdmChannel(ctx context.Context, params *UpdateAdmChannelI addawsRestjson1_serdeOpUpdateAdmChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateApnsChannel.go b/service/pinpoint/api_op_UpdateApnsChannel.go index 42c63fbc251..7d13f612dfb 100644 --- a/service/pinpoint/api_op_UpdateApnsChannel.go +++ b/service/pinpoint/api_op_UpdateApnsChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateApnsChannel(ctx context.Context, params *UpdateApnsChanne addawsRestjson1_serdeOpUpdateApnsChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateApnsSandboxChannel.go b/service/pinpoint/api_op_UpdateApnsSandboxChannel.go index 34574684c34..7bed16d3956 100644 --- a/service/pinpoint/api_op_UpdateApnsSandboxChannel.go +++ b/service/pinpoint/api_op_UpdateApnsSandboxChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateApnsSandboxChannel(ctx context.Context, params *UpdateApn addawsRestjson1_serdeOpUpdateApnsSandboxChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateApnsVoipChannel.go b/service/pinpoint/api_op_UpdateApnsVoipChannel.go index 371bd9f75db..6a8d4f6e3f6 100644 --- a/service/pinpoint/api_op_UpdateApnsVoipChannel.go +++ b/service/pinpoint/api_op_UpdateApnsVoipChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateApnsVoipChannel(ctx context.Context, params *UpdateApnsVo addawsRestjson1_serdeOpUpdateApnsVoipChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateApnsVoipSandboxChannel.go b/service/pinpoint/api_op_UpdateApnsVoipSandboxChannel.go index ba0fc180dea..4416293edfa 100644 --- a/service/pinpoint/api_op_UpdateApnsVoipSandboxChannel.go +++ b/service/pinpoint/api_op_UpdateApnsVoipSandboxChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateApnsVoipSandboxChannel(ctx context.Context, params *Updat addawsRestjson1_serdeOpUpdateApnsVoipSandboxChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateApplicationSettings.go b/service/pinpoint/api_op_UpdateApplicationSettings.go index 201d043c378..512f2f0c134 100644 --- a/service/pinpoint/api_op_UpdateApplicationSettings.go +++ b/service/pinpoint/api_op_UpdateApplicationSettings.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateApplicationSettings(ctx context.Context, params *UpdateAp addawsRestjson1_serdeOpUpdateApplicationSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateBaiduChannel.go b/service/pinpoint/api_op_UpdateBaiduChannel.go index 4255fd3bfba..75d12fcd27b 100644 --- a/service/pinpoint/api_op_UpdateBaiduChannel.go +++ b/service/pinpoint/api_op_UpdateBaiduChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateBaiduChannel(ctx context.Context, params *UpdateBaiduChan addawsRestjson1_serdeOpUpdateBaiduChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateCampaign.go b/service/pinpoint/api_op_UpdateCampaign.go index 2e32c6b20f4..bd5ba9fbaea 100644 --- a/service/pinpoint/api_op_UpdateCampaign.go +++ b/service/pinpoint/api_op_UpdateCampaign.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateCampaign(ctx context.Context, params *UpdateCampaignInput addawsRestjson1_serdeOpUpdateCampaignMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateEmailChannel.go b/service/pinpoint/api_op_UpdateEmailChannel.go index eebae059c79..c8ced70cfe8 100644 --- a/service/pinpoint/api_op_UpdateEmailChannel.go +++ b/service/pinpoint/api_op_UpdateEmailChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateEmailChannel(ctx context.Context, params *UpdateEmailChan addawsRestjson1_serdeOpUpdateEmailChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateEmailTemplate.go b/service/pinpoint/api_op_UpdateEmailTemplate.go index 3098499df8f..8dddd347a56 100644 --- a/service/pinpoint/api_op_UpdateEmailTemplate.go +++ b/service/pinpoint/api_op_UpdateEmailTemplate.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateEmailTemplate(ctx context.Context, params *UpdateEmailTem addawsRestjson1_serdeOpUpdateEmailTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateEndpoint.go b/service/pinpoint/api_op_UpdateEndpoint.go index 808e8bbcc2c..eef0e42916d 100644 --- a/service/pinpoint/api_op_UpdateEndpoint.go +++ b/service/pinpoint/api_op_UpdateEndpoint.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateEndpoint(ctx context.Context, params *UpdateEndpointInput addawsRestjson1_serdeOpUpdateEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateEndpointsBatch.go b/service/pinpoint/api_op_UpdateEndpointsBatch.go index d9bb8c8ac1a..eaab872cb9b 100644 --- a/service/pinpoint/api_op_UpdateEndpointsBatch.go +++ b/service/pinpoint/api_op_UpdateEndpointsBatch.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateEndpointsBatch(ctx context.Context, params *UpdateEndpoin addawsRestjson1_serdeOpUpdateEndpointsBatchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateGcmChannel.go b/service/pinpoint/api_op_UpdateGcmChannel.go index 4ec188bc760..25e591cd9bb 100644 --- a/service/pinpoint/api_op_UpdateGcmChannel.go +++ b/service/pinpoint/api_op_UpdateGcmChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateGcmChannel(ctx context.Context, params *UpdateGcmChannelI addawsRestjson1_serdeOpUpdateGcmChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateJourney.go b/service/pinpoint/api_op_UpdateJourney.go index 0e1dab218c1..b627c35bff8 100644 --- a/service/pinpoint/api_op_UpdateJourney.go +++ b/service/pinpoint/api_op_UpdateJourney.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateJourney(ctx context.Context, params *UpdateJourneyInput, addawsRestjson1_serdeOpUpdateJourneyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateJourneyState.go b/service/pinpoint/api_op_UpdateJourneyState.go index 1131412b0d0..22be413d729 100644 --- a/service/pinpoint/api_op_UpdateJourneyState.go +++ b/service/pinpoint/api_op_UpdateJourneyState.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateJourneyState(ctx context.Context, params *UpdateJourneySt addawsRestjson1_serdeOpUpdateJourneyStateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdatePushTemplate.go b/service/pinpoint/api_op_UpdatePushTemplate.go index 69c74d4c426..13e82e76d30 100644 --- a/service/pinpoint/api_op_UpdatePushTemplate.go +++ b/service/pinpoint/api_op_UpdatePushTemplate.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdatePushTemplate(ctx context.Context, params *UpdatePushTempl addawsRestjson1_serdeOpUpdatePushTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateRecommenderConfiguration.go b/service/pinpoint/api_op_UpdateRecommenderConfiguration.go index 9c1aab6d6a5..13480340048 100644 --- a/service/pinpoint/api_op_UpdateRecommenderConfiguration.go +++ b/service/pinpoint/api_op_UpdateRecommenderConfiguration.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateRecommenderConfiguration(ctx context.Context, params *Upd addawsRestjson1_serdeOpUpdateRecommenderConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateSegment.go b/service/pinpoint/api_op_UpdateSegment.go index ac73c1f2d96..71941da7757 100644 --- a/service/pinpoint/api_op_UpdateSegment.go +++ b/service/pinpoint/api_op_UpdateSegment.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateSegment(ctx context.Context, params *UpdateSegmentInput, addawsRestjson1_serdeOpUpdateSegmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateSmsChannel.go b/service/pinpoint/api_op_UpdateSmsChannel.go index 5600dc27c0b..e46241a7bfc 100644 --- a/service/pinpoint/api_op_UpdateSmsChannel.go +++ b/service/pinpoint/api_op_UpdateSmsChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateSmsChannel(ctx context.Context, params *UpdateSmsChannelI addawsRestjson1_serdeOpUpdateSmsChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateSmsTemplate.go b/service/pinpoint/api_op_UpdateSmsTemplate.go index fa70c49c485..bbfea06e906 100644 --- a/service/pinpoint/api_op_UpdateSmsTemplate.go +++ b/service/pinpoint/api_op_UpdateSmsTemplate.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateSmsTemplate(ctx context.Context, params *UpdateSmsTemplat addawsRestjson1_serdeOpUpdateSmsTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateTemplateActiveVersion.go b/service/pinpoint/api_op_UpdateTemplateActiveVersion.go index 9bd4b57ab32..b0a6c143844 100644 --- a/service/pinpoint/api_op_UpdateTemplateActiveVersion.go +++ b/service/pinpoint/api_op_UpdateTemplateActiveVersion.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateTemplateActiveVersion(ctx context.Context, params *Update addawsRestjson1_serdeOpUpdateTemplateActiveVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateVoiceChannel.go b/service/pinpoint/api_op_UpdateVoiceChannel.go index 8543cccecf2..bf648ba06a6 100644 --- a/service/pinpoint/api_op_UpdateVoiceChannel.go +++ b/service/pinpoint/api_op_UpdateVoiceChannel.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateVoiceChannel(ctx context.Context, params *UpdateVoiceChan addawsRestjson1_serdeOpUpdateVoiceChannelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/api_op_UpdateVoiceTemplate.go b/service/pinpoint/api_op_UpdateVoiceTemplate.go index 25bd0f75665..5abfb52f146 100644 --- a/service/pinpoint/api_op_UpdateVoiceTemplate.go +++ b/service/pinpoint/api_op_UpdateVoiceTemplate.go @@ -5,7 +5,6 @@ package pinpoint import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpoint/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateVoiceTemplate(ctx context.Context, params *UpdateVoiceTem addawsRestjson1_serdeOpUpdateVoiceTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpoint/endpoints.go b/service/pinpoint/endpoints.go index bd4ccd9d8de..d958c8f9fbe 100644 --- a/service/pinpoint/endpoints.go +++ b/service/pinpoint/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/pinpointemail/api_client.go b/service/pinpointemail/api_client.go index 40465c92c6f..d8a74857143 100644 --- a/service/pinpointemail/api_client.go +++ b/service/pinpointemail/api_client.go @@ -109,30 +109,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -198,6 +174,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/pinpointemail/api_op_CreateConfigurationSet.go b/service/pinpointemail/api_op_CreateConfigurationSet.go index 5fb5844f783..dbe7ff2bde8 100644 --- a/service/pinpointemail/api_op_CreateConfigurationSet.go +++ b/service/pinpointemail/api_op_CreateConfigurationSet.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateConfigurationSet(ctx context.Context, params *CreateConfi addawsRestjson1_serdeOpCreateConfigurationSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_CreateConfigurationSetEventDestination.go b/service/pinpointemail/api_op_CreateConfigurationSetEventDestination.go index dbaaea73295..8a87233668b 100644 --- a/service/pinpointemail/api_op_CreateConfigurationSetEventDestination.go +++ b/service/pinpointemail/api_op_CreateConfigurationSetEventDestination.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateConfigurationSetEventDestination(ctx context.Context, par addawsRestjson1_serdeOpCreateConfigurationSetEventDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_CreateDedicatedIpPool.go b/service/pinpointemail/api_op_CreateDedicatedIpPool.go index 86ab448ea22..94089bb02ab 100644 --- a/service/pinpointemail/api_op_CreateDedicatedIpPool.go +++ b/service/pinpointemail/api_op_CreateDedicatedIpPool.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateDedicatedIpPool(ctx context.Context, params *CreateDedica addawsRestjson1_serdeOpCreateDedicatedIpPoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_CreateDeliverabilityTestReport.go b/service/pinpointemail/api_op_CreateDeliverabilityTestReport.go index 2d85326f1b9..72cb921292b 100644 --- a/service/pinpointemail/api_op_CreateDeliverabilityTestReport.go +++ b/service/pinpointemail/api_op_CreateDeliverabilityTestReport.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateDeliverabilityTestReport(ctx context.Context, params *Cre addawsRestjson1_serdeOpCreateDeliverabilityTestReportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_CreateEmailIdentity.go b/service/pinpointemail/api_op_CreateEmailIdentity.go index 963e5cf099c..43c18f4670c 100644 --- a/service/pinpointemail/api_op_CreateEmailIdentity.go +++ b/service/pinpointemail/api_op_CreateEmailIdentity.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) CreateEmailIdentity(ctx context.Context, params *CreateEmailIde addawsRestjson1_serdeOpCreateEmailIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_DeleteConfigurationSet.go b/service/pinpointemail/api_op_DeleteConfigurationSet.go index 97eff847a96..833753f74d7 100644 --- a/service/pinpointemail/api_op_DeleteConfigurationSet.go +++ b/service/pinpointemail/api_op_DeleteConfigurationSet.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteConfigurationSet(ctx context.Context, params *DeleteConfi addawsRestjson1_serdeOpDeleteConfigurationSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_DeleteConfigurationSetEventDestination.go b/service/pinpointemail/api_op_DeleteConfigurationSetEventDestination.go index b8d249c1aef..eb72f48e49c 100644 --- a/service/pinpointemail/api_op_DeleteConfigurationSetEventDestination.go +++ b/service/pinpointemail/api_op_DeleteConfigurationSetEventDestination.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteConfigurationSetEventDestination(ctx context.Context, par addawsRestjson1_serdeOpDeleteConfigurationSetEventDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_DeleteDedicatedIpPool.go b/service/pinpointemail/api_op_DeleteDedicatedIpPool.go index e900045f474..1461c87e7ad 100644 --- a/service/pinpointemail/api_op_DeleteDedicatedIpPool.go +++ b/service/pinpointemail/api_op_DeleteDedicatedIpPool.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDedicatedIpPool(ctx context.Context, params *DeleteDedica addawsRestjson1_serdeOpDeleteDedicatedIpPoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_DeleteEmailIdentity.go b/service/pinpointemail/api_op_DeleteEmailIdentity.go index fe62af8e163..b277438ec2d 100644 --- a/service/pinpointemail/api_op_DeleteEmailIdentity.go +++ b/service/pinpointemail/api_op_DeleteEmailIdentity.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteEmailIdentity(ctx context.Context, params *DeleteEmailIde addawsRestjson1_serdeOpDeleteEmailIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_GetAccount.go b/service/pinpointemail/api_op_GetAccount.go index 71169ffa134..ce87abcc814 100644 --- a/service/pinpointemail/api_op_GetAccount.go +++ b/service/pinpointemail/api_op_GetAccount.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetAccount(ctx context.Context, params *GetAccountInput, optFns addawsRestjson1_serdeOpGetAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_GetBlacklistReports.go b/service/pinpointemail/api_op_GetBlacklistReports.go index b2164edc500..0d901c3b843 100644 --- a/service/pinpointemail/api_op_GetBlacklistReports.go +++ b/service/pinpointemail/api_op_GetBlacklistReports.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetBlacklistReports(ctx context.Context, params *GetBlacklistRe addawsRestjson1_serdeOpGetBlacklistReportsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_GetConfigurationSet.go b/service/pinpointemail/api_op_GetConfigurationSet.go index adbb44db4dc..7cb85dad1e0 100644 --- a/service/pinpointemail/api_op_GetConfigurationSet.go +++ b/service/pinpointemail/api_op_GetConfigurationSet.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetConfigurationSet(ctx context.Context, params *GetConfigurati addawsRestjson1_serdeOpGetConfigurationSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_GetConfigurationSetEventDestinations.go b/service/pinpointemail/api_op_GetConfigurationSetEventDestinations.go index c1838dafb2d..a0250b846fe 100644 --- a/service/pinpointemail/api_op_GetConfigurationSetEventDestinations.go +++ b/service/pinpointemail/api_op_GetConfigurationSetEventDestinations.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetConfigurationSetEventDestinations(ctx context.Context, param addawsRestjson1_serdeOpGetConfigurationSetEventDestinationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_GetDedicatedIp.go b/service/pinpointemail/api_op_GetDedicatedIp.go index 2ff2c63d2e8..97d2ced22a0 100644 --- a/service/pinpointemail/api_op_GetDedicatedIp.go +++ b/service/pinpointemail/api_op_GetDedicatedIp.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetDedicatedIp(ctx context.Context, params *GetDedicatedIpInput addawsRestjson1_serdeOpGetDedicatedIpMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_GetDedicatedIps.go b/service/pinpointemail/api_op_GetDedicatedIps.go index 5d480d34525..cfbc308b67d 100644 --- a/service/pinpointemail/api_op_GetDedicatedIps.go +++ b/service/pinpointemail/api_op_GetDedicatedIps.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetDedicatedIps(ctx context.Context, params *GetDedicatedIpsInp addawsRestjson1_serdeOpGetDedicatedIpsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_GetDeliverabilityDashboardOptions.go b/service/pinpointemail/api_op_GetDeliverabilityDashboardOptions.go index 01b19defb2b..0672db9fe2c 100644 --- a/service/pinpointemail/api_op_GetDeliverabilityDashboardOptions.go +++ b/service/pinpointemail/api_op_GetDeliverabilityDashboardOptions.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) GetDeliverabilityDashboardOptions(ctx context.Context, params * addawsRestjson1_serdeOpGetDeliverabilityDashboardOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_GetDeliverabilityTestReport.go b/service/pinpointemail/api_op_GetDeliverabilityTestReport.go index 9cfc56c3b6f..b7f928ce142 100644 --- a/service/pinpointemail/api_op_GetDeliverabilityTestReport.go +++ b/service/pinpointemail/api_op_GetDeliverabilityTestReport.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDeliverabilityTestReport(ctx context.Context, params *GetDel addawsRestjson1_serdeOpGetDeliverabilityTestReportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_GetDomainDeliverabilityCampaign.go b/service/pinpointemail/api_op_GetDomainDeliverabilityCampaign.go index 8f3bd3fd377..cc427a4ce24 100644 --- a/service/pinpointemail/api_op_GetDomainDeliverabilityCampaign.go +++ b/service/pinpointemail/api_op_GetDomainDeliverabilityCampaign.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetDomainDeliverabilityCampaign(ctx context.Context, params *Ge addawsRestjson1_serdeOpGetDomainDeliverabilityCampaignMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_GetDomainStatisticsReport.go b/service/pinpointemail/api_op_GetDomainStatisticsReport.go index 7e8ea864773..bf3d57cd512 100644 --- a/service/pinpointemail/api_op_GetDomainStatisticsReport.go +++ b/service/pinpointemail/api_op_GetDomainStatisticsReport.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetDomainStatisticsReport(ctx context.Context, params *GetDomai addawsRestjson1_serdeOpGetDomainStatisticsReportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_GetEmailIdentity.go b/service/pinpointemail/api_op_GetEmailIdentity.go index 572012f3bb0..bd241c8127e 100644 --- a/service/pinpointemail/api_op_GetEmailIdentity.go +++ b/service/pinpointemail/api_op_GetEmailIdentity.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetEmailIdentity(ctx context.Context, params *GetEmailIdentityI addawsRestjson1_serdeOpGetEmailIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_ListConfigurationSets.go b/service/pinpointemail/api_op_ListConfigurationSets.go index 9344302ee75..a4097fae583 100644 --- a/service/pinpointemail/api_op_ListConfigurationSets.go +++ b/service/pinpointemail/api_op_ListConfigurationSets.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) ListConfigurationSets(ctx context.Context, params *ListConfigur addawsRestjson1_serdeOpListConfigurationSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_ListDedicatedIpPools.go b/service/pinpointemail/api_op_ListDedicatedIpPools.go index 5f4c611581c..b5a12076759 100644 --- a/service/pinpointemail/api_op_ListDedicatedIpPools.go +++ b/service/pinpointemail/api_op_ListDedicatedIpPools.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ListDedicatedIpPools(ctx context.Context, params *ListDedicated addawsRestjson1_serdeOpListDedicatedIpPoolsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_ListDeliverabilityTestReports.go b/service/pinpointemail/api_op_ListDeliverabilityTestReports.go index 19465f66b6f..9892b899a3b 100644 --- a/service/pinpointemail/api_op_ListDeliverabilityTestReports.go +++ b/service/pinpointemail/api_op_ListDeliverabilityTestReports.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListDeliverabilityTestReports(ctx context.Context, params *List addawsRestjson1_serdeOpListDeliverabilityTestReportsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_ListDomainDeliverabilityCampaigns.go b/service/pinpointemail/api_op_ListDomainDeliverabilityCampaigns.go index aa9c6cae62e..e4e94dfd865 100644 --- a/service/pinpointemail/api_op_ListDomainDeliverabilityCampaigns.go +++ b/service/pinpointemail/api_op_ListDomainDeliverabilityCampaigns.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListDomainDeliverabilityCampaigns(ctx context.Context, params * addawsRestjson1_serdeOpListDomainDeliverabilityCampaignsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_ListEmailIdentities.go b/service/pinpointemail/api_op_ListEmailIdentities.go index 2c76f9021f1..948087e2efe 100644 --- a/service/pinpointemail/api_op_ListEmailIdentities.go +++ b/service/pinpointemail/api_op_ListEmailIdentities.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListEmailIdentities(ctx context.Context, params *ListEmailIdent addawsRestjson1_serdeOpListEmailIdentitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_ListTagsForResource.go b/service/pinpointemail/api_op_ListTagsForResource.go index c921664eeb2..3317683f1cf 100644 --- a/service/pinpointemail/api_op_ListTagsForResource.go +++ b/service/pinpointemail/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_PutAccountDedicatedIpWarmupAttributes.go b/service/pinpointemail/api_op_PutAccountDedicatedIpWarmupAttributes.go index 9bb23d67ca6..6a954d47ca6 100644 --- a/service/pinpointemail/api_op_PutAccountDedicatedIpWarmupAttributes.go +++ b/service/pinpointemail/api_op_PutAccountDedicatedIpWarmupAttributes.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) PutAccountDedicatedIpWarmupAttributes(ctx context.Context, para addawsRestjson1_serdeOpPutAccountDedicatedIpWarmupAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_PutAccountSendingAttributes.go b/service/pinpointemail/api_op_PutAccountSendingAttributes.go index 9589646785f..a7dd6dee421 100644 --- a/service/pinpointemail/api_op_PutAccountSendingAttributes.go +++ b/service/pinpointemail/api_op_PutAccountSendingAttributes.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) PutAccountSendingAttributes(ctx context.Context, params *PutAcc addawsRestjson1_serdeOpPutAccountSendingAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_PutConfigurationSetDeliveryOptions.go b/service/pinpointemail/api_op_PutConfigurationSetDeliveryOptions.go index c6e60bee068..4c0cc081f19 100644 --- a/service/pinpointemail/api_op_PutConfigurationSetDeliveryOptions.go +++ b/service/pinpointemail/api_op_PutConfigurationSetDeliveryOptions.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) PutConfigurationSetDeliveryOptions(ctx context.Context, params addawsRestjson1_serdeOpPutConfigurationSetDeliveryOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_PutConfigurationSetReputationOptions.go b/service/pinpointemail/api_op_PutConfigurationSetReputationOptions.go index c6bad99fd80..4d896035b69 100644 --- a/service/pinpointemail/api_op_PutConfigurationSetReputationOptions.go +++ b/service/pinpointemail/api_op_PutConfigurationSetReputationOptions.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) PutConfigurationSetReputationOptions(ctx context.Context, param addawsRestjson1_serdeOpPutConfigurationSetReputationOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_PutConfigurationSetSendingOptions.go b/service/pinpointemail/api_op_PutConfigurationSetSendingOptions.go index 45cc1c1feae..a02dfe034f6 100644 --- a/service/pinpointemail/api_op_PutConfigurationSetSendingOptions.go +++ b/service/pinpointemail/api_op_PutConfigurationSetSendingOptions.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) PutConfigurationSetSendingOptions(ctx context.Context, params * addawsRestjson1_serdeOpPutConfigurationSetSendingOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_PutConfigurationSetTrackingOptions.go b/service/pinpointemail/api_op_PutConfigurationSetTrackingOptions.go index 02e3f0663e3..a101a2dd850 100644 --- a/service/pinpointemail/api_op_PutConfigurationSetTrackingOptions.go +++ b/service/pinpointemail/api_op_PutConfigurationSetTrackingOptions.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) PutConfigurationSetTrackingOptions(ctx context.Context, params addawsRestjson1_serdeOpPutConfigurationSetTrackingOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_PutDedicatedIpInPool.go b/service/pinpointemail/api_op_PutDedicatedIpInPool.go index c72e6818919..5edfd6c97f9 100644 --- a/service/pinpointemail/api_op_PutDedicatedIpInPool.go +++ b/service/pinpointemail/api_op_PutDedicatedIpInPool.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) PutDedicatedIpInPool(ctx context.Context, params *PutDedicatedI addawsRestjson1_serdeOpPutDedicatedIpInPoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_PutDedicatedIpWarmupAttributes.go b/service/pinpointemail/api_op_PutDedicatedIpWarmupAttributes.go index 91410c19f05..451bad6df17 100644 --- a/service/pinpointemail/api_op_PutDedicatedIpWarmupAttributes.go +++ b/service/pinpointemail/api_op_PutDedicatedIpWarmupAttributes.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) PutDedicatedIpWarmupAttributes(ctx context.Context, params *Put addawsRestjson1_serdeOpPutDedicatedIpWarmupAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_PutDeliverabilityDashboardOption.go b/service/pinpointemail/api_op_PutDeliverabilityDashboardOption.go index 80b78c1b5bf..31c39d41d01 100644 --- a/service/pinpointemail/api_op_PutDeliverabilityDashboardOption.go +++ b/service/pinpointemail/api_op_PutDeliverabilityDashboardOption.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) PutDeliverabilityDashboardOption(ctx context.Context, params *P addawsRestjson1_serdeOpPutDeliverabilityDashboardOptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_PutEmailIdentityDkimAttributes.go b/service/pinpointemail/api_op_PutEmailIdentityDkimAttributes.go index 1870795d03d..9ce7def5927 100644 --- a/service/pinpointemail/api_op_PutEmailIdentityDkimAttributes.go +++ b/service/pinpointemail/api_op_PutEmailIdentityDkimAttributes.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) PutEmailIdentityDkimAttributes(ctx context.Context, params *Put addawsRestjson1_serdeOpPutEmailIdentityDkimAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_PutEmailIdentityFeedbackAttributes.go b/service/pinpointemail/api_op_PutEmailIdentityFeedbackAttributes.go index 035d9e87891..0cb6cd3d861 100644 --- a/service/pinpointemail/api_op_PutEmailIdentityFeedbackAttributes.go +++ b/service/pinpointemail/api_op_PutEmailIdentityFeedbackAttributes.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) PutEmailIdentityFeedbackAttributes(ctx context.Context, params addawsRestjson1_serdeOpPutEmailIdentityFeedbackAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_PutEmailIdentityMailFromAttributes.go b/service/pinpointemail/api_op_PutEmailIdentityMailFromAttributes.go index 9c789c006aa..867ef76fd12 100644 --- a/service/pinpointemail/api_op_PutEmailIdentityMailFromAttributes.go +++ b/service/pinpointemail/api_op_PutEmailIdentityMailFromAttributes.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutEmailIdentityMailFromAttributes(ctx context.Context, params addawsRestjson1_serdeOpPutEmailIdentityMailFromAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_SendEmail.go b/service/pinpointemail/api_op_SendEmail.go index bdbc9153cd7..2a533f25575 100644 --- a/service/pinpointemail/api_op_SendEmail.go +++ b/service/pinpointemail/api_op_SendEmail.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) SendEmail(ctx context.Context, params *SendEmailInput, optFns . addawsRestjson1_serdeOpSendEmailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_TagResource.go b/service/pinpointemail/api_op_TagResource.go index 3b7db95b939..a7f4a086006 100644 --- a/service/pinpointemail/api_op_TagResource.go +++ b/service/pinpointemail/api_op_TagResource.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_UntagResource.go b/service/pinpointemail/api_op_UntagResource.go index 96127e2c572..0a23fcf7282 100644 --- a/service/pinpointemail/api_op_UntagResource.go +++ b/service/pinpointemail/api_op_UntagResource.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/api_op_UpdateConfigurationSetEventDestination.go b/service/pinpointemail/api_op_UpdateConfigurationSetEventDestination.go index 94a97ff9965..d1d8c530ab0 100644 --- a/service/pinpointemail/api_op_UpdateConfigurationSetEventDestination.go +++ b/service/pinpointemail/api_op_UpdateConfigurationSetEventDestination.go @@ -5,7 +5,6 @@ package pinpointemail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointemail/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) UpdateConfigurationSetEventDestination(ctx context.Context, par addawsRestjson1_serdeOpUpdateConfigurationSetEventDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointemail/endpoints.go b/service/pinpointemail/endpoints.go index 8a01794e973..2ab469cd5f7 100644 --- a/service/pinpointemail/endpoints.go +++ b/service/pinpointemail/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/pinpointsmsvoice/api_client.go b/service/pinpointsmsvoice/api_client.go index 725437e9ef0..9e61556d232 100644 --- a/service/pinpointsmsvoice/api_client.go +++ b/service/pinpointsmsvoice/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/pinpointsmsvoice/api_op_CreateConfigurationSet.go b/service/pinpointsmsvoice/api_op_CreateConfigurationSet.go index 05346f2ecd8..b4d4ca3feff 100644 --- a/service/pinpointsmsvoice/api_op_CreateConfigurationSet.go +++ b/service/pinpointsmsvoice/api_op_CreateConfigurationSet.go @@ -5,7 +5,6 @@ package pinpointsmsvoice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateConfigurationSet(ctx context.Context, params *CreateConfi addawsRestjson1_serdeOpCreateConfigurationSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointsmsvoice/api_op_CreateConfigurationSetEventDestination.go b/service/pinpointsmsvoice/api_op_CreateConfigurationSetEventDestination.go index 732972ba5ab..e741ec8a08c 100644 --- a/service/pinpointsmsvoice/api_op_CreateConfigurationSetEventDestination.go +++ b/service/pinpointsmsvoice/api_op_CreateConfigurationSetEventDestination.go @@ -5,7 +5,6 @@ package pinpointsmsvoice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateConfigurationSetEventDestination(ctx context.Context, par addawsRestjson1_serdeOpCreateConfigurationSetEventDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointsmsvoice/api_op_DeleteConfigurationSet.go b/service/pinpointsmsvoice/api_op_DeleteConfigurationSet.go index 243d4a47722..0182abc5bd7 100644 --- a/service/pinpointsmsvoice/api_op_DeleteConfigurationSet.go +++ b/service/pinpointsmsvoice/api_op_DeleteConfigurationSet.go @@ -5,7 +5,6 @@ package pinpointsmsvoice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteConfigurationSet(ctx context.Context, params *DeleteConfi addawsRestjson1_serdeOpDeleteConfigurationSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointsmsvoice/api_op_DeleteConfigurationSetEventDestination.go b/service/pinpointsmsvoice/api_op_DeleteConfigurationSetEventDestination.go index aa8b106082c..d80caf87417 100644 --- a/service/pinpointsmsvoice/api_op_DeleteConfigurationSetEventDestination.go +++ b/service/pinpointsmsvoice/api_op_DeleteConfigurationSetEventDestination.go @@ -5,7 +5,6 @@ package pinpointsmsvoice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteConfigurationSetEventDestination(ctx context.Context, par addawsRestjson1_serdeOpDeleteConfigurationSetEventDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointsmsvoice/api_op_GetConfigurationSetEventDestinations.go b/service/pinpointsmsvoice/api_op_GetConfigurationSetEventDestinations.go index 16c5e2a6568..d92a25e8c86 100644 --- a/service/pinpointsmsvoice/api_op_GetConfigurationSetEventDestinations.go +++ b/service/pinpointsmsvoice/api_op_GetConfigurationSetEventDestinations.go @@ -5,7 +5,6 @@ package pinpointsmsvoice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetConfigurationSetEventDestinations(ctx context.Context, param addawsRestjson1_serdeOpGetConfigurationSetEventDestinationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointsmsvoice/api_op_ListConfigurationSets.go b/service/pinpointsmsvoice/api_op_ListConfigurationSets.go index f3415e57681..2caaae594a2 100644 --- a/service/pinpointsmsvoice/api_op_ListConfigurationSets.go +++ b/service/pinpointsmsvoice/api_op_ListConfigurationSets.go @@ -5,7 +5,6 @@ package pinpointsmsvoice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ListConfigurationSets(ctx context.Context, params *ListConfigur addawsRestjson1_serdeOpListConfigurationSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointsmsvoice/api_op_SendVoiceMessage.go b/service/pinpointsmsvoice/api_op_SendVoiceMessage.go index 0e3e3f2f90e..9d7e5a55c94 100644 --- a/service/pinpointsmsvoice/api_op_SendVoiceMessage.go +++ b/service/pinpointsmsvoice/api_op_SendVoiceMessage.go @@ -5,7 +5,6 @@ package pinpointsmsvoice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoice/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SendVoiceMessage(ctx context.Context, params *SendVoiceMessageI addawsRestjson1_serdeOpSendVoiceMessageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointsmsvoice/api_op_UpdateConfigurationSetEventDestination.go b/service/pinpointsmsvoice/api_op_UpdateConfigurationSetEventDestination.go index b70fd23b2b3..9345961bc7b 100644 --- a/service/pinpointsmsvoice/api_op_UpdateConfigurationSetEventDestination.go +++ b/service/pinpointsmsvoice/api_op_UpdateConfigurationSetEventDestination.go @@ -5,7 +5,6 @@ package pinpointsmsvoice import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoice/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateConfigurationSetEventDestination(ctx context.Context, par addawsRestjson1_serdeOpUpdateConfigurationSetEventDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pinpointsmsvoice/endpoints.go b/service/pinpointsmsvoice/endpoints.go index c043c8bd0ef..e282753773f 100644 --- a/service/pinpointsmsvoice/endpoints.go +++ b/service/pinpointsmsvoice/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/polly/api_client.go b/service/polly/api_client.go index 81121a6310b..d213d48f3dc 100644 --- a/service/polly/api_client.go +++ b/service/polly/api_client.go @@ -81,30 +81,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -170,6 +146,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/polly/api_op_DeleteLexicon.go b/service/polly/api_op_DeleteLexicon.go index 5ca9cc21a91..7ed5b2203f4 100644 --- a/service/polly/api_op_DeleteLexicon.go +++ b/service/polly/api_op_DeleteLexicon.go @@ -5,7 +5,6 @@ package polly import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteLexicon(ctx context.Context, params *DeleteLexiconInput, addawsRestjson1_serdeOpDeleteLexiconMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/polly/api_op_DescribeVoices.go b/service/polly/api_op_DescribeVoices.go index da779d25572..654c4287ed4 100644 --- a/service/polly/api_op_DescribeVoices.go +++ b/service/polly/api_op_DescribeVoices.go @@ -5,7 +5,6 @@ package polly import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/polly/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) DescribeVoices(ctx context.Context, params *DescribeVoicesInput addawsRestjson1_serdeOpDescribeVoicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/polly/api_op_GetLexicon.go b/service/polly/api_op_GetLexicon.go index 99eaa39291a..b3c3165007e 100644 --- a/service/polly/api_op_GetLexicon.go +++ b/service/polly/api_op_GetLexicon.go @@ -5,7 +5,6 @@ package polly import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/polly/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetLexicon(ctx context.Context, params *GetLexiconInput, optFns addawsRestjson1_serdeOpGetLexiconMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/polly/api_op_GetSpeechSynthesisTask.go b/service/polly/api_op_GetSpeechSynthesisTask.go index 3af489d8979..3aa30363cbe 100644 --- a/service/polly/api_op_GetSpeechSynthesisTask.go +++ b/service/polly/api_op_GetSpeechSynthesisTask.go @@ -5,7 +5,6 @@ package polly import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/polly/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetSpeechSynthesisTask(ctx context.Context, params *GetSpeechSy addawsRestjson1_serdeOpGetSpeechSynthesisTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/polly/api_op_ListLexicons.go b/service/polly/api_op_ListLexicons.go index 0d43d6a84fa..bb53a16df48 100644 --- a/service/polly/api_op_ListLexicons.go +++ b/service/polly/api_op_ListLexicons.go @@ -5,7 +5,6 @@ package polly import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/polly/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListLexicons(ctx context.Context, params *ListLexiconsInput, op addawsRestjson1_serdeOpListLexiconsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/polly/api_op_ListSpeechSynthesisTasks.go b/service/polly/api_op_ListSpeechSynthesisTasks.go index 45f1ceef760..cc655d89849 100644 --- a/service/polly/api_op_ListSpeechSynthesisTasks.go +++ b/service/polly/api_op_ListSpeechSynthesisTasks.go @@ -5,7 +5,6 @@ package polly import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/polly/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListSpeechSynthesisTasks(ctx context.Context, params *ListSpeec addawsRestjson1_serdeOpListSpeechSynthesisTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/polly/api_op_PutLexicon.go b/service/polly/api_op_PutLexicon.go index 1b54dc79bce..123c8336ee2 100644 --- a/service/polly/api_op_PutLexicon.go +++ b/service/polly/api_op_PutLexicon.go @@ -5,7 +5,6 @@ package polly import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) PutLexicon(ctx context.Context, params *PutLexiconInput, optFns addawsRestjson1_serdeOpPutLexiconMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/polly/api_op_StartSpeechSynthesisTask.go b/service/polly/api_op_StartSpeechSynthesisTask.go index 064c484b0b3..4340a10b28c 100644 --- a/service/polly/api_op_StartSpeechSynthesisTask.go +++ b/service/polly/api_op_StartSpeechSynthesisTask.go @@ -5,7 +5,6 @@ package polly import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/polly/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) StartSpeechSynthesisTask(ctx context.Context, params *StartSpee addawsRestjson1_serdeOpStartSpeechSynthesisTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/polly/api_op_SynthesizeSpeech.go b/service/polly/api_op_SynthesizeSpeech.go index 6bbc680cbf4..4a5be9ad231 100644 --- a/service/polly/api_op_SynthesizeSpeech.go +++ b/service/polly/api_op_SynthesizeSpeech.go @@ -5,7 +5,6 @@ package polly import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/polly/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) SynthesizeSpeech(ctx context.Context, params *SynthesizeSpeechI addawsRestjson1_serdeOpSynthesizeSpeechMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/polly/endpoints.go b/service/polly/endpoints.go index 350ef756511..1cf4a129dd5 100644 --- a/service/polly/endpoints.go +++ b/service/polly/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/pricing/api_client.go b/service/pricing/api_client.go index feaf8763d92..1d6c0e01ed2 100644 --- a/service/pricing/api_client.go +++ b/service/pricing/api_client.go @@ -97,30 +97,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -186,6 +162,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/pricing/api_op_DescribeServices.go b/service/pricing/api_op_DescribeServices.go index 15e05c7fc47..69803d619b2 100644 --- a/service/pricing/api_op_DescribeServices.go +++ b/service/pricing/api_op_DescribeServices.go @@ -5,7 +5,6 @@ package pricing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pricing/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeServices(ctx context.Context, params *DescribeServicesI addawsAwsjson11_serdeOpDescribeServicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pricing/api_op_GetAttributeValues.go b/service/pricing/api_op_GetAttributeValues.go index 5a4ba8d476a..039466676fd 100644 --- a/service/pricing/api_op_GetAttributeValues.go +++ b/service/pricing/api_op_GetAttributeValues.go @@ -5,7 +5,6 @@ package pricing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pricing/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetAttributeValues(ctx context.Context, params *GetAttributeVal addawsAwsjson11_serdeOpGetAttributeValuesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pricing/api_op_GetProducts.go b/service/pricing/api_op_GetProducts.go index 5beb9d5e9c1..12180905e30 100644 --- a/service/pricing/api_op_GetProducts.go +++ b/service/pricing/api_op_GetProducts.go @@ -5,7 +5,6 @@ package pricing import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/pricing/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetProducts(ctx context.Context, params *GetProductsInput, optF addawsAwsjson11_serdeOpGetProductsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/pricing/endpoints.go b/service/pricing/endpoints.go index e698ac1721d..390be62430c 100644 --- a/service/pricing/endpoints.go +++ b/service/pricing/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/qldb/api_client.go b/service/qldb/api_client.go index 1262837f009..4a9e91b5d93 100644 --- a/service/qldb/api_client.go +++ b/service/qldb/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/qldb/api_op_CancelJournalKinesisStream.go b/service/qldb/api_op_CancelJournalKinesisStream.go index 28eab063f7d..71e6b947db2 100644 --- a/service/qldb/api_op_CancelJournalKinesisStream.go +++ b/service/qldb/api_op_CancelJournalKinesisStream.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) CancelJournalKinesisStream(ctx context.Context, params *CancelJ addawsRestjson1_serdeOpCancelJournalKinesisStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/api_op_CreateLedger.go b/service/qldb/api_op_CreateLedger.go index 13d1434fa13..f011e56bd37 100644 --- a/service/qldb/api_op_CreateLedger.go +++ b/service/qldb/api_op_CreateLedger.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/qldb/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateLedger(ctx context.Context, params *CreateLedgerInput, op addawsRestjson1_serdeOpCreateLedgerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/api_op_DeleteLedger.go b/service/qldb/api_op_DeleteLedger.go index 4e5542adedd..afcc2648c6d 100644 --- a/service/qldb/api_op_DeleteLedger.go +++ b/service/qldb/api_op_DeleteLedger.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteLedger(ctx context.Context, params *DeleteLedgerInput, op addawsRestjson1_serdeOpDeleteLedgerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/api_op_DescribeJournalKinesisStream.go b/service/qldb/api_op_DescribeJournalKinesisStream.go index ee035032b7d..03bd65de6a6 100644 --- a/service/qldb/api_op_DescribeJournalKinesisStream.go +++ b/service/qldb/api_op_DescribeJournalKinesisStream.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/qldb/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeJournalKinesisStream(ctx context.Context, params *Descr addawsRestjson1_serdeOpDescribeJournalKinesisStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/api_op_DescribeJournalS3Export.go b/service/qldb/api_op_DescribeJournalS3Export.go index 8783079270c..6ce02b7d223 100644 --- a/service/qldb/api_op_DescribeJournalS3Export.go +++ b/service/qldb/api_op_DescribeJournalS3Export.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/qldb/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DescribeJournalS3Export(ctx context.Context, params *DescribeJo addawsRestjson1_serdeOpDescribeJournalS3ExportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/api_op_DescribeLedger.go b/service/qldb/api_op_DescribeLedger.go index 9a6f9a9fac3..6a733152f3c 100644 --- a/service/qldb/api_op_DescribeLedger.go +++ b/service/qldb/api_op_DescribeLedger.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/qldb/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeLedger(ctx context.Context, params *DescribeLedgerInput addawsRestjson1_serdeOpDescribeLedgerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/api_op_ExportJournalToS3.go b/service/qldb/api_op_ExportJournalToS3.go index 45c86b78960..cc81fa1c87e 100644 --- a/service/qldb/api_op_ExportJournalToS3.go +++ b/service/qldb/api_op_ExportJournalToS3.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/qldb/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ExportJournalToS3(ctx context.Context, params *ExportJournalToS addawsRestjson1_serdeOpExportJournalToS3Middlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/api_op_GetBlock.go b/service/qldb/api_op_GetBlock.go index 7573c7c855a..257de20e3b4 100644 --- a/service/qldb/api_op_GetBlock.go +++ b/service/qldb/api_op_GetBlock.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/qldb/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) GetBlock(ctx context.Context, params *GetBlockInput, optFns ... addawsRestjson1_serdeOpGetBlockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/api_op_GetDigest.go b/service/qldb/api_op_GetDigest.go index eb05a5999d4..14c4b7fd387 100644 --- a/service/qldb/api_op_GetDigest.go +++ b/service/qldb/api_op_GetDigest.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/qldb/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetDigest(ctx context.Context, params *GetDigestInput, optFns . addawsRestjson1_serdeOpGetDigestMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/api_op_GetRevision.go b/service/qldb/api_op_GetRevision.go index a79feaa39ea..f276a10f3d3 100644 --- a/service/qldb/api_op_GetRevision.go +++ b/service/qldb/api_op_GetRevision.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/qldb/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetRevision(ctx context.Context, params *GetRevisionInput, optF addawsRestjson1_serdeOpGetRevisionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/api_op_ListJournalKinesisStreamsForLedger.go b/service/qldb/api_op_ListJournalKinesisStreamsForLedger.go index cde61a73cbf..cea9dc0a703 100644 --- a/service/qldb/api_op_ListJournalKinesisStreamsForLedger.go +++ b/service/qldb/api_op_ListJournalKinesisStreamsForLedger.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/qldb/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListJournalKinesisStreamsForLedger(ctx context.Context, params addawsRestjson1_serdeOpListJournalKinesisStreamsForLedgerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/api_op_ListJournalS3Exports.go b/service/qldb/api_op_ListJournalS3Exports.go index a1250dec385..248d36ea5e0 100644 --- a/service/qldb/api_op_ListJournalS3Exports.go +++ b/service/qldb/api_op_ListJournalS3Exports.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/qldb/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListJournalS3Exports(ctx context.Context, params *ListJournalS3 addawsRestjson1_serdeOpListJournalS3ExportsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/api_op_ListJournalS3ExportsForLedger.go b/service/qldb/api_op_ListJournalS3ExportsForLedger.go index 37e686bfd28..4978238fea9 100644 --- a/service/qldb/api_op_ListJournalS3ExportsForLedger.go +++ b/service/qldb/api_op_ListJournalS3ExportsForLedger.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/qldb/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListJournalS3ExportsForLedger(ctx context.Context, params *List addawsRestjson1_serdeOpListJournalS3ExportsForLedgerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/api_op_ListLedgers.go b/service/qldb/api_op_ListLedgers.go index 14457cdfb29..b319ed7c241 100644 --- a/service/qldb/api_op_ListLedgers.go +++ b/service/qldb/api_op_ListLedgers.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/qldb/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListLedgers(ctx context.Context, params *ListLedgersInput, optF addawsRestjson1_serdeOpListLedgersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/api_op_ListTagsForResource.go b/service/qldb/api_op_ListTagsForResource.go index 413fa4b4aea..749afad3cbb 100644 --- a/service/qldb/api_op_ListTagsForResource.go +++ b/service/qldb/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/api_op_StreamJournalToKinesis.go b/service/qldb/api_op_StreamJournalToKinesis.go index db539b103a4..90ab221a60a 100644 --- a/service/qldb/api_op_StreamJournalToKinesis.go +++ b/service/qldb/api_op_StreamJournalToKinesis.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/qldb/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) StreamJournalToKinesis(ctx context.Context, params *StreamJourn addawsRestjson1_serdeOpStreamJournalToKinesisMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/api_op_TagResource.go b/service/qldb/api_op_TagResource.go index 724e7953db5..a52dd952fb6 100644 --- a/service/qldb/api_op_TagResource.go +++ b/service/qldb/api_op_TagResource.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/api_op_UntagResource.go b/service/qldb/api_op_UntagResource.go index f1773fbb702..1fe395d1d69 100644 --- a/service/qldb/api_op_UntagResource.go +++ b/service/qldb/api_op_UntagResource.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/api_op_UpdateLedger.go b/service/qldb/api_op_UpdateLedger.go index ad57f3192f2..1c16ea6b660 100644 --- a/service/qldb/api_op_UpdateLedger.go +++ b/service/qldb/api_op_UpdateLedger.go @@ -5,7 +5,6 @@ package qldb import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/qldb/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateLedger(ctx context.Context, params *UpdateLedgerInput, op addawsRestjson1_serdeOpUpdateLedgerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldb/endpoints.go b/service/qldb/endpoints.go index fee1f5c6f61..33eab39eb1c 100644 --- a/service/qldb/endpoints.go +++ b/service/qldb/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/qldbsession/api_client.go b/service/qldbsession/api_client.go index a7013e90209..9b9dcb55f41 100644 --- a/service/qldbsession/api_client.go +++ b/service/qldbsession/api_client.go @@ -93,30 +93,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -182,6 +158,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/qldbsession/api_op_SendCommand.go b/service/qldbsession/api_op_SendCommand.go index 9e23eb8a3d1..af08937e3b6 100644 --- a/service/qldbsession/api_op_SendCommand.go +++ b/service/qldbsession/api_op_SendCommand.go @@ -5,7 +5,6 @@ package qldbsession import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/qldbsession/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) SendCommand(ctx context.Context, params *SendCommandInput, optF addawsAwsjson10_serdeOpSendCommandMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/qldbsession/endpoints.go b/service/qldbsession/endpoints.go index 688e938b873..4740b8b05cf 100644 --- a/service/qldbsession/endpoints.go +++ b/service/qldbsession/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/quicksight/api_client.go b/service/quicksight/api_client.go index 6d9166bce34..ceafd0480bf 100644 --- a/service/quicksight/api_client.go +++ b/service/quicksight/api_client.go @@ -81,30 +81,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -170,6 +146,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/quicksight/api_op_CancelIngestion.go b/service/quicksight/api_op_CancelIngestion.go index 8b3db323627..1449f2eb6f1 100644 --- a/service/quicksight/api_op_CancelIngestion.go +++ b/service/quicksight/api_op_CancelIngestion.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CancelIngestion(ctx context.Context, params *CancelIngestionInp addawsRestjson1_serdeOpCancelIngestionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_CreateAccountCustomization.go b/service/quicksight/api_op_CreateAccountCustomization.go index efb128f757e..3f1260d9fa1 100644 --- a/service/quicksight/api_op_CreateAccountCustomization.go +++ b/service/quicksight/api_op_CreateAccountCustomization.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateAccountCustomization(ctx context.Context, params *CreateA addawsRestjson1_serdeOpCreateAccountCustomizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_CreateDashboard.go b/service/quicksight/api_op_CreateDashboard.go index 3ee83514bb7..a1efee14462 100644 --- a/service/quicksight/api_op_CreateDashboard.go +++ b/service/quicksight/api_op_CreateDashboard.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateDashboard(ctx context.Context, params *CreateDashboardInp addawsRestjson1_serdeOpCreateDashboardMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_CreateDataSet.go b/service/quicksight/api_op_CreateDataSet.go index c5e48262dab..52cb4fcbdfb 100644 --- a/service/quicksight/api_op_CreateDataSet.go +++ b/service/quicksight/api_op_CreateDataSet.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDataSet(ctx context.Context, params *CreateDataSetInput, addawsRestjson1_serdeOpCreateDataSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_CreateDataSource.go b/service/quicksight/api_op_CreateDataSource.go index 93a94196b49..fa660cc2e49 100644 --- a/service/quicksight/api_op_CreateDataSource.go +++ b/service/quicksight/api_op_CreateDataSource.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDataSource(ctx context.Context, params *CreateDataSourceI addawsRestjson1_serdeOpCreateDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_CreateGroup.go b/service/quicksight/api_op_CreateGroup.go index 1dd9fce5143..a4ee9996dd2 100644 --- a/service/quicksight/api_op_CreateGroup.go +++ b/service/quicksight/api_op_CreateGroup.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateGroup(ctx context.Context, params *CreateGroupInput, optF addawsRestjson1_serdeOpCreateGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_CreateGroupMembership.go b/service/quicksight/api_op_CreateGroupMembership.go index faa379c59a0..71a3a96ae80 100644 --- a/service/quicksight/api_op_CreateGroupMembership.go +++ b/service/quicksight/api_op_CreateGroupMembership.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateGroupMembership(ctx context.Context, params *CreateGroupM addawsRestjson1_serdeOpCreateGroupMembershipMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_CreateIAMPolicyAssignment.go b/service/quicksight/api_op_CreateIAMPolicyAssignment.go index fc735a9ca5b..a00208c638c 100644 --- a/service/quicksight/api_op_CreateIAMPolicyAssignment.go +++ b/service/quicksight/api_op_CreateIAMPolicyAssignment.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateIAMPolicyAssignment(ctx context.Context, params *CreateIA addawsRestjson1_serdeOpCreateIAMPolicyAssignmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_CreateIngestion.go b/service/quicksight/api_op_CreateIngestion.go index e639af24493..2328ed8f583 100644 --- a/service/quicksight/api_op_CreateIngestion.go +++ b/service/quicksight/api_op_CreateIngestion.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateIngestion(ctx context.Context, params *CreateIngestionInp addawsRestjson1_serdeOpCreateIngestionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_CreateNamespace.go b/service/quicksight/api_op_CreateNamespace.go index adfa54f69c1..8ec252e3c08 100644 --- a/service/quicksight/api_op_CreateNamespace.go +++ b/service/quicksight/api_op_CreateNamespace.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateNamespace(ctx context.Context, params *CreateNamespaceInp addawsRestjson1_serdeOpCreateNamespaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_CreateTemplate.go b/service/quicksight/api_op_CreateTemplate.go index b070e35ff43..4a430903a0d 100644 --- a/service/quicksight/api_op_CreateTemplate.go +++ b/service/quicksight/api_op_CreateTemplate.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateTemplate(ctx context.Context, params *CreateTemplateInput addawsRestjson1_serdeOpCreateTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_CreateTemplateAlias.go b/service/quicksight/api_op_CreateTemplateAlias.go index 77b7e27611e..8257ae5b692 100644 --- a/service/quicksight/api_op_CreateTemplateAlias.go +++ b/service/quicksight/api_op_CreateTemplateAlias.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateTemplateAlias(ctx context.Context, params *CreateTemplate addawsRestjson1_serdeOpCreateTemplateAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_CreateTheme.go b/service/quicksight/api_op_CreateTheme.go index 90de307732d..86ba3671c26 100644 --- a/service/quicksight/api_op_CreateTheme.go +++ b/service/quicksight/api_op_CreateTheme.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateTheme(ctx context.Context, params *CreateThemeInput, optF addawsRestjson1_serdeOpCreateThemeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_CreateThemeAlias.go b/service/quicksight/api_op_CreateThemeAlias.go index 21edaa9d951..b5a1808d2ee 100644 --- a/service/quicksight/api_op_CreateThemeAlias.go +++ b/service/quicksight/api_op_CreateThemeAlias.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateThemeAlias(ctx context.Context, params *CreateThemeAliasI addawsRestjson1_serdeOpCreateThemeAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DeleteAccountCustomization.go b/service/quicksight/api_op_DeleteAccountCustomization.go index bf7df0cdf15..1880145c76a 100644 --- a/service/quicksight/api_op_DeleteAccountCustomization.go +++ b/service/quicksight/api_op_DeleteAccountCustomization.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteAccountCustomization(ctx context.Context, params *DeleteA addawsRestjson1_serdeOpDeleteAccountCustomizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DeleteDashboard.go b/service/quicksight/api_op_DeleteDashboard.go index 846b2789184..41d97c3e487 100644 --- a/service/quicksight/api_op_DeleteDashboard.go +++ b/service/quicksight/api_op_DeleteDashboard.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDashboard(ctx context.Context, params *DeleteDashboardInp addawsRestjson1_serdeOpDeleteDashboardMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DeleteDataSet.go b/service/quicksight/api_op_DeleteDataSet.go index e5d48ef98c5..4a603f42c42 100644 --- a/service/quicksight/api_op_DeleteDataSet.go +++ b/service/quicksight/api_op_DeleteDataSet.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDataSet(ctx context.Context, params *DeleteDataSetInput, addawsRestjson1_serdeOpDeleteDataSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DeleteDataSource.go b/service/quicksight/api_op_DeleteDataSource.go index 9c670737db8..0fe0174fe2d 100644 --- a/service/quicksight/api_op_DeleteDataSource.go +++ b/service/quicksight/api_op_DeleteDataSource.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDataSource(ctx context.Context, params *DeleteDataSourceI addawsRestjson1_serdeOpDeleteDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DeleteGroup.go b/service/quicksight/api_op_DeleteGroup.go index 8bf237f46a8..c3656fb07cd 100644 --- a/service/quicksight/api_op_DeleteGroup.go +++ b/service/quicksight/api_op_DeleteGroup.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteGroup(ctx context.Context, params *DeleteGroupInput, optF addawsRestjson1_serdeOpDeleteGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DeleteGroupMembership.go b/service/quicksight/api_op_DeleteGroupMembership.go index d046a72cedb..f0bc4dc0b10 100644 --- a/service/quicksight/api_op_DeleteGroupMembership.go +++ b/service/quicksight/api_op_DeleteGroupMembership.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteGroupMembership(ctx context.Context, params *DeleteGroupM addawsRestjson1_serdeOpDeleteGroupMembershipMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DeleteIAMPolicyAssignment.go b/service/quicksight/api_op_DeleteIAMPolicyAssignment.go index b520ff57821..8b24675388e 100644 --- a/service/quicksight/api_op_DeleteIAMPolicyAssignment.go +++ b/service/quicksight/api_op_DeleteIAMPolicyAssignment.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteIAMPolicyAssignment(ctx context.Context, params *DeleteIA addawsRestjson1_serdeOpDeleteIAMPolicyAssignmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DeleteNamespace.go b/service/quicksight/api_op_DeleteNamespace.go index f1d951c251b..ad1e4ff4870 100644 --- a/service/quicksight/api_op_DeleteNamespace.go +++ b/service/quicksight/api_op_DeleteNamespace.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteNamespace(ctx context.Context, params *DeleteNamespaceInp addawsRestjson1_serdeOpDeleteNamespaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DeleteTemplate.go b/service/quicksight/api_op_DeleteTemplate.go index 7904211eee2..4385f6eeed5 100644 --- a/service/quicksight/api_op_DeleteTemplate.go +++ b/service/quicksight/api_op_DeleteTemplate.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteTemplate(ctx context.Context, params *DeleteTemplateInput addawsRestjson1_serdeOpDeleteTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DeleteTemplateAlias.go b/service/quicksight/api_op_DeleteTemplateAlias.go index c1e91672ca6..6e0be95b7f3 100644 --- a/service/quicksight/api_op_DeleteTemplateAlias.go +++ b/service/quicksight/api_op_DeleteTemplateAlias.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteTemplateAlias(ctx context.Context, params *DeleteTemplate addawsRestjson1_serdeOpDeleteTemplateAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DeleteTheme.go b/service/quicksight/api_op_DeleteTheme.go index 18633e608c2..fc5ab1291f8 100644 --- a/service/quicksight/api_op_DeleteTheme.go +++ b/service/quicksight/api_op_DeleteTheme.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteTheme(ctx context.Context, params *DeleteThemeInput, optF addawsRestjson1_serdeOpDeleteThemeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DeleteThemeAlias.go b/service/quicksight/api_op_DeleteThemeAlias.go index 6e8035c5554..84015f65164 100644 --- a/service/quicksight/api_op_DeleteThemeAlias.go +++ b/service/quicksight/api_op_DeleteThemeAlias.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteThemeAlias(ctx context.Context, params *DeleteThemeAliasI addawsRestjson1_serdeOpDeleteThemeAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DeleteUser.go b/service/quicksight/api_op_DeleteUser.go index fb1d490d6fe..8f533278feb 100644 --- a/service/quicksight/api_op_DeleteUser.go +++ b/service/quicksight/api_op_DeleteUser.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteUser(ctx context.Context, params *DeleteUserInput, optFns addawsRestjson1_serdeOpDeleteUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DeleteUserByPrincipalId.go b/service/quicksight/api_op_DeleteUserByPrincipalId.go index b2abec0a09b..e6503069192 100644 --- a/service/quicksight/api_op_DeleteUserByPrincipalId.go +++ b/service/quicksight/api_op_DeleteUserByPrincipalId.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteUserByPrincipalId(ctx context.Context, params *DeleteUser addawsRestjson1_serdeOpDeleteUserByPrincipalIdMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeAccountCustomization.go b/service/quicksight/api_op_DescribeAccountCustomization.go index 63f9a5b66df..49b49950317 100644 --- a/service/quicksight/api_op_DescribeAccountCustomization.go +++ b/service/quicksight/api_op_DescribeAccountCustomization.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeAccountCustomization(ctx context.Context, params *Descr addawsRestjson1_serdeOpDescribeAccountCustomizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeAccountSettings.go b/service/quicksight/api_op_DescribeAccountSettings.go index 3a7b12a98f0..dcc4caa2640 100644 --- a/service/quicksight/api_op_DescribeAccountSettings.go +++ b/service/quicksight/api_op_DescribeAccountSettings.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAccountSettings(ctx context.Context, params *DescribeAc addawsRestjson1_serdeOpDescribeAccountSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeDashboard.go b/service/quicksight/api_op_DescribeDashboard.go index 44c30d54ed8..a0f5e736fd3 100644 --- a/service/quicksight/api_op_DescribeDashboard.go +++ b/service/quicksight/api_op_DescribeDashboard.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDashboard(ctx context.Context, params *DescribeDashboar addawsRestjson1_serdeOpDescribeDashboardMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeDashboardPermissions.go b/service/quicksight/api_op_DescribeDashboardPermissions.go index 69f58859f53..113062c3b8b 100644 --- a/service/quicksight/api_op_DescribeDashboardPermissions.go +++ b/service/quicksight/api_op_DescribeDashboardPermissions.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDashboardPermissions(ctx context.Context, params *Descr addawsRestjson1_serdeOpDescribeDashboardPermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeDataSet.go b/service/quicksight/api_op_DescribeDataSet.go index 1ad181b0f19..20e4b575e65 100644 --- a/service/quicksight/api_op_DescribeDataSet.go +++ b/service/quicksight/api_op_DescribeDataSet.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDataSet(ctx context.Context, params *DescribeDataSetInp addawsRestjson1_serdeOpDescribeDataSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeDataSetPermissions.go b/service/quicksight/api_op_DescribeDataSetPermissions.go index d35d2877f99..9da65b7aa4d 100644 --- a/service/quicksight/api_op_DescribeDataSetPermissions.go +++ b/service/quicksight/api_op_DescribeDataSetPermissions.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDataSetPermissions(ctx context.Context, params *Describ addawsRestjson1_serdeOpDescribeDataSetPermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeDataSource.go b/service/quicksight/api_op_DescribeDataSource.go index c157a7a1673..4eb14fb7cd1 100644 --- a/service/quicksight/api_op_DescribeDataSource.go +++ b/service/quicksight/api_op_DescribeDataSource.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDataSource(ctx context.Context, params *DescribeDataSou addawsRestjson1_serdeOpDescribeDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeDataSourcePermissions.go b/service/quicksight/api_op_DescribeDataSourcePermissions.go index f08a4428dd8..aca4d8965d0 100644 --- a/service/quicksight/api_op_DescribeDataSourcePermissions.go +++ b/service/quicksight/api_op_DescribeDataSourcePermissions.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDataSourcePermissions(ctx context.Context, params *Desc addawsRestjson1_serdeOpDescribeDataSourcePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeGroup.go b/service/quicksight/api_op_DescribeGroup.go index be22103c19c..944881a1477 100644 --- a/service/quicksight/api_op_DescribeGroup.go +++ b/service/quicksight/api_op_DescribeGroup.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeGroup(ctx context.Context, params *DescribeGroupInput, addawsRestjson1_serdeOpDescribeGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeIAMPolicyAssignment.go b/service/quicksight/api_op_DescribeIAMPolicyAssignment.go index 1dc1069f227..dfc1cd01bf4 100644 --- a/service/quicksight/api_op_DescribeIAMPolicyAssignment.go +++ b/service/quicksight/api_op_DescribeIAMPolicyAssignment.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeIAMPolicyAssignment(ctx context.Context, params *Descri addawsRestjson1_serdeOpDescribeIAMPolicyAssignmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeIngestion.go b/service/quicksight/api_op_DescribeIngestion.go index e68bb84f128..7e462425875 100644 --- a/service/quicksight/api_op_DescribeIngestion.go +++ b/service/quicksight/api_op_DescribeIngestion.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeIngestion(ctx context.Context, params *DescribeIngestio addawsRestjson1_serdeOpDescribeIngestionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeNamespace.go b/service/quicksight/api_op_DescribeNamespace.go index e57826b3f21..d5254159f9c 100644 --- a/service/quicksight/api_op_DescribeNamespace.go +++ b/service/quicksight/api_op_DescribeNamespace.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeNamespace(ctx context.Context, params *DescribeNamespac addawsRestjson1_serdeOpDescribeNamespaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeTemplate.go b/service/quicksight/api_op_DescribeTemplate.go index df6f23f4c89..fcb334374f4 100644 --- a/service/quicksight/api_op_DescribeTemplate.go +++ b/service/quicksight/api_op_DescribeTemplate.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeTemplate(ctx context.Context, params *DescribeTemplateI addawsRestjson1_serdeOpDescribeTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeTemplateAlias.go b/service/quicksight/api_op_DescribeTemplateAlias.go index a21f44f4cc9..0fa204b091f 100644 --- a/service/quicksight/api_op_DescribeTemplateAlias.go +++ b/service/quicksight/api_op_DescribeTemplateAlias.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeTemplateAlias(ctx context.Context, params *DescribeTemp addawsRestjson1_serdeOpDescribeTemplateAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeTemplatePermissions.go b/service/quicksight/api_op_DescribeTemplatePermissions.go index 547166b96b4..364b914c564 100644 --- a/service/quicksight/api_op_DescribeTemplatePermissions.go +++ b/service/quicksight/api_op_DescribeTemplatePermissions.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeTemplatePermissions(ctx context.Context, params *Descri addawsRestjson1_serdeOpDescribeTemplatePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeTheme.go b/service/quicksight/api_op_DescribeTheme.go index 5dc2b22c870..d60086dbd64 100644 --- a/service/quicksight/api_op_DescribeTheme.go +++ b/service/quicksight/api_op_DescribeTheme.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeTheme(ctx context.Context, params *DescribeThemeInput, addawsRestjson1_serdeOpDescribeThemeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeThemeAlias.go b/service/quicksight/api_op_DescribeThemeAlias.go index 3916724a2f2..60933f0e837 100644 --- a/service/quicksight/api_op_DescribeThemeAlias.go +++ b/service/quicksight/api_op_DescribeThemeAlias.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeThemeAlias(ctx context.Context, params *DescribeThemeAl addawsRestjson1_serdeOpDescribeThemeAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeThemePermissions.go b/service/quicksight/api_op_DescribeThemePermissions.go index 4ca1cee4fef..63ca84acb80 100644 --- a/service/quicksight/api_op_DescribeThemePermissions.go +++ b/service/quicksight/api_op_DescribeThemePermissions.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeThemePermissions(ctx context.Context, params *DescribeT addawsRestjson1_serdeOpDescribeThemePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_DescribeUser.go b/service/quicksight/api_op_DescribeUser.go index 6c8e3e4c2ea..0d54fffd720 100644 --- a/service/quicksight/api_op_DescribeUser.go +++ b/service/quicksight/api_op_DescribeUser.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeUser(ctx context.Context, params *DescribeUserInput, op addawsRestjson1_serdeOpDescribeUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_GetDashboardEmbedUrl.go b/service/quicksight/api_op_GetDashboardEmbedUrl.go index 62ca741953b..962d80cf4f7 100644 --- a/service/quicksight/api_op_GetDashboardEmbedUrl.go +++ b/service/quicksight/api_op_GetDashboardEmbedUrl.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) GetDashboardEmbedUrl(ctx context.Context, params *GetDashboardE addawsRestjson1_serdeOpGetDashboardEmbedUrlMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_GetSessionEmbedUrl.go b/service/quicksight/api_op_GetSessionEmbedUrl.go index 87c0f1292d8..fb64bc0fdda 100644 --- a/service/quicksight/api_op_GetSessionEmbedUrl.go +++ b/service/quicksight/api_op_GetSessionEmbedUrl.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetSessionEmbedUrl(ctx context.Context, params *GetSessionEmbed addawsRestjson1_serdeOpGetSessionEmbedUrlMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListDashboardVersions.go b/service/quicksight/api_op_ListDashboardVersions.go index 74eb3b56ee1..a2a215c4080 100644 --- a/service/quicksight/api_op_ListDashboardVersions.go +++ b/service/quicksight/api_op_ListDashboardVersions.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDashboardVersions(ctx context.Context, params *ListDashboar addawsRestjson1_serdeOpListDashboardVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListDashboards.go b/service/quicksight/api_op_ListDashboards.go index c02975dbffe..33f11e8e374 100644 --- a/service/quicksight/api_op_ListDashboards.go +++ b/service/quicksight/api_op_ListDashboards.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDashboards(ctx context.Context, params *ListDashboardsInput addawsRestjson1_serdeOpListDashboardsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListDataSets.go b/service/quicksight/api_op_ListDataSets.go index 449714bed9a..b8cc0c4331c 100644 --- a/service/quicksight/api_op_ListDataSets.go +++ b/service/quicksight/api_op_ListDataSets.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListDataSets(ctx context.Context, params *ListDataSetsInput, op addawsRestjson1_serdeOpListDataSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListDataSources.go b/service/quicksight/api_op_ListDataSources.go index 56f43a9c98a..b314f5abe4e 100644 --- a/service/quicksight/api_op_ListDataSources.go +++ b/service/quicksight/api_op_ListDataSources.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDataSources(ctx context.Context, params *ListDataSourcesInp addawsRestjson1_serdeOpListDataSourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListGroupMemberships.go b/service/quicksight/api_op_ListGroupMemberships.go index b2d5c32b115..f473b4c9c7e 100644 --- a/service/quicksight/api_op_ListGroupMemberships.go +++ b/service/quicksight/api_op_ListGroupMemberships.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListGroupMemberships(ctx context.Context, params *ListGroupMemb addawsRestjson1_serdeOpListGroupMembershipsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListGroups.go b/service/quicksight/api_op_ListGroups.go index 4ed0c44f7c3..097ca893cb0 100644 --- a/service/quicksight/api_op_ListGroups.go +++ b/service/quicksight/api_op_ListGroups.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListGroups(ctx context.Context, params *ListGroupsInput, optFns addawsRestjson1_serdeOpListGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListIAMPolicyAssignments.go b/service/quicksight/api_op_ListIAMPolicyAssignments.go index 3d49539f4a8..249afde1b30 100644 --- a/service/quicksight/api_op_ListIAMPolicyAssignments.go +++ b/service/quicksight/api_op_ListIAMPolicyAssignments.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListIAMPolicyAssignments(ctx context.Context, params *ListIAMPo addawsRestjson1_serdeOpListIAMPolicyAssignmentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListIAMPolicyAssignmentsForUser.go b/service/quicksight/api_op_ListIAMPolicyAssignmentsForUser.go index 2be67945938..4568249e241 100644 --- a/service/quicksight/api_op_ListIAMPolicyAssignmentsForUser.go +++ b/service/quicksight/api_op_ListIAMPolicyAssignmentsForUser.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListIAMPolicyAssignmentsForUser(ctx context.Context, params *Li addawsRestjson1_serdeOpListIAMPolicyAssignmentsForUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListIngestions.go b/service/quicksight/api_op_ListIngestions.go index 70ff15480e6..7d4d1551909 100644 --- a/service/quicksight/api_op_ListIngestions.go +++ b/service/quicksight/api_op_ListIngestions.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListIngestions(ctx context.Context, params *ListIngestionsInput addawsRestjson1_serdeOpListIngestionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListNamespaces.go b/service/quicksight/api_op_ListNamespaces.go index a38d0f8f2d5..4324388939f 100644 --- a/service/quicksight/api_op_ListNamespaces.go +++ b/service/quicksight/api_op_ListNamespaces.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListNamespaces(ctx context.Context, params *ListNamespacesInput addawsRestjson1_serdeOpListNamespacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListTagsForResource.go b/service/quicksight/api_op_ListTagsForResource.go index e31e315ee13..68f6d8df18f 100644 --- a/service/quicksight/api_op_ListTagsForResource.go +++ b/service/quicksight/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListTemplateAliases.go b/service/quicksight/api_op_ListTemplateAliases.go index 6ce5f05b5c6..c17d3299ace 100644 --- a/service/quicksight/api_op_ListTemplateAliases.go +++ b/service/quicksight/api_op_ListTemplateAliases.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTemplateAliases(ctx context.Context, params *ListTemplateAl addawsRestjson1_serdeOpListTemplateAliasesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListTemplateVersions.go b/service/quicksight/api_op_ListTemplateVersions.go index ed8a710f0f4..c835bb37f9d 100644 --- a/service/quicksight/api_op_ListTemplateVersions.go +++ b/service/quicksight/api_op_ListTemplateVersions.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTemplateVersions(ctx context.Context, params *ListTemplateV addawsRestjson1_serdeOpListTemplateVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListTemplates.go b/service/quicksight/api_op_ListTemplates.go index f26b7e8cdf2..a5a39a9d783 100644 --- a/service/quicksight/api_op_ListTemplates.go +++ b/service/quicksight/api_op_ListTemplates.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTemplates(ctx context.Context, params *ListTemplatesInput, addawsRestjson1_serdeOpListTemplatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListThemeAliases.go b/service/quicksight/api_op_ListThemeAliases.go index a5a62414d02..b6a2efd9852 100644 --- a/service/quicksight/api_op_ListThemeAliases.go +++ b/service/quicksight/api_op_ListThemeAliases.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListThemeAliases(ctx context.Context, params *ListThemeAliasesI addawsRestjson1_serdeOpListThemeAliasesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListThemeVersions.go b/service/quicksight/api_op_ListThemeVersions.go index 2c01f814d12..978bb9bfc33 100644 --- a/service/quicksight/api_op_ListThemeVersions.go +++ b/service/quicksight/api_op_ListThemeVersions.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListThemeVersions(ctx context.Context, params *ListThemeVersion addawsRestjson1_serdeOpListThemeVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListThemes.go b/service/quicksight/api_op_ListThemes.go index d4615d21044..d3ff546d4c3 100644 --- a/service/quicksight/api_op_ListThemes.go +++ b/service/quicksight/api_op_ListThemes.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListThemes(ctx context.Context, params *ListThemesInput, optFns addawsRestjson1_serdeOpListThemesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListUserGroups.go b/service/quicksight/api_op_ListUserGroups.go index e9a76f073ee..4be7c70942e 100644 --- a/service/quicksight/api_op_ListUserGroups.go +++ b/service/quicksight/api_op_ListUserGroups.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListUserGroups(ctx context.Context, params *ListUserGroupsInput addawsRestjson1_serdeOpListUserGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_ListUsers.go b/service/quicksight/api_op_ListUsers.go index 8097b2765e1..7bdc375b1c7 100644 --- a/service/quicksight/api_op_ListUsers.go +++ b/service/quicksight/api_op_ListUsers.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListUsers(ctx context.Context, params *ListUsersInput, optFns . addawsRestjson1_serdeOpListUsersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_RegisterUser.go b/service/quicksight/api_op_RegisterUser.go index 75d668d480c..dca6bc97ec0 100644 --- a/service/quicksight/api_op_RegisterUser.go +++ b/service/quicksight/api_op_RegisterUser.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) RegisterUser(ctx context.Context, params *RegisterUserInput, op addawsRestjson1_serdeOpRegisterUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_SearchDashboards.go b/service/quicksight/api_op_SearchDashboards.go index 88176fa8360..ebac8237ba1 100644 --- a/service/quicksight/api_op_SearchDashboards.go +++ b/service/quicksight/api_op_SearchDashboards.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SearchDashboards(ctx context.Context, params *SearchDashboardsI addawsRestjson1_serdeOpSearchDashboardsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_TagResource.go b/service/quicksight/api_op_TagResource.go index 1ce96c197f4..fb67d417a44 100644 --- a/service/quicksight/api_op_TagResource.go +++ b/service/quicksight/api_op_TagResource.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UntagResource.go b/service/quicksight/api_op_UntagResource.go index 972aac729c8..f445a5bb778 100644 --- a/service/quicksight/api_op_UntagResource.go +++ b/service/quicksight/api_op_UntagResource.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UpdateAccountCustomization.go b/service/quicksight/api_op_UpdateAccountCustomization.go index 39dfefb7865..b2ce38014e8 100644 --- a/service/quicksight/api_op_UpdateAccountCustomization.go +++ b/service/quicksight/api_op_UpdateAccountCustomization.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateAccountCustomization(ctx context.Context, params *UpdateA addawsRestjson1_serdeOpUpdateAccountCustomizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UpdateAccountSettings.go b/service/quicksight/api_op_UpdateAccountSettings.go index cb2d6755af7..a7cc2c3e632 100644 --- a/service/quicksight/api_op_UpdateAccountSettings.go +++ b/service/quicksight/api_op_UpdateAccountSettings.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateAccountSettings(ctx context.Context, params *UpdateAccoun addawsRestjson1_serdeOpUpdateAccountSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UpdateDashboard.go b/service/quicksight/api_op_UpdateDashboard.go index c140bddbb70..abafa7ae77e 100644 --- a/service/quicksight/api_op_UpdateDashboard.go +++ b/service/quicksight/api_op_UpdateDashboard.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDashboard(ctx context.Context, params *UpdateDashboardInp addawsRestjson1_serdeOpUpdateDashboardMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UpdateDashboardPermissions.go b/service/quicksight/api_op_UpdateDashboardPermissions.go index dbd20f25137..73a8e842a66 100644 --- a/service/quicksight/api_op_UpdateDashboardPermissions.go +++ b/service/quicksight/api_op_UpdateDashboardPermissions.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDashboardPermissions(ctx context.Context, params *UpdateD addawsRestjson1_serdeOpUpdateDashboardPermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UpdateDashboardPublishedVersion.go b/service/quicksight/api_op_UpdateDashboardPublishedVersion.go index 74c0549f2db..5c6d1aa5618 100644 --- a/service/quicksight/api_op_UpdateDashboardPublishedVersion.go +++ b/service/quicksight/api_op_UpdateDashboardPublishedVersion.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateDashboardPublishedVersion(ctx context.Context, params *Up addawsRestjson1_serdeOpUpdateDashboardPublishedVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UpdateDataSet.go b/service/quicksight/api_op_UpdateDataSet.go index c764c4e582f..7bc4e941b08 100644 --- a/service/quicksight/api_op_UpdateDataSet.go +++ b/service/quicksight/api_op_UpdateDataSet.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDataSet(ctx context.Context, params *UpdateDataSetInput, addawsRestjson1_serdeOpUpdateDataSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UpdateDataSetPermissions.go b/service/quicksight/api_op_UpdateDataSetPermissions.go index 5607f54d970..12aed5ba804 100644 --- a/service/quicksight/api_op_UpdateDataSetPermissions.go +++ b/service/quicksight/api_op_UpdateDataSetPermissions.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateDataSetPermissions(ctx context.Context, params *UpdateDat addawsRestjson1_serdeOpUpdateDataSetPermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UpdateDataSource.go b/service/quicksight/api_op_UpdateDataSource.go index e9f85e16668..eef58527ae1 100644 --- a/service/quicksight/api_op_UpdateDataSource.go +++ b/service/quicksight/api_op_UpdateDataSource.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDataSource(ctx context.Context, params *UpdateDataSourceI addawsRestjson1_serdeOpUpdateDataSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UpdateDataSourcePermissions.go b/service/quicksight/api_op_UpdateDataSourcePermissions.go index b27ef61375e..4c87e42f6a3 100644 --- a/service/quicksight/api_op_UpdateDataSourcePermissions.go +++ b/service/quicksight/api_op_UpdateDataSourcePermissions.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDataSourcePermissions(ctx context.Context, params *Update addawsRestjson1_serdeOpUpdateDataSourcePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UpdateGroup.go b/service/quicksight/api_op_UpdateGroup.go index cc829596c42..fb1070d53ff 100644 --- a/service/quicksight/api_op_UpdateGroup.go +++ b/service/quicksight/api_op_UpdateGroup.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateGroup(ctx context.Context, params *UpdateGroupInput, optF addawsRestjson1_serdeOpUpdateGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UpdateIAMPolicyAssignment.go b/service/quicksight/api_op_UpdateIAMPolicyAssignment.go index d13a4614fe9..22a3049f644 100644 --- a/service/quicksight/api_op_UpdateIAMPolicyAssignment.go +++ b/service/quicksight/api_op_UpdateIAMPolicyAssignment.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateIAMPolicyAssignment(ctx context.Context, params *UpdateIA addawsRestjson1_serdeOpUpdateIAMPolicyAssignmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UpdateTemplate.go b/service/quicksight/api_op_UpdateTemplate.go index 12c9f0df616..af762a1756c 100644 --- a/service/quicksight/api_op_UpdateTemplate.go +++ b/service/quicksight/api_op_UpdateTemplate.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateTemplate(ctx context.Context, params *UpdateTemplateInput addawsRestjson1_serdeOpUpdateTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UpdateTemplateAlias.go b/service/quicksight/api_op_UpdateTemplateAlias.go index 55c10c3b34e..2f78d520808 100644 --- a/service/quicksight/api_op_UpdateTemplateAlias.go +++ b/service/quicksight/api_op_UpdateTemplateAlias.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateTemplateAlias(ctx context.Context, params *UpdateTemplate addawsRestjson1_serdeOpUpdateTemplateAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UpdateTemplatePermissions.go b/service/quicksight/api_op_UpdateTemplatePermissions.go index 5f7c92faedb..f60773ed0fd 100644 --- a/service/quicksight/api_op_UpdateTemplatePermissions.go +++ b/service/quicksight/api_op_UpdateTemplatePermissions.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateTemplatePermissions(ctx context.Context, params *UpdateTe addawsRestjson1_serdeOpUpdateTemplatePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UpdateTheme.go b/service/quicksight/api_op_UpdateTheme.go index cbc25a4fb95..894c87b098e 100644 --- a/service/quicksight/api_op_UpdateTheme.go +++ b/service/quicksight/api_op_UpdateTheme.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateTheme(ctx context.Context, params *UpdateThemeInput, optF addawsRestjson1_serdeOpUpdateThemeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UpdateThemeAlias.go b/service/quicksight/api_op_UpdateThemeAlias.go index e8b6e9a6f28..acb0a8eb598 100644 --- a/service/quicksight/api_op_UpdateThemeAlias.go +++ b/service/quicksight/api_op_UpdateThemeAlias.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateThemeAlias(ctx context.Context, params *UpdateThemeAliasI addawsRestjson1_serdeOpUpdateThemeAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UpdateThemePermissions.go b/service/quicksight/api_op_UpdateThemePermissions.go index 51ed7d1cb5b..f35a2d75449 100644 --- a/service/quicksight/api_op_UpdateThemePermissions.go +++ b/service/quicksight/api_op_UpdateThemePermissions.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -72,9 +71,9 @@ func (c *Client) UpdateThemePermissions(ctx context.Context, params *UpdateTheme addawsRestjson1_serdeOpUpdateThemePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/api_op_UpdateUser.go b/service/quicksight/api_op_UpdateUser.go index 27d9e0dfe5e..a191d35fc44 100644 --- a/service/quicksight/api_op_UpdateUser.go +++ b/service/quicksight/api_op_UpdateUser.go @@ -5,7 +5,6 @@ package quicksight import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/quicksight/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateUser(ctx context.Context, params *UpdateUserInput, optFns addawsRestjson1_serdeOpUpdateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/quicksight/endpoints.go b/service/quicksight/endpoints.go index 21022453d3f..8f1594cc3b8 100644 --- a/service/quicksight/endpoints.go +++ b/service/quicksight/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/ram/api_client.go b/service/ram/api_client.go index 4f6f4abdd6a..349f7ce0f23 100644 --- a/service/ram/api_client.go +++ b/service/ram/api_client.go @@ -83,30 +83,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -172,6 +148,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/ram/api_op_AcceptResourceShareInvitation.go b/service/ram/api_op_AcceptResourceShareInvitation.go index fec2004e3e4..15fbc01595a 100644 --- a/service/ram/api_op_AcceptResourceShareInvitation.go +++ b/service/ram/api_op_AcceptResourceShareInvitation.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ram/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) AcceptResourceShareInvitation(ctx context.Context, params *Acce addawsRestjson1_serdeOpAcceptResourceShareInvitationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_AssociateResourceShare.go b/service/ram/api_op_AssociateResourceShare.go index 24674a62da6..22228675f60 100644 --- a/service/ram/api_op_AssociateResourceShare.go +++ b/service/ram/api_op_AssociateResourceShare.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ram/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AssociateResourceShare(ctx context.Context, params *AssociateRe addawsRestjson1_serdeOpAssociateResourceShareMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_AssociateResourceSharePermission.go b/service/ram/api_op_AssociateResourceSharePermission.go index 38b0fa4254f..8c9779c2bb1 100644 --- a/service/ram/api_op_AssociateResourceSharePermission.go +++ b/service/ram/api_op_AssociateResourceSharePermission.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AssociateResourceSharePermission(ctx context.Context, params *A addawsRestjson1_serdeOpAssociateResourceSharePermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_CreateResourceShare.go b/service/ram/api_op_CreateResourceShare.go index b1efad959ce..599ff6bda21 100644 --- a/service/ram/api_op_CreateResourceShare.go +++ b/service/ram/api_op_CreateResourceShare.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ram/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateResourceShare(ctx context.Context, params *CreateResource addawsRestjson1_serdeOpCreateResourceShareMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_DeleteResourceShare.go b/service/ram/api_op_DeleteResourceShare.go index 8519c949061..9241d5123c4 100644 --- a/service/ram/api_op_DeleteResourceShare.go +++ b/service/ram/api_op_DeleteResourceShare.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteResourceShare(ctx context.Context, params *DeleteResource addawsRestjson1_serdeOpDeleteResourceShareMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_DisassociateResourceShare.go b/service/ram/api_op_DisassociateResourceShare.go index 98eb3956ad4..dca955a71b9 100644 --- a/service/ram/api_op_DisassociateResourceShare.go +++ b/service/ram/api_op_DisassociateResourceShare.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ram/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DisassociateResourceShare(ctx context.Context, params *Disassoc addawsRestjson1_serdeOpDisassociateResourceShareMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_DisassociateResourceSharePermission.go b/service/ram/api_op_DisassociateResourceSharePermission.go index 8d9b7d677cc..e3056d77af5 100644 --- a/service/ram/api_op_DisassociateResourceSharePermission.go +++ b/service/ram/api_op_DisassociateResourceSharePermission.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisassociateResourceSharePermission(ctx context.Context, params addawsRestjson1_serdeOpDisassociateResourceSharePermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_EnableSharingWithAwsOrganization.go b/service/ram/api_op_EnableSharingWithAwsOrganization.go index f256086b8f7..03e445bcc82 100644 --- a/service/ram/api_op_EnableSharingWithAwsOrganization.go +++ b/service/ram/api_op_EnableSharingWithAwsOrganization.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) EnableSharingWithAwsOrganization(ctx context.Context, params *E addawsRestjson1_serdeOpEnableSharingWithAwsOrganizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_GetPermission.go b/service/ram/api_op_GetPermission.go index 363942082ec..a1366b57085 100644 --- a/service/ram/api_op_GetPermission.go +++ b/service/ram/api_op_GetPermission.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ram/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetPermission(ctx context.Context, params *GetPermissionInput, addawsRestjson1_serdeOpGetPermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_GetResourcePolicies.go b/service/ram/api_op_GetResourcePolicies.go index 2ae8aad0613..b68b8d1e387 100644 --- a/service/ram/api_op_GetResourcePolicies.go +++ b/service/ram/api_op_GetResourcePolicies.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetResourcePolicies(ctx context.Context, params *GetResourcePol addawsRestjson1_serdeOpGetResourcePoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_GetResourceShareAssociations.go b/service/ram/api_op_GetResourceShareAssociations.go index c72abcc3001..06e5d45f40c 100644 --- a/service/ram/api_op_GetResourceShareAssociations.go +++ b/service/ram/api_op_GetResourceShareAssociations.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ram/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetResourceShareAssociations(ctx context.Context, params *GetRe addawsRestjson1_serdeOpGetResourceShareAssociationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_GetResourceShareInvitations.go b/service/ram/api_op_GetResourceShareInvitations.go index e669e99554b..3326c461ca6 100644 --- a/service/ram/api_op_GetResourceShareInvitations.go +++ b/service/ram/api_op_GetResourceShareInvitations.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ram/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetResourceShareInvitations(ctx context.Context, params *GetRes addawsRestjson1_serdeOpGetResourceShareInvitationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_GetResourceShares.go b/service/ram/api_op_GetResourceShares.go index 47c5b591e39..27da628860d 100644 --- a/service/ram/api_op_GetResourceShares.go +++ b/service/ram/api_op_GetResourceShares.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ram/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetResourceShares(ctx context.Context, params *GetResourceShare addawsRestjson1_serdeOpGetResourceSharesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_ListPendingInvitationResources.go b/service/ram/api_op_ListPendingInvitationResources.go index 287fca86653..1d7a77934bb 100644 --- a/service/ram/api_op_ListPendingInvitationResources.go +++ b/service/ram/api_op_ListPendingInvitationResources.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ram/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListPendingInvitationResources(ctx context.Context, params *Lis addawsRestjson1_serdeOpListPendingInvitationResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_ListPermissions.go b/service/ram/api_op_ListPermissions.go index db8e73bd572..cc3ea733ebf 100644 --- a/service/ram/api_op_ListPermissions.go +++ b/service/ram/api_op_ListPermissions.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ram/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListPermissions(ctx context.Context, params *ListPermissionsInp addawsRestjson1_serdeOpListPermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_ListPrincipals.go b/service/ram/api_op_ListPrincipals.go index 9a193d35fe4..934babb7548 100644 --- a/service/ram/api_op_ListPrincipals.go +++ b/service/ram/api_op_ListPrincipals.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ram/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListPrincipals(ctx context.Context, params *ListPrincipalsInput addawsRestjson1_serdeOpListPrincipalsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_ListResourceSharePermissions.go b/service/ram/api_op_ListResourceSharePermissions.go index 6ac8a81c790..59e9cb0ed51 100644 --- a/service/ram/api_op_ListResourceSharePermissions.go +++ b/service/ram/api_op_ListResourceSharePermissions.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ram/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListResourceSharePermissions(ctx context.Context, params *ListR addawsRestjson1_serdeOpListResourceSharePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_ListResourceTypes.go b/service/ram/api_op_ListResourceTypes.go index c7a6afaa85b..e22a50af2e6 100644 --- a/service/ram/api_op_ListResourceTypes.go +++ b/service/ram/api_op_ListResourceTypes.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ram/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListResourceTypes(ctx context.Context, params *ListResourceType addawsRestjson1_serdeOpListResourceTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_ListResources.go b/service/ram/api_op_ListResources.go index b259583466b..10a88c5ab35 100644 --- a/service/ram/api_op_ListResources.go +++ b/service/ram/api_op_ListResources.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ram/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListResources(ctx context.Context, params *ListResourcesInput, addawsRestjson1_serdeOpListResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_PromoteResourceShareCreatedFromPolicy.go b/service/ram/api_op_PromoteResourceShareCreatedFromPolicy.go index eac490a66c9..ea44a4f324a 100644 --- a/service/ram/api_op_PromoteResourceShareCreatedFromPolicy.go +++ b/service/ram/api_op_PromoteResourceShareCreatedFromPolicy.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) PromoteResourceShareCreatedFromPolicy(ctx context.Context, para addawsRestjson1_serdeOpPromoteResourceShareCreatedFromPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_RejectResourceShareInvitation.go b/service/ram/api_op_RejectResourceShareInvitation.go index 5d32b5ed34a..372327950f1 100644 --- a/service/ram/api_op_RejectResourceShareInvitation.go +++ b/service/ram/api_op_RejectResourceShareInvitation.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ram/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RejectResourceShareInvitation(ctx context.Context, params *Reje addawsRestjson1_serdeOpRejectResourceShareInvitationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_TagResource.go b/service/ram/api_op_TagResource.go index 9bec16cc83e..b00257568a9 100644 --- a/service/ram/api_op_TagResource.go +++ b/service/ram/api_op_TagResource.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ram/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_UntagResource.go b/service/ram/api_op_UntagResource.go index 4f8f255f05a..1a5154c1312 100644 --- a/service/ram/api_op_UntagResource.go +++ b/service/ram/api_op_UntagResource.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/api_op_UpdateResourceShare.go b/service/ram/api_op_UpdateResourceShare.go index 51cf65dbbc4..6a57f2e3ed8 100644 --- a/service/ram/api_op_UpdateResourceShare.go +++ b/service/ram/api_op_UpdateResourceShare.go @@ -5,7 +5,6 @@ package ram import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ram/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateResourceShare(ctx context.Context, params *UpdateResource addawsRestjson1_serdeOpUpdateResourceShareMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ram/endpoints.go b/service/ram/endpoints.go index 099203ffe1d..7989a9c9550 100644 --- a/service/ram/endpoints.go +++ b/service/ram/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/rds/api_client.go b/service/rds/api_client.go index 207c8e1d998..4e7d59ec516 100644 --- a/service/rds/api_client.go +++ b/service/rds/api_client.go @@ -113,30 +113,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -202,6 +178,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/rds/api_op_AddRoleToDBCluster.go b/service/rds/api_op_AddRoleToDBCluster.go index f3252911262..5ba965b6f27 100644 --- a/service/rds/api_op_AddRoleToDBCluster.go +++ b/service/rds/api_op_AddRoleToDBCluster.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) AddRoleToDBCluster(ctx context.Context, params *AddRoleToDBClus addawsAwsquery_serdeOpAddRoleToDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_AddRoleToDBInstance.go b/service/rds/api_op_AddRoleToDBInstance.go index 958b4ecb1bf..cc9f561cd8d 100644 --- a/service/rds/api_op_AddRoleToDBInstance.go +++ b/service/rds/api_op_AddRoleToDBInstance.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AddRoleToDBInstance(ctx context.Context, params *AddRoleToDBIns addawsAwsquery_serdeOpAddRoleToDBInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_AddSourceIdentifierToSubscription.go b/service/rds/api_op_AddSourceIdentifierToSubscription.go index 00597544f2f..02c59c2a63a 100644 --- a/service/rds/api_op_AddSourceIdentifierToSubscription.go +++ b/service/rds/api_op_AddSourceIdentifierToSubscription.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) AddSourceIdentifierToSubscription(ctx context.Context, params * addawsAwsquery_serdeOpAddSourceIdentifierToSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_AddTagsToResource.go b/service/rds/api_op_AddTagsToResource.go index 5a0cd3f433c..b69d963429a 100644 --- a/service/rds/api_op_AddTagsToResource.go +++ b/service/rds/api_op_AddTagsToResource.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) AddTagsToResource(ctx context.Context, params *AddTagsToResourc addawsAwsquery_serdeOpAddTagsToResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ApplyPendingMaintenanceAction.go b/service/rds/api_op_ApplyPendingMaintenanceAction.go index 166b3ccba1f..7db9a30dc82 100644 --- a/service/rds/api_op_ApplyPendingMaintenanceAction.go +++ b/service/rds/api_op_ApplyPendingMaintenanceAction.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ApplyPendingMaintenanceAction(ctx context.Context, params *Appl addawsAwsquery_serdeOpApplyPendingMaintenanceActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_AuthorizeDBSecurityGroupIngress.go b/service/rds/api_op_AuthorizeDBSecurityGroupIngress.go index 01f82708e87..072db9479de 100644 --- a/service/rds/api_op_AuthorizeDBSecurityGroupIngress.go +++ b/service/rds/api_op_AuthorizeDBSecurityGroupIngress.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) AuthorizeDBSecurityGroupIngress(ctx context.Context, params *Au addawsAwsquery_serdeOpAuthorizeDBSecurityGroupIngressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_BacktrackDBCluster.go b/service/rds/api_op_BacktrackDBCluster.go index 824e391bc20..bf8bf72bc29 100644 --- a/service/rds/api_op_BacktrackDBCluster.go +++ b/service/rds/api_op_BacktrackDBCluster.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) BacktrackDBCluster(ctx context.Context, params *BacktrackDBClus addawsAwsquery_serdeOpBacktrackDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CancelExportTask.go b/service/rds/api_op_CancelExportTask.go index 1dbeb3966f3..d795532adfb 100644 --- a/service/rds/api_op_CancelExportTask.go +++ b/service/rds/api_op_CancelExportTask.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CancelExportTask(ctx context.Context, params *CancelExportTaskI addawsAwsquery_serdeOpCancelExportTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CopyDBClusterParameterGroup.go b/service/rds/api_op_CopyDBClusterParameterGroup.go index 2e79f4e03dc..034714efa1f 100644 --- a/service/rds/api_op_CopyDBClusterParameterGroup.go +++ b/service/rds/api_op_CopyDBClusterParameterGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CopyDBClusterParameterGroup(ctx context.Context, params *CopyDB addawsAwsquery_serdeOpCopyDBClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CopyDBClusterSnapshot.go b/service/rds/api_op_CopyDBClusterSnapshot.go index 3d034256721..7e266be1f60 100644 --- a/service/rds/api_op_CopyDBClusterSnapshot.go +++ b/service/rds/api_op_CopyDBClusterSnapshot.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -81,9 +80,9 @@ func (c *Client) CopyDBClusterSnapshot(ctx context.Context, params *CopyDBCluste addawsAwsquery_serdeOpCopyDBClusterSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CopyDBParameterGroup.go b/service/rds/api_op_CopyDBParameterGroup.go index a00105bed4f..94344d52af3 100644 --- a/service/rds/api_op_CopyDBParameterGroup.go +++ b/service/rds/api_op_CopyDBParameterGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CopyDBParameterGroup(ctx context.Context, params *CopyDBParamet addawsAwsquery_serdeOpCopyDBParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CopyDBSnapshot.go b/service/rds/api_op_CopyDBSnapshot.go index 7239e88cfd8..fd9b401def9 100644 --- a/service/rds/api_op_CopyDBSnapshot.go +++ b/service/rds/api_op_CopyDBSnapshot.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CopyDBSnapshot(ctx context.Context, params *CopyDBSnapshotInput addawsAwsquery_serdeOpCopyDBSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CopyOptionGroup.go b/service/rds/api_op_CopyOptionGroup.go index 8c112e6fb1d..4292055ce30 100644 --- a/service/rds/api_op_CopyOptionGroup.go +++ b/service/rds/api_op_CopyOptionGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CopyOptionGroup(ctx context.Context, params *CopyOptionGroupInp addawsAwsquery_serdeOpCopyOptionGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CreateCustomAvailabilityZone.go b/service/rds/api_op_CreateCustomAvailabilityZone.go index 54f3b9bcc35..e5ed3c3227d 100644 --- a/service/rds/api_op_CreateCustomAvailabilityZone.go +++ b/service/rds/api_op_CreateCustomAvailabilityZone.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateCustomAvailabilityZone(ctx context.Context, params *Creat addawsAwsquery_serdeOpCreateCustomAvailabilityZoneMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CreateDBCluster.go b/service/rds/api_op_CreateDBCluster.go index 5fb6d0dd0b4..cab96997004 100644 --- a/service/rds/api_op_CreateDBCluster.go +++ b/service/rds/api_op_CreateDBCluster.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateDBCluster(ctx context.Context, params *CreateDBClusterInp addawsAwsquery_serdeOpCreateDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CreateDBClusterEndpoint.go b/service/rds/api_op_CreateDBClusterEndpoint.go index 903faa55dc0..a429f47edd0 100644 --- a/service/rds/api_op_CreateDBClusterEndpoint.go +++ b/service/rds/api_op_CreateDBClusterEndpoint.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateDBClusterEndpoint(ctx context.Context, params *CreateDBCl addawsAwsquery_serdeOpCreateDBClusterEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CreateDBClusterParameterGroup.go b/service/rds/api_op_CreateDBClusterParameterGroup.go index 939dcab9200..070c34b9ba4 100644 --- a/service/rds/api_op_CreateDBClusterParameterGroup.go +++ b/service/rds/api_op_CreateDBClusterParameterGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) CreateDBClusterParameterGroup(ctx context.Context, params *Crea addawsAwsquery_serdeOpCreateDBClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CreateDBClusterSnapshot.go b/service/rds/api_op_CreateDBClusterSnapshot.go index e4d3fc73724..a8f20ab969c 100644 --- a/service/rds/api_op_CreateDBClusterSnapshot.go +++ b/service/rds/api_op_CreateDBClusterSnapshot.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateDBClusterSnapshot(ctx context.Context, params *CreateDBCl addawsAwsquery_serdeOpCreateDBClusterSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CreateDBInstance.go b/service/rds/api_op_CreateDBInstance.go index c326f24015a..60966bc5139 100644 --- a/service/rds/api_op_CreateDBInstance.go +++ b/service/rds/api_op_CreateDBInstance.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDBInstance(ctx context.Context, params *CreateDBInstanceI addawsAwsquery_serdeOpCreateDBInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CreateDBInstanceReadReplica.go b/service/rds/api_op_CreateDBInstanceReadReplica.go index 5603b08785d..17077e1f452 100644 --- a/service/rds/api_op_CreateDBInstanceReadReplica.go +++ b/service/rds/api_op_CreateDBInstanceReadReplica.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) CreateDBInstanceReadReplica(ctx context.Context, params *Create addawsAwsquery_serdeOpCreateDBInstanceReadReplicaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CreateDBParameterGroup.go b/service/rds/api_op_CreateDBParameterGroup.go index 8c01fe1abb5..b2d1190eda0 100644 --- a/service/rds/api_op_CreateDBParameterGroup.go +++ b/service/rds/api_op_CreateDBParameterGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) CreateDBParameterGroup(ctx context.Context, params *CreateDBPar addawsAwsquery_serdeOpCreateDBParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CreateDBProxy.go b/service/rds/api_op_CreateDBProxy.go index 381cfcb0dc6..321884d951a 100644 --- a/service/rds/api_op_CreateDBProxy.go +++ b/service/rds/api_op_CreateDBProxy.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDBProxy(ctx context.Context, params *CreateDBProxyInput, addawsAwsquery_serdeOpCreateDBProxyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CreateDBSecurityGroup.go b/service/rds/api_op_CreateDBSecurityGroup.go index d924b997c55..9c0d99af07a 100644 --- a/service/rds/api_op_CreateDBSecurityGroup.go +++ b/service/rds/api_op_CreateDBSecurityGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateDBSecurityGroup(ctx context.Context, params *CreateDBSecu addawsAwsquery_serdeOpCreateDBSecurityGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CreateDBSnapshot.go b/service/rds/api_op_CreateDBSnapshot.go index 211fbb8facf..e96b9462360 100644 --- a/service/rds/api_op_CreateDBSnapshot.go +++ b/service/rds/api_op_CreateDBSnapshot.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDBSnapshot(ctx context.Context, params *CreateDBSnapshotI addawsAwsquery_serdeOpCreateDBSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CreateDBSubnetGroup.go b/service/rds/api_op_CreateDBSubnetGroup.go index de8fe4b0bd7..024fa8df440 100644 --- a/service/rds/api_op_CreateDBSubnetGroup.go +++ b/service/rds/api_op_CreateDBSubnetGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateDBSubnetGroup(ctx context.Context, params *CreateDBSubnet addawsAwsquery_serdeOpCreateDBSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CreateEventSubscription.go b/service/rds/api_op_CreateEventSubscription.go index 0b741f6dd05..75197626ad8 100644 --- a/service/rds/api_op_CreateEventSubscription.go +++ b/service/rds/api_op_CreateEventSubscription.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) CreateEventSubscription(ctx context.Context, params *CreateEven addawsAwsquery_serdeOpCreateEventSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CreateGlobalCluster.go b/service/rds/api_op_CreateGlobalCluster.go index b2fd5cb6e88..ce3117c3c82 100644 --- a/service/rds/api_op_CreateGlobalCluster.go +++ b/service/rds/api_op_CreateGlobalCluster.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateGlobalCluster(ctx context.Context, params *CreateGlobalCl addawsAwsquery_serdeOpCreateGlobalClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_CreateOptionGroup.go b/service/rds/api_op_CreateOptionGroup.go index 01f3ab7c055..2773cdb9ad0 100644 --- a/service/rds/api_op_CreateOptionGroup.go +++ b/service/rds/api_op_CreateOptionGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateOptionGroup(ctx context.Context, params *CreateOptionGrou addawsAwsquery_serdeOpCreateOptionGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DeleteCustomAvailabilityZone.go b/service/rds/api_op_DeleteCustomAvailabilityZone.go index 3742ea80351..f8ae4e56ab4 100644 --- a/service/rds/api_op_DeleteCustomAvailabilityZone.go +++ b/service/rds/api_op_DeleteCustomAvailabilityZone.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteCustomAvailabilityZone(ctx context.Context, params *Delet addawsAwsquery_serdeOpDeleteCustomAvailabilityZoneMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DeleteDBCluster.go b/service/rds/api_op_DeleteDBCluster.go index cbe49198f84..33136c2117a 100644 --- a/service/rds/api_op_DeleteDBCluster.go +++ b/service/rds/api_op_DeleteDBCluster.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DeleteDBCluster(ctx context.Context, params *DeleteDBClusterInp addawsAwsquery_serdeOpDeleteDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DeleteDBClusterEndpoint.go b/service/rds/api_op_DeleteDBClusterEndpoint.go index 606055ba2ba..dbd65a4b723 100644 --- a/service/rds/api_op_DeleteDBClusterEndpoint.go +++ b/service/rds/api_op_DeleteDBClusterEndpoint.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDBClusterEndpoint(ctx context.Context, params *DeleteDBCl addawsAwsquery_serdeOpDeleteDBClusterEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DeleteDBClusterParameterGroup.go b/service/rds/api_op_DeleteDBClusterParameterGroup.go index fe706b10329..c2a3f11b7e3 100644 --- a/service/rds/api_op_DeleteDBClusterParameterGroup.go +++ b/service/rds/api_op_DeleteDBClusterParameterGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteDBClusterParameterGroup(ctx context.Context, params *Dele addawsAwsquery_serdeOpDeleteDBClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DeleteDBClusterSnapshot.go b/service/rds/api_op_DeleteDBClusterSnapshot.go index 9016ce1e9b3..7d7858354ad 100644 --- a/service/rds/api_op_DeleteDBClusterSnapshot.go +++ b/service/rds/api_op_DeleteDBClusterSnapshot.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DeleteDBClusterSnapshot(ctx context.Context, params *DeleteDBCl addawsAwsquery_serdeOpDeleteDBClusterSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DeleteDBInstance.go b/service/rds/api_op_DeleteDBInstance.go index 16287746266..6fe7b379526 100644 --- a/service/rds/api_op_DeleteDBInstance.go +++ b/service/rds/api_op_DeleteDBInstance.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) DeleteDBInstance(ctx context.Context, params *DeleteDBInstanceI addawsAwsquery_serdeOpDeleteDBInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DeleteDBInstanceAutomatedBackup.go b/service/rds/api_op_DeleteDBInstanceAutomatedBackup.go index 1a1c63427df..2b6cff3b118 100644 --- a/service/rds/api_op_DeleteDBInstanceAutomatedBackup.go +++ b/service/rds/api_op_DeleteDBInstanceAutomatedBackup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteDBInstanceAutomatedBackup(ctx context.Context, params *De addawsAwsquery_serdeOpDeleteDBInstanceAutomatedBackupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DeleteDBParameterGroup.go b/service/rds/api_op_DeleteDBParameterGroup.go index 1cc9e1e8507..7870de57dff 100644 --- a/service/rds/api_op_DeleteDBParameterGroup.go +++ b/service/rds/api_op_DeleteDBParameterGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDBParameterGroup(ctx context.Context, params *DeleteDBPar addawsAwsquery_serdeOpDeleteDBParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DeleteDBProxy.go b/service/rds/api_op_DeleteDBProxy.go index ea52e3c4510..11ece2621ef 100644 --- a/service/rds/api_op_DeleteDBProxy.go +++ b/service/rds/api_op_DeleteDBProxy.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteDBProxy(ctx context.Context, params *DeleteDBProxyInput, addawsAwsquery_serdeOpDeleteDBProxyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DeleteDBSecurityGroup.go b/service/rds/api_op_DeleteDBSecurityGroup.go index b170c33e646..f082dbbf9b1 100644 --- a/service/rds/api_op_DeleteDBSecurityGroup.go +++ b/service/rds/api_op_DeleteDBSecurityGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDBSecurityGroup(ctx context.Context, params *DeleteDBSecu addawsAwsquery_serdeOpDeleteDBSecurityGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DeleteDBSnapshot.go b/service/rds/api_op_DeleteDBSnapshot.go index abc98cd0724..df5ea1e30a0 100644 --- a/service/rds/api_op_DeleteDBSnapshot.go +++ b/service/rds/api_op_DeleteDBSnapshot.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteDBSnapshot(ctx context.Context, params *DeleteDBSnapshotI addawsAwsquery_serdeOpDeleteDBSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DeleteDBSubnetGroup.go b/service/rds/api_op_DeleteDBSubnetGroup.go index a677ac9e6c7..f0d2f5c2253 100644 --- a/service/rds/api_op_DeleteDBSubnetGroup.go +++ b/service/rds/api_op_DeleteDBSubnetGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteDBSubnetGroup(ctx context.Context, params *DeleteDBSubnet addawsAwsquery_serdeOpDeleteDBSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DeleteEventSubscription.go b/service/rds/api_op_DeleteEventSubscription.go index 37ec0235bf2..7c481c0aaef 100644 --- a/service/rds/api_op_DeleteEventSubscription.go +++ b/service/rds/api_op_DeleteEventSubscription.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteEventSubscription(ctx context.Context, params *DeleteEven addawsAwsquery_serdeOpDeleteEventSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DeleteGlobalCluster.go b/service/rds/api_op_DeleteGlobalCluster.go index 31c6d5cfb24..01e7fc35dee 100644 --- a/service/rds/api_op_DeleteGlobalCluster.go +++ b/service/rds/api_op_DeleteGlobalCluster.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DeleteGlobalCluster(ctx context.Context, params *DeleteGlobalCl addawsAwsquery_serdeOpDeleteGlobalClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DeleteInstallationMedia.go b/service/rds/api_op_DeleteInstallationMedia.go index 393777a99a8..897891d13dc 100644 --- a/service/rds/api_op_DeleteInstallationMedia.go +++ b/service/rds/api_op_DeleteInstallationMedia.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DeleteInstallationMedia(ctx context.Context, params *DeleteInst addawsAwsquery_serdeOpDeleteInstallationMediaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DeleteOptionGroup.go b/service/rds/api_op_DeleteOptionGroup.go index 973ef9a0f63..cde10d794ae 100644 --- a/service/rds/api_op_DeleteOptionGroup.go +++ b/service/rds/api_op_DeleteOptionGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteOptionGroup(ctx context.Context, params *DeleteOptionGrou addawsAwsquery_serdeOpDeleteOptionGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DeregisterDBProxyTargets.go b/service/rds/api_op_DeregisterDBProxyTargets.go index 596d84efac2..ad1c8e76ebe 100644 --- a/service/rds/api_op_DeregisterDBProxyTargets.go +++ b/service/rds/api_op_DeregisterDBProxyTargets.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeregisterDBProxyTargets(ctx context.Context, params *Deregiste addawsAwsquery_serdeOpDeregisterDBProxyTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeAccountAttributes.go b/service/rds/api_op_DescribeAccountAttributes.go index f103dfda61b..c3cca70e5f7 100644 --- a/service/rds/api_op_DescribeAccountAttributes.go +++ b/service/rds/api_op_DescribeAccountAttributes.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeAccountAttributes(ctx context.Context, params *Describe addawsAwsquery_serdeOpDescribeAccountAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeCertificates.go b/service/rds/api_op_DescribeCertificates.go index ee73bf14fc6..115c3b97236 100644 --- a/service/rds/api_op_DescribeCertificates.go +++ b/service/rds/api_op_DescribeCertificates.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeCertificates(ctx context.Context, params *DescribeCerti addawsAwsquery_serdeOpDescribeCertificatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeCustomAvailabilityZones.go b/service/rds/api_op_DescribeCustomAvailabilityZones.go index 5059b79df09..f8e68621c99 100644 --- a/service/rds/api_op_DescribeCustomAvailabilityZones.go +++ b/service/rds/api_op_DescribeCustomAvailabilityZones.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeCustomAvailabilityZones(ctx context.Context, params *De addawsAwsquery_serdeOpDescribeCustomAvailabilityZonesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBClusterBacktracks.go b/service/rds/api_op_DescribeDBClusterBacktracks.go index 9b4ae4a89df..e4d041dcaea 100644 --- a/service/rds/api_op_DescribeDBClusterBacktracks.go +++ b/service/rds/api_op_DescribeDBClusterBacktracks.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeDBClusterBacktracks(ctx context.Context, params *Descri addawsAwsquery_serdeOpDescribeDBClusterBacktracksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBClusterEndpoints.go b/service/rds/api_op_DescribeDBClusterEndpoints.go index 91d69a2ee96..a99fcba722e 100644 --- a/service/rds/api_op_DescribeDBClusterEndpoints.go +++ b/service/rds/api_op_DescribeDBClusterEndpoints.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDBClusterEndpoints(ctx context.Context, params *Describ addawsAwsquery_serdeOpDescribeDBClusterEndpointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBClusterParameterGroups.go b/service/rds/api_op_DescribeDBClusterParameterGroups.go index 93711a877b5..ec91c29c72b 100644 --- a/service/rds/api_op_DescribeDBClusterParameterGroups.go +++ b/service/rds/api_op_DescribeDBClusterParameterGroups.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeDBClusterParameterGroups(ctx context.Context, params *D addawsAwsquery_serdeOpDescribeDBClusterParameterGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBClusterParameters.go b/service/rds/api_op_DescribeDBClusterParameters.go index 2da50339447..19507577abd 100644 --- a/service/rds/api_op_DescribeDBClusterParameters.go +++ b/service/rds/api_op_DescribeDBClusterParameters.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeDBClusterParameters(ctx context.Context, params *Descri addawsAwsquery_serdeOpDescribeDBClusterParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBClusterSnapshotAttributes.go b/service/rds/api_op_DescribeDBClusterSnapshotAttributes.go index 8577ed5901a..9e21b07e851 100644 --- a/service/rds/api_op_DescribeDBClusterSnapshotAttributes.go +++ b/service/rds/api_op_DescribeDBClusterSnapshotAttributes.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) DescribeDBClusterSnapshotAttributes(ctx context.Context, params addawsAwsquery_serdeOpDescribeDBClusterSnapshotAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBClusterSnapshots.go b/service/rds/api_op_DescribeDBClusterSnapshots.go index 4ba54bfda47..908d0665969 100644 --- a/service/rds/api_op_DescribeDBClusterSnapshots.go +++ b/service/rds/api_op_DescribeDBClusterSnapshots.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeDBClusterSnapshots(ctx context.Context, params *Describ addawsAwsquery_serdeOpDescribeDBClusterSnapshotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBClusters.go b/service/rds/api_op_DescribeDBClusters.go index 68493e69080..81624fbc147 100644 --- a/service/rds/api_op_DescribeDBClusters.go +++ b/service/rds/api_op_DescribeDBClusters.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeDBClusters(ctx context.Context, params *DescribeDBClust addawsAwsquery_serdeOpDescribeDBClustersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBEngineVersions.go b/service/rds/api_op_DescribeDBEngineVersions.go index 32b36c62739..199f2da15f8 100644 --- a/service/rds/api_op_DescribeDBEngineVersions.go +++ b/service/rds/api_op_DescribeDBEngineVersions.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDBEngineVersions(ctx context.Context, params *DescribeD addawsAwsquery_serdeOpDescribeDBEngineVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBInstanceAutomatedBackups.go b/service/rds/api_op_DescribeDBInstanceAutomatedBackups.go index 60fdd97901c..b24b12050dc 100644 --- a/service/rds/api_op_DescribeDBInstanceAutomatedBackups.go +++ b/service/rds/api_op_DescribeDBInstanceAutomatedBackups.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeDBInstanceAutomatedBackups(ctx context.Context, params addawsAwsquery_serdeOpDescribeDBInstanceAutomatedBackupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBInstances.go b/service/rds/api_op_DescribeDBInstances.go index b795cb670de..2558f8a0876 100644 --- a/service/rds/api_op_DescribeDBInstances.go +++ b/service/rds/api_op_DescribeDBInstances.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeDBInstances(ctx context.Context, params *DescribeDBInst addawsAwsquery_serdeOpDescribeDBInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBLogFiles.go b/service/rds/api_op_DescribeDBLogFiles.go index c334947f724..7e4b54757f2 100644 --- a/service/rds/api_op_DescribeDBLogFiles.go +++ b/service/rds/api_op_DescribeDBLogFiles.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDBLogFiles(ctx context.Context, params *DescribeDBLogFi addawsAwsquery_serdeOpDescribeDBLogFilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBParameterGroups.go b/service/rds/api_op_DescribeDBParameterGroups.go index 107d72fbbe8..d9c7312058f 100644 --- a/service/rds/api_op_DescribeDBParameterGroups.go +++ b/service/rds/api_op_DescribeDBParameterGroups.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeDBParameterGroups(ctx context.Context, params *Describe addawsAwsquery_serdeOpDescribeDBParameterGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBParameters.go b/service/rds/api_op_DescribeDBParameters.go index eafbbb54089..b1cf9ddff6b 100644 --- a/service/rds/api_op_DescribeDBParameters.go +++ b/service/rds/api_op_DescribeDBParameters.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDBParameters(ctx context.Context, params *DescribeDBPar addawsAwsquery_serdeOpDescribeDBParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBProxies.go b/service/rds/api_op_DescribeDBProxies.go index 2f10e522585..63111be7bad 100644 --- a/service/rds/api_op_DescribeDBProxies.go +++ b/service/rds/api_op_DescribeDBProxies.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDBProxies(ctx context.Context, params *DescribeDBProxie addawsAwsquery_serdeOpDescribeDBProxiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBProxyTargetGroups.go b/service/rds/api_op_DescribeDBProxyTargetGroups.go index cb83b7be6de..4073594a47f 100644 --- a/service/rds/api_op_DescribeDBProxyTargetGroups.go +++ b/service/rds/api_op_DescribeDBProxyTargetGroups.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDBProxyTargetGroups(ctx context.Context, params *Descri addawsAwsquery_serdeOpDescribeDBProxyTargetGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBProxyTargets.go b/service/rds/api_op_DescribeDBProxyTargets.go index 3b080a38d46..d871208ecdf 100644 --- a/service/rds/api_op_DescribeDBProxyTargets.go +++ b/service/rds/api_op_DescribeDBProxyTargets.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDBProxyTargets(ctx context.Context, params *DescribeDBP addawsAwsquery_serdeOpDescribeDBProxyTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBSecurityGroups.go b/service/rds/api_op_DescribeDBSecurityGroups.go index a997232e51d..ef90e692bb5 100644 --- a/service/rds/api_op_DescribeDBSecurityGroups.go +++ b/service/rds/api_op_DescribeDBSecurityGroups.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeDBSecurityGroups(ctx context.Context, params *DescribeD addawsAwsquery_serdeOpDescribeDBSecurityGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBSnapshotAttributes.go b/service/rds/api_op_DescribeDBSnapshotAttributes.go index b00402e4981..1035179c0e4 100644 --- a/service/rds/api_op_DescribeDBSnapshotAttributes.go +++ b/service/rds/api_op_DescribeDBSnapshotAttributes.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DescribeDBSnapshotAttributes(ctx context.Context, params *Descr addawsAwsquery_serdeOpDescribeDBSnapshotAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBSnapshots.go b/service/rds/api_op_DescribeDBSnapshots.go index ae3f29793d0..c5627747e05 100644 --- a/service/rds/api_op_DescribeDBSnapshots.go +++ b/service/rds/api_op_DescribeDBSnapshots.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDBSnapshots(ctx context.Context, params *DescribeDBSnap addawsAwsquery_serdeOpDescribeDBSnapshotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeDBSubnetGroups.go b/service/rds/api_op_DescribeDBSubnetGroups.go index 58255d274cd..a6c625481d0 100644 --- a/service/rds/api_op_DescribeDBSubnetGroups.go +++ b/service/rds/api_op_DescribeDBSubnetGroups.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeDBSubnetGroups(ctx context.Context, params *DescribeDBS addawsAwsquery_serdeOpDescribeDBSubnetGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeEngineDefaultClusterParameters.go b/service/rds/api_op_DescribeEngineDefaultClusterParameters.go index a6f52c2411f..9e9a4e14f6b 100644 --- a/service/rds/api_op_DescribeEngineDefaultClusterParameters.go +++ b/service/rds/api_op_DescribeEngineDefaultClusterParameters.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeEngineDefaultClusterParameters(ctx context.Context, par addawsAwsquery_serdeOpDescribeEngineDefaultClusterParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeEngineDefaultParameters.go b/service/rds/api_op_DescribeEngineDefaultParameters.go index 1e3832b3f43..4c5ddf73790 100644 --- a/service/rds/api_op_DescribeEngineDefaultParameters.go +++ b/service/rds/api_op_DescribeEngineDefaultParameters.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEngineDefaultParameters(ctx context.Context, params *De addawsAwsquery_serdeOpDescribeEngineDefaultParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeEventCategories.go b/service/rds/api_op_DescribeEventCategories.go index ff4ccc997c1..b0bbcbd2cad 100644 --- a/service/rds/api_op_DescribeEventCategories.go +++ b/service/rds/api_op_DescribeEventCategories.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeEventCategories(ctx context.Context, params *DescribeEv addawsAwsquery_serdeOpDescribeEventCategoriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeEventSubscriptions.go b/service/rds/api_op_DescribeEventSubscriptions.go index 6010f62f7a0..bf9eb81498f 100644 --- a/service/rds/api_op_DescribeEventSubscriptions.go +++ b/service/rds/api_op_DescribeEventSubscriptions.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeEventSubscriptions(ctx context.Context, params *Describ addawsAwsquery_serdeOpDescribeEventSubscriptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeEvents.go b/service/rds/api_op_DescribeEvents.go index f0355c691e4..429b96f80f0 100644 --- a/service/rds/api_op_DescribeEvents.go +++ b/service/rds/api_op_DescribeEvents.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeEvents(ctx context.Context, params *DescribeEventsInput addawsAwsquery_serdeOpDescribeEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeExportTasks.go b/service/rds/api_op_DescribeExportTasks.go index 19d2d4a72bb..6ff7ab4b6a1 100644 --- a/service/rds/api_op_DescribeExportTasks.go +++ b/service/rds/api_op_DescribeExportTasks.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeExportTasks(ctx context.Context, params *DescribeExport addawsAwsquery_serdeOpDescribeExportTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeGlobalClusters.go b/service/rds/api_op_DescribeGlobalClusters.go index 96ac591a1af..45717dad20c 100644 --- a/service/rds/api_op_DescribeGlobalClusters.go +++ b/service/rds/api_op_DescribeGlobalClusters.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeGlobalClusters(ctx context.Context, params *DescribeGlo addawsAwsquery_serdeOpDescribeGlobalClustersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeInstallationMedia.go b/service/rds/api_op_DescribeInstallationMedia.go index be846e600b4..a76eea942de 100644 --- a/service/rds/api_op_DescribeInstallationMedia.go +++ b/service/rds/api_op_DescribeInstallationMedia.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeInstallationMedia(ctx context.Context, params *Describe addawsAwsquery_serdeOpDescribeInstallationMediaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeOptionGroupOptions.go b/service/rds/api_op_DescribeOptionGroupOptions.go index 7cb36b49299..c96499c7505 100644 --- a/service/rds/api_op_DescribeOptionGroupOptions.go +++ b/service/rds/api_op_DescribeOptionGroupOptions.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeOptionGroupOptions(ctx context.Context, params *Describ addawsAwsquery_serdeOpDescribeOptionGroupOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeOptionGroups.go b/service/rds/api_op_DescribeOptionGroups.go index 068acda7f12..26b25c4da67 100644 --- a/service/rds/api_op_DescribeOptionGroups.go +++ b/service/rds/api_op_DescribeOptionGroups.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeOptionGroups(ctx context.Context, params *DescribeOptio addawsAwsquery_serdeOpDescribeOptionGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeOrderableDBInstanceOptions.go b/service/rds/api_op_DescribeOrderableDBInstanceOptions.go index 12473904c84..19bfaf0f146 100644 --- a/service/rds/api_op_DescribeOrderableDBInstanceOptions.go +++ b/service/rds/api_op_DescribeOrderableDBInstanceOptions.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeOrderableDBInstanceOptions(ctx context.Context, params addawsAwsquery_serdeOpDescribeOrderableDBInstanceOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribePendingMaintenanceActions.go b/service/rds/api_op_DescribePendingMaintenanceActions.go index 9f848020803..1077ca9c102 100644 --- a/service/rds/api_op_DescribePendingMaintenanceActions.go +++ b/service/rds/api_op_DescribePendingMaintenanceActions.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribePendingMaintenanceActions(ctx context.Context, params * addawsAwsquery_serdeOpDescribePendingMaintenanceActionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeReservedDBInstances.go b/service/rds/api_op_DescribeReservedDBInstances.go index 48b4168e0ec..df57fdcc269 100644 --- a/service/rds/api_op_DescribeReservedDBInstances.go +++ b/service/rds/api_op_DescribeReservedDBInstances.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeReservedDBInstances(ctx context.Context, params *Descri addawsAwsquery_serdeOpDescribeReservedDBInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeReservedDBInstancesOfferings.go b/service/rds/api_op_DescribeReservedDBInstancesOfferings.go index f5af87ba1b5..7f3d71ae1eb 100644 --- a/service/rds/api_op_DescribeReservedDBInstancesOfferings.go +++ b/service/rds/api_op_DescribeReservedDBInstancesOfferings.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeReservedDBInstancesOfferings(ctx context.Context, param addawsAwsquery_serdeOpDescribeReservedDBInstancesOfferingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeSourceRegions.go b/service/rds/api_op_DescribeSourceRegions.go index 3c3d12d5f9a..c9fd090c9f6 100644 --- a/service/rds/api_op_DescribeSourceRegions.go +++ b/service/rds/api_op_DescribeSourceRegions.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeSourceRegions(ctx context.Context, params *DescribeSour addawsAwsquery_serdeOpDescribeSourceRegionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DescribeValidDBInstanceModifications.go b/service/rds/api_op_DescribeValidDBInstanceModifications.go index 67103395c93..2b6ddedf5b5 100644 --- a/service/rds/api_op_DescribeValidDBInstanceModifications.go +++ b/service/rds/api_op_DescribeValidDBInstanceModifications.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeValidDBInstanceModifications(ctx context.Context, param addawsAwsquery_serdeOpDescribeValidDBInstanceModificationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_DownloadDBLogFilePortion.go b/service/rds/api_op_DownloadDBLogFilePortion.go index 7274877a11c..1fd10a795fb 100644 --- a/service/rds/api_op_DownloadDBLogFilePortion.go +++ b/service/rds/api_op_DownloadDBLogFilePortion.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DownloadDBLogFilePortion(ctx context.Context, params *DownloadD addawsAwsquery_serdeOpDownloadDBLogFilePortionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_FailoverDBCluster.go b/service/rds/api_op_FailoverDBCluster.go index 12062212cce..d21e0de4756 100644 --- a/service/rds/api_op_FailoverDBCluster.go +++ b/service/rds/api_op_FailoverDBCluster.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) FailoverDBCluster(ctx context.Context, params *FailoverDBCluste addawsAwsquery_serdeOpFailoverDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ImportInstallationMedia.go b/service/rds/api_op_ImportInstallationMedia.go index 014ee013ce5..8bd8e500f43 100644 --- a/service/rds/api_op_ImportInstallationMedia.go +++ b/service/rds/api_op_ImportInstallationMedia.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ImportInstallationMedia(ctx context.Context, params *ImportInst addawsAwsquery_serdeOpImportInstallationMediaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ListTagsForResource.go b/service/rds/api_op_ListTagsForResource.go index 75ae124c2a2..0fdc7113db8 100644 --- a/service/rds/api_op_ListTagsForResource.go +++ b/service/rds/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsquery_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ModifyCertificates.go b/service/rds/api_op_ModifyCertificates.go index 23b91405d15..c691214d6fe 100644 --- a/service/rds/api_op_ModifyCertificates.go +++ b/service/rds/api_op_ModifyCertificates.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -48,9 +47,9 @@ func (c *Client) ModifyCertificates(ctx context.Context, params *ModifyCertifica addawsAwsquery_serdeOpModifyCertificatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ModifyCurrentDBClusterCapacity.go b/service/rds/api_op_ModifyCurrentDBClusterCapacity.go index 381d606efa2..8392a966ed5 100644 --- a/service/rds/api_op_ModifyCurrentDBClusterCapacity.go +++ b/service/rds/api_op_ModifyCurrentDBClusterCapacity.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -37,9 +36,9 @@ func (c *Client) ModifyCurrentDBClusterCapacity(ctx context.Context, params *Mod addawsAwsquery_serdeOpModifyCurrentDBClusterCapacityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ModifyDBCluster.go b/service/rds/api_op_ModifyDBCluster.go index 964f5630ab5..dc02019da90 100644 --- a/service/rds/api_op_ModifyDBCluster.go +++ b/service/rds/api_op_ModifyDBCluster.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ModifyDBCluster(ctx context.Context, params *ModifyDBClusterInp addawsAwsquery_serdeOpModifyDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ModifyDBClusterEndpoint.go b/service/rds/api_op_ModifyDBClusterEndpoint.go index 4bb8a100e9a..1b455f112ee 100644 --- a/service/rds/api_op_ModifyDBClusterEndpoint.go +++ b/service/rds/api_op_ModifyDBClusterEndpoint.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ModifyDBClusterEndpoint(ctx context.Context, params *ModifyDBCl addawsAwsquery_serdeOpModifyDBClusterEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ModifyDBClusterParameterGroup.go b/service/rds/api_op_ModifyDBClusterParameterGroup.go index 626aed54147..aecbd13ecf7 100644 --- a/service/rds/api_op_ModifyDBClusterParameterGroup.go +++ b/service/rds/api_op_ModifyDBClusterParameterGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) ModifyDBClusterParameterGroup(ctx context.Context, params *Modi addawsAwsquery_serdeOpModifyDBClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ModifyDBClusterSnapshotAttribute.go b/service/rds/api_op_ModifyDBClusterSnapshotAttribute.go index 3658dcf50fe..87aa2ff9aa2 100644 --- a/service/rds/api_op_ModifyDBClusterSnapshotAttribute.go +++ b/service/rds/api_op_ModifyDBClusterSnapshotAttribute.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) ModifyDBClusterSnapshotAttribute(ctx context.Context, params *M addawsAwsquery_serdeOpModifyDBClusterSnapshotAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ModifyDBInstance.go b/service/rds/api_op_ModifyDBInstance.go index bf3cc831783..6d5866b6181 100644 --- a/service/rds/api_op_ModifyDBInstance.go +++ b/service/rds/api_op_ModifyDBInstance.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ModifyDBInstance(ctx context.Context, params *ModifyDBInstanceI addawsAwsquery_serdeOpModifyDBInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ModifyDBParameterGroup.go b/service/rds/api_op_ModifyDBParameterGroup.go index c20da39afc2..64f343d3fcc 100644 --- a/service/rds/api_op_ModifyDBParameterGroup.go +++ b/service/rds/api_op_ModifyDBParameterGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) ModifyDBParameterGroup(ctx context.Context, params *ModifyDBPar addawsAwsquery_serdeOpModifyDBParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ModifyDBProxy.go b/service/rds/api_op_ModifyDBProxy.go index 1d0a9d98dd9..18c4ef16d3b 100644 --- a/service/rds/api_op_ModifyDBProxy.go +++ b/service/rds/api_op_ModifyDBProxy.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifyDBProxy(ctx context.Context, params *ModifyDBProxyInput, addawsAwsquery_serdeOpModifyDBProxyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ModifyDBProxyTargetGroup.go b/service/rds/api_op_ModifyDBProxyTargetGroup.go index 26f7b4f1ca1..43ea490da44 100644 --- a/service/rds/api_op_ModifyDBProxyTargetGroup.go +++ b/service/rds/api_op_ModifyDBProxyTargetGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifyDBProxyTargetGroup(ctx context.Context, params *ModifyDBP addawsAwsquery_serdeOpModifyDBProxyTargetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ModifyDBSnapshot.go b/service/rds/api_op_ModifyDBSnapshot.go index 308993b7d41..310c84f6377 100644 --- a/service/rds/api_op_ModifyDBSnapshot.go +++ b/service/rds/api_op_ModifyDBSnapshot.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ModifyDBSnapshot(ctx context.Context, params *ModifyDBSnapshotI addawsAwsquery_serdeOpModifyDBSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ModifyDBSnapshotAttribute.go b/service/rds/api_op_ModifyDBSnapshotAttribute.go index 464ebbe0d53..8eb39fa8ef6 100644 --- a/service/rds/api_op_ModifyDBSnapshotAttribute.go +++ b/service/rds/api_op_ModifyDBSnapshotAttribute.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) ModifyDBSnapshotAttribute(ctx context.Context, params *ModifyDB addawsAwsquery_serdeOpModifyDBSnapshotAttributeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ModifyDBSubnetGroup.go b/service/rds/api_op_ModifyDBSubnetGroup.go index a70ebc6e4b7..f4cdd8e7901 100644 --- a/service/rds/api_op_ModifyDBSubnetGroup.go +++ b/service/rds/api_op_ModifyDBSubnetGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ModifyDBSubnetGroup(ctx context.Context, params *ModifyDBSubnet addawsAwsquery_serdeOpModifyDBSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ModifyEventSubscription.go b/service/rds/api_op_ModifyEventSubscription.go index 79ed541e201..5ccbbbefe6b 100644 --- a/service/rds/api_op_ModifyEventSubscription.go +++ b/service/rds/api_op_ModifyEventSubscription.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ModifyEventSubscription(ctx context.Context, params *ModifyEven addawsAwsquery_serdeOpModifyEventSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ModifyGlobalCluster.go b/service/rds/api_op_ModifyGlobalCluster.go index b1fd4abfb52..a703f3afbde 100644 --- a/service/rds/api_op_ModifyGlobalCluster.go +++ b/service/rds/api_op_ModifyGlobalCluster.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ModifyGlobalCluster(ctx context.Context, params *ModifyGlobalCl addawsAwsquery_serdeOpModifyGlobalClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ModifyOptionGroup.go b/service/rds/api_op_ModifyOptionGroup.go index 4e7e3fa1be6..b707cec1d31 100644 --- a/service/rds/api_op_ModifyOptionGroup.go +++ b/service/rds/api_op_ModifyOptionGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifyOptionGroup(ctx context.Context, params *ModifyOptionGrou addawsAwsquery_serdeOpModifyOptionGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_PromoteReadReplica.go b/service/rds/api_op_PromoteReadReplica.go index 28692a249a5..e32bafdb898 100644 --- a/service/rds/api_op_PromoteReadReplica.go +++ b/service/rds/api_op_PromoteReadReplica.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) PromoteReadReplica(ctx context.Context, params *PromoteReadRepl addawsAwsquery_serdeOpPromoteReadReplicaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_PromoteReadReplicaDBCluster.go b/service/rds/api_op_PromoteReadReplicaDBCluster.go index 97e8eb5fb1a..450e1c1b898 100644 --- a/service/rds/api_op_PromoteReadReplicaDBCluster.go +++ b/service/rds/api_op_PromoteReadReplicaDBCluster.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PromoteReadReplicaDBCluster(ctx context.Context, params *Promot addawsAwsquery_serdeOpPromoteReadReplicaDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_PurchaseReservedDBInstancesOffering.go b/service/rds/api_op_PurchaseReservedDBInstancesOffering.go index c481323824a..80151b80de6 100644 --- a/service/rds/api_op_PurchaseReservedDBInstancesOffering.go +++ b/service/rds/api_op_PurchaseReservedDBInstancesOffering.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PurchaseReservedDBInstancesOffering(ctx context.Context, params addawsAwsquery_serdeOpPurchaseReservedDBInstancesOfferingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_RebootDBInstance.go b/service/rds/api_op_RebootDBInstance.go index 6845e5df546..5cafe7e7a2d 100644 --- a/service/rds/api_op_RebootDBInstance.go +++ b/service/rds/api_op_RebootDBInstance.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) RebootDBInstance(ctx context.Context, params *RebootDBInstanceI addawsAwsquery_serdeOpRebootDBInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_RegisterDBProxyTargets.go b/service/rds/api_op_RegisterDBProxyTargets.go index ffd72a95c34..098330833ca 100644 --- a/service/rds/api_op_RegisterDBProxyTargets.go +++ b/service/rds/api_op_RegisterDBProxyTargets.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RegisterDBProxyTargets(ctx context.Context, params *RegisterDBP addawsAwsquery_serdeOpRegisterDBProxyTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_RemoveFromGlobalCluster.go b/service/rds/api_op_RemoveFromGlobalCluster.go index 3e4d8816ad9..a45dea36536 100644 --- a/service/rds/api_op_RemoveFromGlobalCluster.go +++ b/service/rds/api_op_RemoveFromGlobalCluster.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) RemoveFromGlobalCluster(ctx context.Context, params *RemoveFrom addawsAwsquery_serdeOpRemoveFromGlobalClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_RemoveRoleFromDBCluster.go b/service/rds/api_op_RemoveRoleFromDBCluster.go index af906f7a1e3..a1c5df9cd77 100644 --- a/service/rds/api_op_RemoveRoleFromDBCluster.go +++ b/service/rds/api_op_RemoveRoleFromDBCluster.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) RemoveRoleFromDBCluster(ctx context.Context, params *RemoveRole addawsAwsquery_serdeOpRemoveRoleFromDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_RemoveRoleFromDBInstance.go b/service/rds/api_op_RemoveRoleFromDBInstance.go index b6e0570227b..171528aa274 100644 --- a/service/rds/api_op_RemoveRoleFromDBInstance.go +++ b/service/rds/api_op_RemoveRoleFromDBInstance.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) RemoveRoleFromDBInstance(ctx context.Context, params *RemoveRol addawsAwsquery_serdeOpRemoveRoleFromDBInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_RemoveSourceIdentifierFromSubscription.go b/service/rds/api_op_RemoveSourceIdentifierFromSubscription.go index 5c9b62c770f..0faf1567ed7 100644 --- a/service/rds/api_op_RemoveSourceIdentifierFromSubscription.go +++ b/service/rds/api_op_RemoveSourceIdentifierFromSubscription.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) RemoveSourceIdentifierFromSubscription(ctx context.Context, par addawsAwsquery_serdeOpRemoveSourceIdentifierFromSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_RemoveTagsFromResource.go b/service/rds/api_op_RemoveTagsFromResource.go index 9f30036720d..55fd48984c2 100644 --- a/service/rds/api_op_RemoveTagsFromResource.go +++ b/service/rds/api_op_RemoveTagsFromResource.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) RemoveTagsFromResource(ctx context.Context, params *RemoveTagsF addawsAwsquery_serdeOpRemoveTagsFromResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ResetDBClusterParameterGroup.go b/service/rds/api_op_ResetDBClusterParameterGroup.go index 15271e959c5..d22f1bd18f4 100644 --- a/service/rds/api_op_ResetDBClusterParameterGroup.go +++ b/service/rds/api_op_ResetDBClusterParameterGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) ResetDBClusterParameterGroup(ctx context.Context, params *Reset addawsAwsquery_serdeOpResetDBClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_ResetDBParameterGroup.go b/service/rds/api_op_ResetDBParameterGroup.go index ad64ceb576f..cb788741615 100644 --- a/service/rds/api_op_ResetDBParameterGroup.go +++ b/service/rds/api_op_ResetDBParameterGroup.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ResetDBParameterGroup(ctx context.Context, params *ResetDBParam addawsAwsquery_serdeOpResetDBParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_RestoreDBClusterFromS3.go b/service/rds/api_op_RestoreDBClusterFromS3.go index f7fa792a527..e4ffe105a52 100644 --- a/service/rds/api_op_RestoreDBClusterFromS3.go +++ b/service/rds/api_op_RestoreDBClusterFromS3.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) RestoreDBClusterFromS3(ctx context.Context, params *RestoreDBCl addawsAwsquery_serdeOpRestoreDBClusterFromS3Middlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_RestoreDBClusterFromSnapshot.go b/service/rds/api_op_RestoreDBClusterFromSnapshot.go index 5b5e6a2add7..a272b22c3de 100644 --- a/service/rds/api_op_RestoreDBClusterFromSnapshot.go +++ b/service/rds/api_op_RestoreDBClusterFromSnapshot.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) RestoreDBClusterFromSnapshot(ctx context.Context, params *Resto addawsAwsquery_serdeOpRestoreDBClusterFromSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_RestoreDBClusterToPointInTime.go b/service/rds/api_op_RestoreDBClusterToPointInTime.go index 2dd402fb465..6717ba0bf64 100644 --- a/service/rds/api_op_RestoreDBClusterToPointInTime.go +++ b/service/rds/api_op_RestoreDBClusterToPointInTime.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) RestoreDBClusterToPointInTime(ctx context.Context, params *Rest addawsAwsquery_serdeOpRestoreDBClusterToPointInTimeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_RestoreDBInstanceFromDBSnapshot.go b/service/rds/api_op_RestoreDBInstanceFromDBSnapshot.go index eb36172d63f..d946554a72a 100644 --- a/service/rds/api_op_RestoreDBInstanceFromDBSnapshot.go +++ b/service/rds/api_op_RestoreDBInstanceFromDBSnapshot.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) RestoreDBInstanceFromDBSnapshot(ctx context.Context, params *Re addawsAwsquery_serdeOpRestoreDBInstanceFromDBSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_RestoreDBInstanceFromS3.go b/service/rds/api_op_RestoreDBInstanceFromS3.go index e1e6a7d93ea..431fed4588d 100644 --- a/service/rds/api_op_RestoreDBInstanceFromS3.go +++ b/service/rds/api_op_RestoreDBInstanceFromS3.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) RestoreDBInstanceFromS3(ctx context.Context, params *RestoreDBI addawsAwsquery_serdeOpRestoreDBInstanceFromS3Middlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_RestoreDBInstanceToPointInTime.go b/service/rds/api_op_RestoreDBInstanceToPointInTime.go index 70dce8439c4..c87d2373d7d 100644 --- a/service/rds/api_op_RestoreDBInstanceToPointInTime.go +++ b/service/rds/api_op_RestoreDBInstanceToPointInTime.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) RestoreDBInstanceToPointInTime(ctx context.Context, params *Res addawsAwsquery_serdeOpRestoreDBInstanceToPointInTimeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_RevokeDBSecurityGroupIngress.go b/service/rds/api_op_RevokeDBSecurityGroupIngress.go index 86b53bb3836..2453196ffd3 100644 --- a/service/rds/api_op_RevokeDBSecurityGroupIngress.go +++ b/service/rds/api_op_RevokeDBSecurityGroupIngress.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) RevokeDBSecurityGroupIngress(ctx context.Context, params *Revok addawsAwsquery_serdeOpRevokeDBSecurityGroupIngressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_StartActivityStream.go b/service/rds/api_op_StartActivityStream.go index cba0a551d12..21b1619f998 100644 --- a/service/rds/api_op_StartActivityStream.go +++ b/service/rds/api_op_StartActivityStream.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) StartActivityStream(ctx context.Context, params *StartActivityS addawsAwsquery_serdeOpStartActivityStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_StartDBCluster.go b/service/rds/api_op_StartDBCluster.go index 0fbe93f9fb7..c8066a36c44 100644 --- a/service/rds/api_op_StartDBCluster.go +++ b/service/rds/api_op_StartDBCluster.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) StartDBCluster(ctx context.Context, params *StartDBClusterInput addawsAwsquery_serdeOpStartDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_StartDBInstance.go b/service/rds/api_op_StartDBInstance.go index 30ea5c71c3f..498af310992 100644 --- a/service/rds/api_op_StartDBInstance.go +++ b/service/rds/api_op_StartDBInstance.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) StartDBInstance(ctx context.Context, params *StartDBInstanceInp addawsAwsquery_serdeOpStartDBInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_StartExportTask.go b/service/rds/api_op_StartExportTask.go index cfff7543142..6019e7926d3 100644 --- a/service/rds/api_op_StartExportTask.go +++ b/service/rds/api_op_StartExportTask.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) StartExportTask(ctx context.Context, params *StartExportTaskInp addawsAwsquery_serdeOpStartExportTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_StopActivityStream.go b/service/rds/api_op_StopActivityStream.go index 2b66e8e5fd0..2b90fabffb9 100644 --- a/service/rds/api_op_StopActivityStream.go +++ b/service/rds/api_op_StopActivityStream.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) StopActivityStream(ctx context.Context, params *StopActivityStr addawsAwsquery_serdeOpStopActivityStreamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_StopDBCluster.go b/service/rds/api_op_StopDBCluster.go index 2d2147ff1f7..5b6328851b0 100644 --- a/service/rds/api_op_StopDBCluster.go +++ b/service/rds/api_op_StopDBCluster.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) StopDBCluster(ctx context.Context, params *StopDBClusterInput, addawsAwsquery_serdeOpStopDBClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/api_op_StopDBInstance.go b/service/rds/api_op_StopDBInstance.go index dadcf0045ec..a8afab64f90 100644 --- a/service/rds/api_op_StopDBInstance.go +++ b/service/rds/api_op_StopDBInstance.go @@ -5,7 +5,6 @@ package rds import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rds/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) StopDBInstance(ctx context.Context, params *StopDBInstanceInput addawsAwsquery_serdeOpStopDBInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rds/endpoints.go b/service/rds/endpoints.go index 5ed901c53e0..70c8a80af88 100644 --- a/service/rds/endpoints.go +++ b/service/rds/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/rdsdata/api_client.go b/service/rdsdata/api_client.go index f5698f8622f..7b7df8a83e7 100644 --- a/service/rdsdata/api_client.go +++ b/service/rdsdata/api_client.go @@ -84,30 +84,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -173,6 +149,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/rdsdata/api_op_BatchExecuteStatement.go b/service/rdsdata/api_op_BatchExecuteStatement.go index dfcd9a7d1e1..6fcfabe9878 100644 --- a/service/rdsdata/api_op_BatchExecuteStatement.go +++ b/service/rdsdata/api_op_BatchExecuteStatement.go @@ -5,7 +5,6 @@ package rdsdata import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rdsdata/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) BatchExecuteStatement(ctx context.Context, params *BatchExecute addawsRestjson1_serdeOpBatchExecuteStatementMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rdsdata/api_op_BeginTransaction.go b/service/rdsdata/api_op_BeginTransaction.go index c98cd4602bd..e7931ee1d3f 100644 --- a/service/rdsdata/api_op_BeginTransaction.go +++ b/service/rdsdata/api_op_BeginTransaction.go @@ -5,7 +5,6 @@ package rdsdata import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) BeginTransaction(ctx context.Context, params *BeginTransactionI addawsRestjson1_serdeOpBeginTransactionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rdsdata/api_op_CommitTransaction.go b/service/rdsdata/api_op_CommitTransaction.go index 03fcef05e04..8600f565c86 100644 --- a/service/rdsdata/api_op_CommitTransaction.go +++ b/service/rdsdata/api_op_CommitTransaction.go @@ -5,7 +5,6 @@ package rdsdata import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CommitTransaction(ctx context.Context, params *CommitTransactio addawsRestjson1_serdeOpCommitTransactionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rdsdata/api_op_ExecuteSql.go b/service/rdsdata/api_op_ExecuteSql.go index 3194047af0e..fc0f87f1093 100644 --- a/service/rdsdata/api_op_ExecuteSql.go +++ b/service/rdsdata/api_op_ExecuteSql.go @@ -5,7 +5,6 @@ package rdsdata import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rdsdata/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ExecuteSql(ctx context.Context, params *ExecuteSqlInput, optFns addawsRestjson1_serdeOpExecuteSqlMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rdsdata/api_op_ExecuteStatement.go b/service/rdsdata/api_op_ExecuteStatement.go index 686eeb23c89..59c73151591 100644 --- a/service/rdsdata/api_op_ExecuteStatement.go +++ b/service/rdsdata/api_op_ExecuteStatement.go @@ -5,7 +5,6 @@ package rdsdata import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rdsdata/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ExecuteStatement(ctx context.Context, params *ExecuteStatementI addawsRestjson1_serdeOpExecuteStatementMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rdsdata/api_op_RollbackTransaction.go b/service/rdsdata/api_op_RollbackTransaction.go index a1bdd6dec6f..9dca8a442a4 100644 --- a/service/rdsdata/api_op_RollbackTransaction.go +++ b/service/rdsdata/api_op_RollbackTransaction.go @@ -5,7 +5,6 @@ package rdsdata import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) RollbackTransaction(ctx context.Context, params *RollbackTransa addawsRestjson1_serdeOpRollbackTransactionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rdsdata/endpoints.go b/service/rdsdata/endpoints.go index ba35aae06c6..3a090bcfcf0 100644 --- a/service/rdsdata/endpoints.go +++ b/service/rdsdata/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/redshift/api_client.go b/service/redshift/api_client.go index de6109ebacd..01af5bf25eb 100644 --- a/service/redshift/api_client.go +++ b/service/redshift/api_client.go @@ -97,30 +97,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -186,6 +162,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/redshift/api_op_AcceptReservedNodeExchange.go b/service/redshift/api_op_AcceptReservedNodeExchange.go index ec69b3ea6fe..9e6ad97524a 100644 --- a/service/redshift/api_op_AcceptReservedNodeExchange.go +++ b/service/redshift/api_op_AcceptReservedNodeExchange.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AcceptReservedNodeExchange(ctx context.Context, params *AcceptR addawsAwsquery_serdeOpAcceptReservedNodeExchangeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_AuthorizeClusterSecurityGroupIngress.go b/service/redshift/api_op_AuthorizeClusterSecurityGroupIngress.go index 1720372c9c8..393c514ddb0 100644 --- a/service/redshift/api_op_AuthorizeClusterSecurityGroupIngress.go +++ b/service/redshift/api_op_AuthorizeClusterSecurityGroupIngress.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) AuthorizeClusterSecurityGroupIngress(ctx context.Context, param addawsAwsquery_serdeOpAuthorizeClusterSecurityGroupIngressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_AuthorizeSnapshotAccess.go b/service/redshift/api_op_AuthorizeSnapshotAccess.go index e56ab269d91..06400cb12ce 100644 --- a/service/redshift/api_op_AuthorizeSnapshotAccess.go +++ b/service/redshift/api_op_AuthorizeSnapshotAccess.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) AuthorizeSnapshotAccess(ctx context.Context, params *AuthorizeS addawsAwsquery_serdeOpAuthorizeSnapshotAccessMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_BatchDeleteClusterSnapshots.go b/service/redshift/api_op_BatchDeleteClusterSnapshots.go index 63e51f04c2b..3465be56c72 100644 --- a/service/redshift/api_op_BatchDeleteClusterSnapshots.go +++ b/service/redshift/api_op_BatchDeleteClusterSnapshots.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchDeleteClusterSnapshots(ctx context.Context, params *BatchD addawsAwsquery_serdeOpBatchDeleteClusterSnapshotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_BatchModifyClusterSnapshots.go b/service/redshift/api_op_BatchModifyClusterSnapshots.go index 90b1a35ad00..cd6eb3528fc 100644 --- a/service/redshift/api_op_BatchModifyClusterSnapshots.go +++ b/service/redshift/api_op_BatchModifyClusterSnapshots.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchModifyClusterSnapshots(ctx context.Context, params *BatchM addawsAwsquery_serdeOpBatchModifyClusterSnapshotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_CancelResize.go b/service/redshift/api_op_CancelResize.go index 109b60f7f53..6d0ccd1a4fe 100644 --- a/service/redshift/api_op_CancelResize.go +++ b/service/redshift/api_op_CancelResize.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CancelResize(ctx context.Context, params *CancelResizeInput, op addawsAwsquery_serdeOpCancelResizeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_CopyClusterSnapshot.go b/service/redshift/api_op_CopyClusterSnapshot.go index 761143853fa..9d314f25b0d 100644 --- a/service/redshift/api_op_CopyClusterSnapshot.go +++ b/service/redshift/api_op_CopyClusterSnapshot.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) CopyClusterSnapshot(ctx context.Context, params *CopyClusterSna addawsAwsquery_serdeOpCopyClusterSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_CreateCluster.go b/service/redshift/api_op_CreateCluster.go index e355ed1baad..8578aff497d 100644 --- a/service/redshift/api_op_CreateCluster.go +++ b/service/redshift/api_op_CreateCluster.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateCluster(ctx context.Context, params *CreateClusterInput, addawsAwsquery_serdeOpCreateClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_CreateClusterParameterGroup.go b/service/redshift/api_op_CreateClusterParameterGroup.go index c0fcd0542c9..096de099976 100644 --- a/service/redshift/api_op_CreateClusterParameterGroup.go +++ b/service/redshift/api_op_CreateClusterParameterGroup.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateClusterParameterGroup(ctx context.Context, params *Create addawsAwsquery_serdeOpCreateClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_CreateClusterSecurityGroup.go b/service/redshift/api_op_CreateClusterSecurityGroup.go index e2e96aa70fb..284c5e24564 100644 --- a/service/redshift/api_op_CreateClusterSecurityGroup.go +++ b/service/redshift/api_op_CreateClusterSecurityGroup.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateClusterSecurityGroup(ctx context.Context, params *CreateC addawsAwsquery_serdeOpCreateClusterSecurityGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_CreateClusterSnapshot.go b/service/redshift/api_op_CreateClusterSnapshot.go index f38b29b27ec..32a8a623591 100644 --- a/service/redshift/api_op_CreateClusterSnapshot.go +++ b/service/redshift/api_op_CreateClusterSnapshot.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateClusterSnapshot(ctx context.Context, params *CreateCluste addawsAwsquery_serdeOpCreateClusterSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_CreateClusterSubnetGroup.go b/service/redshift/api_op_CreateClusterSubnetGroup.go index c9f3b2d324b..c8774ed526c 100644 --- a/service/redshift/api_op_CreateClusterSubnetGroup.go +++ b/service/redshift/api_op_CreateClusterSubnetGroup.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateClusterSubnetGroup(ctx context.Context, params *CreateClu addawsAwsquery_serdeOpCreateClusterSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_CreateEventSubscription.go b/service/redshift/api_op_CreateEventSubscription.go index 5ad6baaa98d..2c20b19b641 100644 --- a/service/redshift/api_op_CreateEventSubscription.go +++ b/service/redshift/api_op_CreateEventSubscription.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) CreateEventSubscription(ctx context.Context, params *CreateEven addawsAwsquery_serdeOpCreateEventSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_CreateHsmClientCertificate.go b/service/redshift/api_op_CreateHsmClientCertificate.go index 110e0de958d..77caceac1c8 100644 --- a/service/redshift/api_op_CreateHsmClientCertificate.go +++ b/service/redshift/api_op_CreateHsmClientCertificate.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateHsmClientCertificate(ctx context.Context, params *CreateH addawsAwsquery_serdeOpCreateHsmClientCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_CreateHsmConfiguration.go b/service/redshift/api_op_CreateHsmConfiguration.go index f8c308d8da3..16f79ac9b08 100644 --- a/service/redshift/api_op_CreateHsmConfiguration.go +++ b/service/redshift/api_op_CreateHsmConfiguration.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateHsmConfiguration(ctx context.Context, params *CreateHsmCo addawsAwsquery_serdeOpCreateHsmConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_CreateScheduledAction.go b/service/redshift/api_op_CreateScheduledAction.go index ccb402447bf..e31ec64bc9a 100644 --- a/service/redshift/api_op_CreateScheduledAction.go +++ b/service/redshift/api_op_CreateScheduledAction.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateScheduledAction(ctx context.Context, params *CreateSchedu addawsAwsquery_serdeOpCreateScheduledActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_CreateSnapshotCopyGrant.go b/service/redshift/api_op_CreateSnapshotCopyGrant.go index 1e7a6463349..e064a3e37b0 100644 --- a/service/redshift/api_op_CreateSnapshotCopyGrant.go +++ b/service/redshift/api_op_CreateSnapshotCopyGrant.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateSnapshotCopyGrant(ctx context.Context, params *CreateSnap addawsAwsquery_serdeOpCreateSnapshotCopyGrantMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_CreateSnapshotSchedule.go b/service/redshift/api_op_CreateSnapshotSchedule.go index 2b1cf8275e8..5270fceec3b 100644 --- a/service/redshift/api_op_CreateSnapshotSchedule.go +++ b/service/redshift/api_op_CreateSnapshotSchedule.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateSnapshotSchedule(ctx context.Context, params *CreateSnaps addawsAwsquery_serdeOpCreateSnapshotScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_CreateTags.go b/service/redshift/api_op_CreateTags.go index 68f77504b64..fb6a5831806 100644 --- a/service/redshift/api_op_CreateTags.go +++ b/service/redshift/api_op_CreateTags.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateTags(ctx context.Context, params *CreateTagsInput, optFns addawsAwsquery_serdeOpCreateTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_CreateUsageLimit.go b/service/redshift/api_op_CreateUsageLimit.go index 1f1ae3be2b4..cf583f1ee66 100644 --- a/service/redshift/api_op_CreateUsageLimit.go +++ b/service/redshift/api_op_CreateUsageLimit.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateUsageLimit(ctx context.Context, params *CreateUsageLimitI addawsAwsquery_serdeOpCreateUsageLimitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DeleteCluster.go b/service/redshift/api_op_DeleteCluster.go index 0378c505d0a..681c489edf6 100644 --- a/service/redshift/api_op_DeleteCluster.go +++ b/service/redshift/api_op_DeleteCluster.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) DeleteCluster(ctx context.Context, params *DeleteClusterInput, addawsAwsquery_serdeOpDeleteClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DeleteClusterParameterGroup.go b/service/redshift/api_op_DeleteClusterParameterGroup.go index 8aa5e0d1227..d185de02e6f 100644 --- a/service/redshift/api_op_DeleteClusterParameterGroup.go +++ b/service/redshift/api_op_DeleteClusterParameterGroup.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteClusterParameterGroup(ctx context.Context, params *Delete addawsAwsquery_serdeOpDeleteClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DeleteClusterSecurityGroup.go b/service/redshift/api_op_DeleteClusterSecurityGroup.go index 2c632d95070..6952922d92c 100644 --- a/service/redshift/api_op_DeleteClusterSecurityGroup.go +++ b/service/redshift/api_op_DeleteClusterSecurityGroup.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteClusterSecurityGroup(ctx context.Context, params *DeleteC addawsAwsquery_serdeOpDeleteClusterSecurityGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DeleteClusterSnapshot.go b/service/redshift/api_op_DeleteClusterSnapshot.go index ef6ced853e4..221a82e4076 100644 --- a/service/redshift/api_op_DeleteClusterSnapshot.go +++ b/service/redshift/api_op_DeleteClusterSnapshot.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DeleteClusterSnapshot(ctx context.Context, params *DeleteCluste addawsAwsquery_serdeOpDeleteClusterSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DeleteClusterSubnetGroup.go b/service/redshift/api_op_DeleteClusterSubnetGroup.go index c3180642fc4..7b36e013ef8 100644 --- a/service/redshift/api_op_DeleteClusterSubnetGroup.go +++ b/service/redshift/api_op_DeleteClusterSubnetGroup.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteClusterSubnetGroup(ctx context.Context, params *DeleteClu addawsAwsquery_serdeOpDeleteClusterSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DeleteEventSubscription.go b/service/redshift/api_op_DeleteEventSubscription.go index 4aeadcd3e01..552ce95cacc 100644 --- a/service/redshift/api_op_DeleteEventSubscription.go +++ b/service/redshift/api_op_DeleteEventSubscription.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteEventSubscription(ctx context.Context, params *DeleteEven addawsAwsquery_serdeOpDeleteEventSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DeleteHsmClientCertificate.go b/service/redshift/api_op_DeleteHsmClientCertificate.go index e9d9c3fd518..1cdade886fc 100644 --- a/service/redshift/api_op_DeleteHsmClientCertificate.go +++ b/service/redshift/api_op_DeleteHsmClientCertificate.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteHsmClientCertificate(ctx context.Context, params *DeleteH addawsAwsquery_serdeOpDeleteHsmClientCertificateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DeleteHsmConfiguration.go b/service/redshift/api_op_DeleteHsmConfiguration.go index 21acade5c13..778361007a6 100644 --- a/service/redshift/api_op_DeleteHsmConfiguration.go +++ b/service/redshift/api_op_DeleteHsmConfiguration.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteHsmConfiguration(ctx context.Context, params *DeleteHsmCo addawsAwsquery_serdeOpDeleteHsmConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DeleteScheduledAction.go b/service/redshift/api_op_DeleteScheduledAction.go index f6aaf76700c..511b9d9caa9 100644 --- a/service/redshift/api_op_DeleteScheduledAction.go +++ b/service/redshift/api_op_DeleteScheduledAction.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteScheduledAction(ctx context.Context, params *DeleteSchedu addawsAwsquery_serdeOpDeleteScheduledActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DeleteSnapshotCopyGrant.go b/service/redshift/api_op_DeleteSnapshotCopyGrant.go index 74a7456849c..2165f1a6744 100644 --- a/service/redshift/api_op_DeleteSnapshotCopyGrant.go +++ b/service/redshift/api_op_DeleteSnapshotCopyGrant.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSnapshotCopyGrant(ctx context.Context, params *DeleteSnap addawsAwsquery_serdeOpDeleteSnapshotCopyGrantMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DeleteSnapshotSchedule.go b/service/redshift/api_op_DeleteSnapshotSchedule.go index 6ac5b2781cf..b3a3c7005c7 100644 --- a/service/redshift/api_op_DeleteSnapshotSchedule.go +++ b/service/redshift/api_op_DeleteSnapshotSchedule.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSnapshotSchedule(ctx context.Context, params *DeleteSnaps addawsAwsquery_serdeOpDeleteSnapshotScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DeleteTags.go b/service/redshift/api_op_DeleteTags.go index 987b53e87f2..ffa6f5b82da 100644 --- a/service/redshift/api_op_DeleteTags.go +++ b/service/redshift/api_op_DeleteTags.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteTags(ctx context.Context, params *DeleteTagsInput, optFns addawsAwsquery_serdeOpDeleteTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DeleteUsageLimit.go b/service/redshift/api_op_DeleteUsageLimit.go index 5a87bfb72b2..57608702b63 100644 --- a/service/redshift/api_op_DeleteUsageLimit.go +++ b/service/redshift/api_op_DeleteUsageLimit.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteUsageLimit(ctx context.Context, params *DeleteUsageLimitI addawsAwsquery_serdeOpDeleteUsageLimitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeAccountAttributes.go b/service/redshift/api_op_DescribeAccountAttributes.go index 7b71d762ae8..243e4f35e0e 100644 --- a/service/redshift/api_op_DescribeAccountAttributes.go +++ b/service/redshift/api_op_DescribeAccountAttributes.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeAccountAttributes(ctx context.Context, params *Describe addawsAwsquery_serdeOpDescribeAccountAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeClusterDbRevisions.go b/service/redshift/api_op_DescribeClusterDbRevisions.go index 7f9fbd7016d..b5a4a5bf426 100644 --- a/service/redshift/api_op_DescribeClusterDbRevisions.go +++ b/service/redshift/api_op_DescribeClusterDbRevisions.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeClusterDbRevisions(ctx context.Context, params *Describ addawsAwsquery_serdeOpDescribeClusterDbRevisionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeClusterParameterGroups.go b/service/redshift/api_op_DescribeClusterParameterGroups.go index 3b9a0059e42..2ea21dfc8da 100644 --- a/service/redshift/api_op_DescribeClusterParameterGroups.go +++ b/service/redshift/api_op_DescribeClusterParameterGroups.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) DescribeClusterParameterGroups(ctx context.Context, params *Des addawsAwsquery_serdeOpDescribeClusterParameterGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeClusterParameters.go b/service/redshift/api_op_DescribeClusterParameters.go index 6fdcebe67ba..40fbf136c96 100644 --- a/service/redshift/api_op_DescribeClusterParameters.go +++ b/service/redshift/api_op_DescribeClusterParameters.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) DescribeClusterParameters(ctx context.Context, params *Describe addawsAwsquery_serdeOpDescribeClusterParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeClusterSecurityGroups.go b/service/redshift/api_op_DescribeClusterSecurityGroups.go index 0568ef7cdfd..be7ef1edaf4 100644 --- a/service/redshift/api_op_DescribeClusterSecurityGroups.go +++ b/service/redshift/api_op_DescribeClusterSecurityGroups.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) DescribeClusterSecurityGroups(ctx context.Context, params *Desc addawsAwsquery_serdeOpDescribeClusterSecurityGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeClusterSnapshots.go b/service/redshift/api_op_DescribeClusterSnapshots.go index 5496c84397f..0f456da5b79 100644 --- a/service/redshift/api_op_DescribeClusterSnapshots.go +++ b/service/redshift/api_op_DescribeClusterSnapshots.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) DescribeClusterSnapshots(ctx context.Context, params *DescribeC addawsAwsquery_serdeOpDescribeClusterSnapshotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeClusterSubnetGroups.go b/service/redshift/api_op_DescribeClusterSubnetGroups.go index 27bb8f31d57..464712b7de9 100644 --- a/service/redshift/api_op_DescribeClusterSubnetGroups.go +++ b/service/redshift/api_op_DescribeClusterSubnetGroups.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) DescribeClusterSubnetGroups(ctx context.Context, params *Descri addawsAwsquery_serdeOpDescribeClusterSubnetGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeClusterTracks.go b/service/redshift/api_op_DescribeClusterTracks.go index 7ccf9202f91..c143275b5e1 100644 --- a/service/redshift/api_op_DescribeClusterTracks.go +++ b/service/redshift/api_op_DescribeClusterTracks.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeClusterTracks(ctx context.Context, params *DescribeClus addawsAwsquery_serdeOpDescribeClusterTracksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeClusterVersions.go b/service/redshift/api_op_DescribeClusterVersions.go index 8f05270f0ad..5299ec92fa4 100644 --- a/service/redshift/api_op_DescribeClusterVersions.go +++ b/service/redshift/api_op_DescribeClusterVersions.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeClusterVersions(ctx context.Context, params *DescribeCl addawsAwsquery_serdeOpDescribeClusterVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeClusters.go b/service/redshift/api_op_DescribeClusters.go index f90da1aa460..93d499aade9 100644 --- a/service/redshift/api_op_DescribeClusters.go +++ b/service/redshift/api_op_DescribeClusters.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) DescribeClusters(ctx context.Context, params *DescribeClustersI addawsAwsquery_serdeOpDescribeClustersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeDefaultClusterParameters.go b/service/redshift/api_op_DescribeDefaultClusterParameters.go index 03f67d9ea9f..8afa6229325 100644 --- a/service/redshift/api_op_DescribeDefaultClusterParameters.go +++ b/service/redshift/api_op_DescribeDefaultClusterParameters.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeDefaultClusterParameters(ctx context.Context, params *D addawsAwsquery_serdeOpDescribeDefaultClusterParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeEventCategories.go b/service/redshift/api_op_DescribeEventCategories.go index d017735637c..3e3f7f516ce 100644 --- a/service/redshift/api_op_DescribeEventCategories.go +++ b/service/redshift/api_op_DescribeEventCategories.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeEventCategories(ctx context.Context, params *DescribeEv addawsAwsquery_serdeOpDescribeEventCategoriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeEventSubscriptions.go b/service/redshift/api_op_DescribeEventSubscriptions.go index b071b58cb2a..cb07d835ccf 100644 --- a/service/redshift/api_op_DescribeEventSubscriptions.go +++ b/service/redshift/api_op_DescribeEventSubscriptions.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) DescribeEventSubscriptions(ctx context.Context, params *Describ addawsAwsquery_serdeOpDescribeEventSubscriptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeEvents.go b/service/redshift/api_op_DescribeEvents.go index 57700dfd65d..a4c557bb337 100644 --- a/service/redshift/api_op_DescribeEvents.go +++ b/service/redshift/api_op_DescribeEvents.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeEvents(ctx context.Context, params *DescribeEventsInput addawsAwsquery_serdeOpDescribeEventsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeHsmClientCertificates.go b/service/redshift/api_op_DescribeHsmClientCertificates.go index d2a88ab5d6c..6624ba0f833 100644 --- a/service/redshift/api_op_DescribeHsmClientCertificates.go +++ b/service/redshift/api_op_DescribeHsmClientCertificates.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) DescribeHsmClientCertificates(ctx context.Context, params *Desc addawsAwsquery_serdeOpDescribeHsmClientCertificatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeHsmConfigurations.go b/service/redshift/api_op_DescribeHsmConfigurations.go index a6a9e7aeeb5..5c3ea818590 100644 --- a/service/redshift/api_op_DescribeHsmConfigurations.go +++ b/service/redshift/api_op_DescribeHsmConfigurations.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DescribeHsmConfigurations(ctx context.Context, params *Describe addawsAwsquery_serdeOpDescribeHsmConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeLoggingStatus.go b/service/redshift/api_op_DescribeLoggingStatus.go index c4f448d1e60..7b4e1166a38 100644 --- a/service/redshift/api_op_DescribeLoggingStatus.go +++ b/service/redshift/api_op_DescribeLoggingStatus.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DescribeLoggingStatus(ctx context.Context, params *DescribeLogg addawsAwsquery_serdeOpDescribeLoggingStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeNodeConfigurationOptions.go b/service/redshift/api_op_DescribeNodeConfigurationOptions.go index 2d51e808272..5aa658bbd47 100644 --- a/service/redshift/api_op_DescribeNodeConfigurationOptions.go +++ b/service/redshift/api_op_DescribeNodeConfigurationOptions.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeNodeConfigurationOptions(ctx context.Context, params *D addawsAwsquery_serdeOpDescribeNodeConfigurationOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeOrderableClusterOptions.go b/service/redshift/api_op_DescribeOrderableClusterOptions.go index eb55ebcf4ea..d626c2e0269 100644 --- a/service/redshift/api_op_DescribeOrderableClusterOptions.go +++ b/service/redshift/api_op_DescribeOrderableClusterOptions.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DescribeOrderableClusterOptions(ctx context.Context, params *De addawsAwsquery_serdeOpDescribeOrderableClusterOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeReservedNodeOfferings.go b/service/redshift/api_op_DescribeReservedNodeOfferings.go index f49c283785e..0b72b22901d 100644 --- a/service/redshift/api_op_DescribeReservedNodeOfferings.go +++ b/service/redshift/api_op_DescribeReservedNodeOfferings.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) DescribeReservedNodeOfferings(ctx context.Context, params *Desc addawsAwsquery_serdeOpDescribeReservedNodeOfferingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeReservedNodes.go b/service/redshift/api_op_DescribeReservedNodes.go index d1e200a1126..0d3555cca5f 100644 --- a/service/redshift/api_op_DescribeReservedNodes.go +++ b/service/redshift/api_op_DescribeReservedNodes.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeReservedNodes(ctx context.Context, params *DescribeRese addawsAwsquery_serdeOpDescribeReservedNodesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeResize.go b/service/redshift/api_op_DescribeResize.go index 891da73a92d..99082cfc131 100644 --- a/service/redshift/api_op_DescribeResize.go +++ b/service/redshift/api_op_DescribeResize.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DescribeResize(ctx context.Context, params *DescribeResizeInput addawsAwsquery_serdeOpDescribeResizeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeScheduledActions.go b/service/redshift/api_op_DescribeScheduledActions.go index c3df24f85ad..11d80ea848f 100644 --- a/service/redshift/api_op_DescribeScheduledActions.go +++ b/service/redshift/api_op_DescribeScheduledActions.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeScheduledActions(ctx context.Context, params *DescribeS addawsAwsquery_serdeOpDescribeScheduledActionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeSnapshotCopyGrants.go b/service/redshift/api_op_DescribeSnapshotCopyGrants.go index e960be05705..b0e8498fca7 100644 --- a/service/redshift/api_op_DescribeSnapshotCopyGrants.go +++ b/service/redshift/api_op_DescribeSnapshotCopyGrants.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeSnapshotCopyGrants(ctx context.Context, params *Describ addawsAwsquery_serdeOpDescribeSnapshotCopyGrantsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeSnapshotSchedules.go b/service/redshift/api_op_DescribeSnapshotSchedules.go index 75d182bf488..f248d6c9272 100644 --- a/service/redshift/api_op_DescribeSnapshotSchedules.go +++ b/service/redshift/api_op_DescribeSnapshotSchedules.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeSnapshotSchedules(ctx context.Context, params *Describe addawsAwsquery_serdeOpDescribeSnapshotSchedulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeStorage.go b/service/redshift/api_op_DescribeStorage.go index b3f68ed0221..32aec0311fe 100644 --- a/service/redshift/api_op_DescribeStorage.go +++ b/service/redshift/api_op_DescribeStorage.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DescribeStorage(ctx context.Context, params *DescribeStorageInp addawsAwsquery_serdeOpDescribeStorageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeTableRestoreStatus.go b/service/redshift/api_op_DescribeTableRestoreStatus.go index 8c5c2599cc9..855900f7276 100644 --- a/service/redshift/api_op_DescribeTableRestoreStatus.go +++ b/service/redshift/api_op_DescribeTableRestoreStatus.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeTableRestoreStatus(ctx context.Context, params *Describ addawsAwsquery_serdeOpDescribeTableRestoreStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeTags.go b/service/redshift/api_op_DescribeTags.go index abc98332c85..e70bebe0304 100644 --- a/service/redshift/api_op_DescribeTags.go +++ b/service/redshift/api_op_DescribeTags.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) DescribeTags(ctx context.Context, params *DescribeTagsInput, op addawsAwsquery_serdeOpDescribeTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DescribeUsageLimits.go b/service/redshift/api_op_DescribeUsageLimits.go index dbf91301a96..8f5139f5872 100644 --- a/service/redshift/api_op_DescribeUsageLimits.go +++ b/service/redshift/api_op_DescribeUsageLimits.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) DescribeUsageLimits(ctx context.Context, params *DescribeUsageL addawsAwsquery_serdeOpDescribeUsageLimitsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DisableLogging.go b/service/redshift/api_op_DisableLogging.go index 68f18de5294..bb1b8d3b8c5 100644 --- a/service/redshift/api_op_DisableLogging.go +++ b/service/redshift/api_op_DisableLogging.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DisableLogging(ctx context.Context, params *DisableLoggingInput addawsAwsquery_serdeOpDisableLoggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_DisableSnapshotCopy.go b/service/redshift/api_op_DisableSnapshotCopy.go index 6501652d08f..cf3a2eef42d 100644 --- a/service/redshift/api_op_DisableSnapshotCopy.go +++ b/service/redshift/api_op_DisableSnapshotCopy.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DisableSnapshotCopy(ctx context.Context, params *DisableSnapsho addawsAwsquery_serdeOpDisableSnapshotCopyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_EnableLogging.go b/service/redshift/api_op_EnableLogging.go index 322a29ed1c7..21cd924cdfa 100644 --- a/service/redshift/api_op_EnableLogging.go +++ b/service/redshift/api_op_EnableLogging.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) EnableLogging(ctx context.Context, params *EnableLoggingInput, addawsAwsquery_serdeOpEnableLoggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_EnableSnapshotCopy.go b/service/redshift/api_op_EnableSnapshotCopy.go index 6f8136c714a..56099da2b8f 100644 --- a/service/redshift/api_op_EnableSnapshotCopy.go +++ b/service/redshift/api_op_EnableSnapshotCopy.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) EnableSnapshotCopy(ctx context.Context, params *EnableSnapshotC addawsAwsquery_serdeOpEnableSnapshotCopyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_GetClusterCredentials.go b/service/redshift/api_op_GetClusterCredentials.go index c2d338b0e70..1662ff13776 100644 --- a/service/redshift/api_op_GetClusterCredentials.go +++ b/service/redshift/api_op_GetClusterCredentials.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -43,9 +42,9 @@ func (c *Client) GetClusterCredentials(ctx context.Context, params *GetClusterCr addawsAwsquery_serdeOpGetClusterCredentialsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_GetReservedNodeExchangeOfferings.go b/service/redshift/api_op_GetReservedNodeExchangeOfferings.go index c308a4e889b..2f27a82d8e4 100644 --- a/service/redshift/api_op_GetReservedNodeExchangeOfferings.go +++ b/service/redshift/api_op_GetReservedNodeExchangeOfferings.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetReservedNodeExchangeOfferings(ctx context.Context, params *G addawsAwsquery_serdeOpGetReservedNodeExchangeOfferingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_ModifyCluster.go b/service/redshift/api_op_ModifyCluster.go index 185d50446e4..4053f3c6d8b 100644 --- a/service/redshift/api_op_ModifyCluster.go +++ b/service/redshift/api_op_ModifyCluster.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) ModifyCluster(ctx context.Context, params *ModifyClusterInput, addawsAwsquery_serdeOpModifyClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_ModifyClusterDbRevision.go b/service/redshift/api_op_ModifyClusterDbRevision.go index 3ad85170c01..1f50a83faa6 100644 --- a/service/redshift/api_op_ModifyClusterDbRevision.go +++ b/service/redshift/api_op_ModifyClusterDbRevision.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ModifyClusterDbRevision(ctx context.Context, params *ModifyClus addawsAwsquery_serdeOpModifyClusterDbRevisionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_ModifyClusterIamRoles.go b/service/redshift/api_op_ModifyClusterIamRoles.go index ed3cc17baa0..1ba3120f5f1 100644 --- a/service/redshift/api_op_ModifyClusterIamRoles.go +++ b/service/redshift/api_op_ModifyClusterIamRoles.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ModifyClusterIamRoles(ctx context.Context, params *ModifyCluste addawsAwsquery_serdeOpModifyClusterIamRolesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_ModifyClusterMaintenance.go b/service/redshift/api_op_ModifyClusterMaintenance.go index 5bb5c47cf04..7a7914fff36 100644 --- a/service/redshift/api_op_ModifyClusterMaintenance.go +++ b/service/redshift/api_op_ModifyClusterMaintenance.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ModifyClusterMaintenance(ctx context.Context, params *ModifyClu addawsAwsquery_serdeOpModifyClusterMaintenanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_ModifyClusterParameterGroup.go b/service/redshift/api_op_ModifyClusterParameterGroup.go index c8fdd416336..c4e2d740aaf 100644 --- a/service/redshift/api_op_ModifyClusterParameterGroup.go +++ b/service/redshift/api_op_ModifyClusterParameterGroup.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ModifyClusterParameterGroup(ctx context.Context, params *Modify addawsAwsquery_serdeOpModifyClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_ModifyClusterSnapshot.go b/service/redshift/api_op_ModifyClusterSnapshot.go index 84192be4e30..ea1fec665a4 100644 --- a/service/redshift/api_op_ModifyClusterSnapshot.go +++ b/service/redshift/api_op_ModifyClusterSnapshot.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ModifyClusterSnapshot(ctx context.Context, params *ModifyCluste addawsAwsquery_serdeOpModifyClusterSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_ModifyClusterSnapshotSchedule.go b/service/redshift/api_op_ModifyClusterSnapshotSchedule.go index 8dfc3db9547..b403428984e 100644 --- a/service/redshift/api_op_ModifyClusterSnapshotSchedule.go +++ b/service/redshift/api_op_ModifyClusterSnapshotSchedule.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ModifyClusterSnapshotSchedule(ctx context.Context, params *Modi addawsAwsquery_serdeOpModifyClusterSnapshotScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_ModifyClusterSubnetGroup.go b/service/redshift/api_op_ModifyClusterSubnetGroup.go index 87d5895349c..065bcdcd655 100644 --- a/service/redshift/api_op_ModifyClusterSubnetGroup.go +++ b/service/redshift/api_op_ModifyClusterSubnetGroup.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ModifyClusterSubnetGroup(ctx context.Context, params *ModifyClu addawsAwsquery_serdeOpModifyClusterSubnetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_ModifyEventSubscription.go b/service/redshift/api_op_ModifyEventSubscription.go index 6c67053364f..ac4ebcd03d3 100644 --- a/service/redshift/api_op_ModifyEventSubscription.go +++ b/service/redshift/api_op_ModifyEventSubscription.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifyEventSubscription(ctx context.Context, params *ModifyEven addawsAwsquery_serdeOpModifyEventSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_ModifyScheduledAction.go b/service/redshift/api_op_ModifyScheduledAction.go index fa480e0f79b..732f968d615 100644 --- a/service/redshift/api_op_ModifyScheduledAction.go +++ b/service/redshift/api_op_ModifyScheduledAction.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ModifyScheduledAction(ctx context.Context, params *ModifySchedu addawsAwsquery_serdeOpModifyScheduledActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_ModifySnapshotCopyRetentionPeriod.go b/service/redshift/api_op_ModifySnapshotCopyRetentionPeriod.go index b90ed247b79..cfd54358661 100644 --- a/service/redshift/api_op_ModifySnapshotCopyRetentionPeriod.go +++ b/service/redshift/api_op_ModifySnapshotCopyRetentionPeriod.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ModifySnapshotCopyRetentionPeriod(ctx context.Context, params * addawsAwsquery_serdeOpModifySnapshotCopyRetentionPeriodMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_ModifySnapshotSchedule.go b/service/redshift/api_op_ModifySnapshotSchedule.go index 7a23b02f3fa..04ebc821cce 100644 --- a/service/redshift/api_op_ModifySnapshotSchedule.go +++ b/service/redshift/api_op_ModifySnapshotSchedule.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ModifySnapshotSchedule(ctx context.Context, params *ModifySnaps addawsAwsquery_serdeOpModifySnapshotScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_ModifyUsageLimit.go b/service/redshift/api_op_ModifyUsageLimit.go index 26d7a67544b..265e5b2c448 100644 --- a/service/redshift/api_op_ModifyUsageLimit.go +++ b/service/redshift/api_op_ModifyUsageLimit.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ModifyUsageLimit(ctx context.Context, params *ModifyUsageLimitI addawsAwsquery_serdeOpModifyUsageLimitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_PauseCluster.go b/service/redshift/api_op_PauseCluster.go index 7a61133c650..2b97670200f 100644 --- a/service/redshift/api_op_PauseCluster.go +++ b/service/redshift/api_op_PauseCluster.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PauseCluster(ctx context.Context, params *PauseClusterInput, op addawsAwsquery_serdeOpPauseClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_PurchaseReservedNodeOffering.go b/service/redshift/api_op_PurchaseReservedNodeOffering.go index 21043ac078e..bb5c63b48a8 100644 --- a/service/redshift/api_op_PurchaseReservedNodeOffering.go +++ b/service/redshift/api_op_PurchaseReservedNodeOffering.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) PurchaseReservedNodeOffering(ctx context.Context, params *Purch addawsAwsquery_serdeOpPurchaseReservedNodeOfferingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_RebootCluster.go b/service/redshift/api_op_RebootCluster.go index b2191663592..73600b10076 100644 --- a/service/redshift/api_op_RebootCluster.go +++ b/service/redshift/api_op_RebootCluster.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) RebootCluster(ctx context.Context, params *RebootClusterInput, addawsAwsquery_serdeOpRebootClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_ResetClusterParameterGroup.go b/service/redshift/api_op_ResetClusterParameterGroup.go index 1356f249146..74f55dd9afb 100644 --- a/service/redshift/api_op_ResetClusterParameterGroup.go +++ b/service/redshift/api_op_ResetClusterParameterGroup.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ResetClusterParameterGroup(ctx context.Context, params *ResetCl addawsAwsquery_serdeOpResetClusterParameterGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_ResizeCluster.go b/service/redshift/api_op_ResizeCluster.go index 0618f9a712c..90a0f47e0de 100644 --- a/service/redshift/api_op_ResizeCluster.go +++ b/service/redshift/api_op_ResizeCluster.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) ResizeCluster(ctx context.Context, params *ResizeClusterInput, addawsAwsquery_serdeOpResizeClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_RestoreFromClusterSnapshot.go b/service/redshift/api_op_RestoreFromClusterSnapshot.go index 373efc20da3..7b67e5aedbd 100644 --- a/service/redshift/api_op_RestoreFromClusterSnapshot.go +++ b/service/redshift/api_op_RestoreFromClusterSnapshot.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) RestoreFromClusterSnapshot(ctx context.Context, params *Restore addawsAwsquery_serdeOpRestoreFromClusterSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_RestoreTableFromClusterSnapshot.go b/service/redshift/api_op_RestoreTableFromClusterSnapshot.go index 216b899a552..9cb1f898082 100644 --- a/service/redshift/api_op_RestoreTableFromClusterSnapshot.go +++ b/service/redshift/api_op_RestoreTableFromClusterSnapshot.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) RestoreTableFromClusterSnapshot(ctx context.Context, params *Re addawsAwsquery_serdeOpRestoreTableFromClusterSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_ResumeCluster.go b/service/redshift/api_op_ResumeCluster.go index d232a786611..af91b1009b9 100644 --- a/service/redshift/api_op_ResumeCluster.go +++ b/service/redshift/api_op_ResumeCluster.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ResumeCluster(ctx context.Context, params *ResumeClusterInput, addawsAwsquery_serdeOpResumeClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_RevokeClusterSecurityGroupIngress.go b/service/redshift/api_op_RevokeClusterSecurityGroupIngress.go index d87c858d01e..945ea11ab07 100644 --- a/service/redshift/api_op_RevokeClusterSecurityGroupIngress.go +++ b/service/redshift/api_op_RevokeClusterSecurityGroupIngress.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) RevokeClusterSecurityGroupIngress(ctx context.Context, params * addawsAwsquery_serdeOpRevokeClusterSecurityGroupIngressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_RevokeSnapshotAccess.go b/service/redshift/api_op_RevokeSnapshotAccess.go index ecec5a30848..0edb7619f4c 100644 --- a/service/redshift/api_op_RevokeSnapshotAccess.go +++ b/service/redshift/api_op_RevokeSnapshotAccess.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) RevokeSnapshotAccess(ctx context.Context, params *RevokeSnapsho addawsAwsquery_serdeOpRevokeSnapshotAccessMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/api_op_RotateEncryptionKey.go b/service/redshift/api_op_RotateEncryptionKey.go index 363711b08db..fb7cb6be180 100644 --- a/service/redshift/api_op_RotateEncryptionKey.go +++ b/service/redshift/api_op_RotateEncryptionKey.go @@ -5,7 +5,6 @@ package redshift import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/redshift/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RotateEncryptionKey(ctx context.Context, params *RotateEncrypti addawsAwsquery_serdeOpRotateEncryptionKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/redshift/endpoints.go b/service/redshift/endpoints.go index 03c85691ad1..a4c381bd20d 100644 --- a/service/redshift/endpoints.go +++ b/service/redshift/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/rekognition/api_client.go b/service/rekognition/api_client.go index 4cfd8f694d0..bc7a9c10888 100644 --- a/service/rekognition/api_client.go +++ b/service/rekognition/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/rekognition/api_op_CompareFaces.go b/service/rekognition/api_op_CompareFaces.go index 04c7d5eeccd..447cc96c2d9 100644 --- a/service/rekognition/api_op_CompareFaces.go +++ b/service/rekognition/api_op_CompareFaces.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -61,9 +60,9 @@ func (c *Client) CompareFaces(ctx context.Context, params *CompareFacesInput, op addawsAwsjson11_serdeOpCompareFacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_CreateCollection.go b/service/rekognition/api_op_CreateCollection.go index f10415fbb5f..a5ab1c93fad 100644 --- a/service/rekognition/api_op_CreateCollection.go +++ b/service/rekognition/api_op_CreateCollection.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) CreateCollection(ctx context.Context, params *CreateCollectionI addawsAwsjson11_serdeOpCreateCollectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_CreateProject.go b/service/rekognition/api_op_CreateProject.go index 01d6d9b30cc..571b92b915c 100644 --- a/service/rekognition/api_op_CreateProject.go +++ b/service/rekognition/api_op_CreateProject.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) CreateProject(ctx context.Context, params *CreateProjectInput, addawsAwsjson11_serdeOpCreateProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_CreateProjectVersion.go b/service/rekognition/api_op_CreateProjectVersion.go index 115bb2f1fd7..fa8511a346c 100644 --- a/service/rekognition/api_op_CreateProjectVersion.go +++ b/service/rekognition/api_op_CreateProjectVersion.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateProjectVersion(ctx context.Context, params *CreateProject addawsAwsjson11_serdeOpCreateProjectVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_CreateStreamProcessor.go b/service/rekognition/api_op_CreateStreamProcessor.go index 0b3edebca3c..212062fda0a 100644 --- a/service/rekognition/api_op_CreateStreamProcessor.go +++ b/service/rekognition/api_op_CreateStreamProcessor.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) CreateStreamProcessor(ctx context.Context, params *CreateStream addawsAwsjson11_serdeOpCreateStreamProcessorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_DeleteCollection.go b/service/rekognition/api_op_DeleteCollection.go index 272ceed7129..f231a500784 100644 --- a/service/rekognition/api_op_DeleteCollection.go +++ b/service/rekognition/api_op_DeleteCollection.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteCollection(ctx context.Context, params *DeleteCollectionI addawsAwsjson11_serdeOpDeleteCollectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_DeleteFaces.go b/service/rekognition/api_op_DeleteFaces.go index cff3be285e4..c0ef73bc3ee 100644 --- a/service/rekognition/api_op_DeleteFaces.go +++ b/service/rekognition/api_op_DeleteFaces.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteFaces(ctx context.Context, params *DeleteFacesInput, optF addawsAwsjson11_serdeOpDeleteFacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_DeleteProject.go b/service/rekognition/api_op_DeleteProject.go index 35de10d372c..25595643361 100644 --- a/service/rekognition/api_op_DeleteProject.go +++ b/service/rekognition/api_op_DeleteProject.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteProject(ctx context.Context, params *DeleteProjectInput, addawsAwsjson11_serdeOpDeleteProjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_DeleteProjectVersion.go b/service/rekognition/api_op_DeleteProjectVersion.go index d982be176c9..a7fd38229f9 100644 --- a/service/rekognition/api_op_DeleteProjectVersion.go +++ b/service/rekognition/api_op_DeleteProjectVersion.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DeleteProjectVersion(ctx context.Context, params *DeleteProject addawsAwsjson11_serdeOpDeleteProjectVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_DeleteStreamProcessor.go b/service/rekognition/api_op_DeleteStreamProcessor.go index 1c36448096e..cdea83b8b2d 100644 --- a/service/rekognition/api_op_DeleteStreamProcessor.go +++ b/service/rekognition/api_op_DeleteStreamProcessor.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteStreamProcessor(ctx context.Context, params *DeleteStream addawsAwsjson11_serdeOpDeleteStreamProcessorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_DescribeCollection.go b/service/rekognition/api_op_DescribeCollection.go index 026304bc549..ad429ba8db2 100644 --- a/service/rekognition/api_op_DescribeCollection.go +++ b/service/rekognition/api_op_DescribeCollection.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DescribeCollection(ctx context.Context, params *DescribeCollect addawsAwsjson11_serdeOpDescribeCollectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_DescribeProjectVersions.go b/service/rekognition/api_op_DescribeProjectVersions.go index 23bf83aeed0..2f8eac36d23 100644 --- a/service/rekognition/api_op_DescribeProjectVersions.go +++ b/service/rekognition/api_op_DescribeProjectVersions.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeProjectVersions(ctx context.Context, params *DescribePr addawsAwsjson11_serdeOpDescribeProjectVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_DescribeProjects.go b/service/rekognition/api_op_DescribeProjects.go index 39b52064236..bee3d8c9d8e 100644 --- a/service/rekognition/api_op_DescribeProjects.go +++ b/service/rekognition/api_op_DescribeProjects.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeProjects(ctx context.Context, params *DescribeProjectsI addawsAwsjson11_serdeOpDescribeProjectsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_DescribeStreamProcessor.go b/service/rekognition/api_op_DescribeStreamProcessor.go index 3c69f1c496e..59a6a397b82 100644 --- a/service/rekognition/api_op_DescribeStreamProcessor.go +++ b/service/rekognition/api_op_DescribeStreamProcessor.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeStreamProcessor(ctx context.Context, params *DescribeSt addawsAwsjson11_serdeOpDescribeStreamProcessorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_DetectCustomLabels.go b/service/rekognition/api_op_DetectCustomLabels.go index 92c7f1f6fbc..507db0724cb 100644 --- a/service/rekognition/api_op_DetectCustomLabels.go +++ b/service/rekognition/api_op_DetectCustomLabels.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) DetectCustomLabels(ctx context.Context, params *DetectCustomLab addawsAwsjson11_serdeOpDetectCustomLabelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_DetectFaces.go b/service/rekognition/api_op_DetectFaces.go index 3506bbcb2ee..aa17477da35 100644 --- a/service/rekognition/api_op_DetectFaces.go +++ b/service/rekognition/api_op_DetectFaces.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) DetectFaces(ctx context.Context, params *DetectFacesInput, optF addawsAwsjson11_serdeOpDetectFacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_DetectLabels.go b/service/rekognition/api_op_DetectLabels.go index f1597eddeba..b929ce226e8 100644 --- a/service/rekognition/api_op_DetectLabels.go +++ b/service/rekognition/api_op_DetectLabels.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -68,9 +67,9 @@ func (c *Client) DetectLabels(ctx context.Context, params *DetectLabelsInput, op addawsAwsjson11_serdeOpDetectLabelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_DetectModerationLabels.go b/service/rekognition/api_op_DetectModerationLabels.go index aa25562c3a5..9cb4272c071 100644 --- a/service/rekognition/api_op_DetectModerationLabels.go +++ b/service/rekognition/api_op_DetectModerationLabels.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) DetectModerationLabels(ctx context.Context, params *DetectModer addawsAwsjson11_serdeOpDetectModerationLabelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_DetectText.go b/service/rekognition/api_op_DetectText.go index 8c12e4f3fa7..4229cee026b 100644 --- a/service/rekognition/api_op_DetectText.go +++ b/service/rekognition/api_op_DetectText.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) DetectText(ctx context.Context, params *DetectTextInput, optFns addawsAwsjson11_serdeOpDetectTextMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_GetCelebrityInfo.go b/service/rekognition/api_op_GetCelebrityInfo.go index 6222453d947..9b3a3060327 100644 --- a/service/rekognition/api_op_GetCelebrityInfo.go +++ b/service/rekognition/api_op_GetCelebrityInfo.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) GetCelebrityInfo(ctx context.Context, params *GetCelebrityInfoI addawsAwsjson11_serdeOpGetCelebrityInfoMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_GetCelebrityRecognition.go b/service/rekognition/api_op_GetCelebrityRecognition.go index f048f114231..039675fb1c0 100644 --- a/service/rekognition/api_op_GetCelebrityRecognition.go +++ b/service/rekognition/api_op_GetCelebrityRecognition.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -59,9 +58,9 @@ func (c *Client) GetCelebrityRecognition(ctx context.Context, params *GetCelebri addawsAwsjson11_serdeOpGetCelebrityRecognitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_GetContentModeration.go b/service/rekognition/api_op_GetContentModeration.go index fae7f97ffac..e3113771d9b 100644 --- a/service/rekognition/api_op_GetContentModeration.go +++ b/service/rekognition/api_op_GetContentModeration.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -51,9 +50,9 @@ func (c *Client) GetContentModeration(ctx context.Context, params *GetContentMod addawsAwsjson11_serdeOpGetContentModerationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_GetFaceDetection.go b/service/rekognition/api_op_GetFaceDetection.go index c22dae9d4ae..98e81df5aff 100644 --- a/service/rekognition/api_op_GetFaceDetection.go +++ b/service/rekognition/api_op_GetFaceDetection.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) GetFaceDetection(ctx context.Context, params *GetFaceDetectionI addawsAwsjson11_serdeOpGetFaceDetectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_GetFaceSearch.go b/service/rekognition/api_op_GetFaceSearch.go index 4669ab2407a..e6ff26b4477 100644 --- a/service/rekognition/api_op_GetFaceSearch.go +++ b/service/rekognition/api_op_GetFaceSearch.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -48,9 +47,9 @@ func (c *Client) GetFaceSearch(ctx context.Context, params *GetFaceSearchInput, addawsAwsjson11_serdeOpGetFaceSearchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_GetLabelDetection.go b/service/rekognition/api_op_GetLabelDetection.go index 63a59d3dc11..5c6a8a304db 100644 --- a/service/rekognition/api_op_GetLabelDetection.go +++ b/service/rekognition/api_op_GetLabelDetection.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) GetLabelDetection(ctx context.Context, params *GetLabelDetectio addawsAwsjson11_serdeOpGetLabelDetectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_GetPersonTracking.go b/service/rekognition/api_op_GetPersonTracking.go index edc4fcff4e4..c9180948e6c 100644 --- a/service/rekognition/api_op_GetPersonTracking.go +++ b/service/rekognition/api_op_GetPersonTracking.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -48,9 +47,9 @@ func (c *Client) GetPersonTracking(ctx context.Context, params *GetPersonTrackin addawsAwsjson11_serdeOpGetPersonTrackingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_GetSegmentDetection.go b/service/rekognition/api_op_GetSegmentDetection.go index 15f68898def..1e6ff3a7305 100644 --- a/service/rekognition/api_op_GetSegmentDetection.go +++ b/service/rekognition/api_op_GetSegmentDetection.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) GetSegmentDetection(ctx context.Context, params *GetSegmentDete addawsAwsjson11_serdeOpGetSegmentDetectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_GetTextDetection.go b/service/rekognition/api_op_GetTextDetection.go index 9639ca0e5e4..3c2691dfeb3 100644 --- a/service/rekognition/api_op_GetTextDetection.go +++ b/service/rekognition/api_op_GetTextDetection.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) GetTextDetection(ctx context.Context, params *GetTextDetectionI addawsAwsjson11_serdeOpGetTextDetectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_IndexFaces.go b/service/rekognition/api_op_IndexFaces.go index 0d4646d05a9..08b1d6256c2 100644 --- a/service/rekognition/api_op_IndexFaces.go +++ b/service/rekognition/api_op_IndexFaces.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -86,9 +85,9 @@ func (c *Client) IndexFaces(ctx context.Context, params *IndexFacesInput, optFns addawsAwsjson11_serdeOpIndexFacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_ListCollections.go b/service/rekognition/api_op_ListCollections.go index af9e2ef401f..e02b6e4c588 100644 --- a/service/rekognition/api_op_ListCollections.go +++ b/service/rekognition/api_op_ListCollections.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) ListCollections(ctx context.Context, params *ListCollectionsInp addawsAwsjson11_serdeOpListCollectionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_ListFaces.go b/service/rekognition/api_op_ListFaces.go index d40da78a313..27e4ae1cd43 100644 --- a/service/rekognition/api_op_ListFaces.go +++ b/service/rekognition/api_op_ListFaces.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListFaces(ctx context.Context, params *ListFacesInput, optFns . addawsAwsjson11_serdeOpListFacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_ListStreamProcessors.go b/service/rekognition/api_op_ListStreamProcessors.go index 1eee1db8554..1097540058e 100644 --- a/service/rekognition/api_op_ListStreamProcessors.go +++ b/service/rekognition/api_op_ListStreamProcessors.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListStreamProcessors(ctx context.Context, params *ListStreamPro addawsAwsjson11_serdeOpListStreamProcessorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_RecognizeCelebrities.go b/service/rekognition/api_op_RecognizeCelebrities.go index 342796faf1b..29f5d5bf7f8 100644 --- a/service/rekognition/api_op_RecognizeCelebrities.go +++ b/service/rekognition/api_op_RecognizeCelebrities.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) RecognizeCelebrities(ctx context.Context, params *RecognizeCele addawsAwsjson11_serdeOpRecognizeCelebritiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_SearchFaces.go b/service/rekognition/api_op_SearchFaces.go index 259ae68ec29..24d829d6fe8 100644 --- a/service/rekognition/api_op_SearchFaces.go +++ b/service/rekognition/api_op_SearchFaces.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) SearchFaces(ctx context.Context, params *SearchFacesInput, optF addawsAwsjson11_serdeOpSearchFacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_SearchFacesByImage.go b/service/rekognition/api_op_SearchFacesByImage.go index eb88d2ce253..9dac11cc537 100644 --- a/service/rekognition/api_op_SearchFacesByImage.go +++ b/service/rekognition/api_op_SearchFacesByImage.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -52,9 +51,9 @@ func (c *Client) SearchFacesByImage(ctx context.Context, params *SearchFacesByIm addawsAwsjson11_serdeOpSearchFacesByImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_StartCelebrityRecognition.go b/service/rekognition/api_op_StartCelebrityRecognition.go index 5addddfeb90..3a4b4d3e139 100644 --- a/service/rekognition/api_op_StartCelebrityRecognition.go +++ b/service/rekognition/api_op_StartCelebrityRecognition.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) StartCelebrityRecognition(ctx context.Context, params *StartCel addawsAwsjson11_serdeOpStartCelebrityRecognitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_StartContentModeration.go b/service/rekognition/api_op_StartContentModeration.go index db33223ea37..30aea825875 100644 --- a/service/rekognition/api_op_StartContentModeration.go +++ b/service/rekognition/api_op_StartContentModeration.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) StartContentModeration(ctx context.Context, params *StartConten addawsAwsjson11_serdeOpStartContentModerationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_StartFaceDetection.go b/service/rekognition/api_op_StartFaceDetection.go index 48bdc7b821e..72fc9f7911f 100644 --- a/service/rekognition/api_op_StartFaceDetection.go +++ b/service/rekognition/api_op_StartFaceDetection.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) StartFaceDetection(ctx context.Context, params *StartFaceDetect addawsAwsjson11_serdeOpStartFaceDetectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_StartFaceSearch.go b/service/rekognition/api_op_StartFaceSearch.go index 68da76bf0f9..d08fe61e412 100644 --- a/service/rekognition/api_op_StartFaceSearch.go +++ b/service/rekognition/api_op_StartFaceSearch.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) StartFaceSearch(ctx context.Context, params *StartFaceSearchInp addawsAwsjson11_serdeOpStartFaceSearchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_StartLabelDetection.go b/service/rekognition/api_op_StartLabelDetection.go index 3d418bbc050..b28d55b015e 100644 --- a/service/rekognition/api_op_StartLabelDetection.go +++ b/service/rekognition/api_op_StartLabelDetection.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) StartLabelDetection(ctx context.Context, params *StartLabelDete addawsAwsjson11_serdeOpStartLabelDetectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_StartPersonTracking.go b/service/rekognition/api_op_StartPersonTracking.go index 1a80f86adad..e0c897984bf 100644 --- a/service/rekognition/api_op_StartPersonTracking.go +++ b/service/rekognition/api_op_StartPersonTracking.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) StartPersonTracking(ctx context.Context, params *StartPersonTra addawsAwsjson11_serdeOpStartPersonTrackingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_StartProjectVersion.go b/service/rekognition/api_op_StartProjectVersion.go index 098323d0f55..24f7befe407 100644 --- a/service/rekognition/api_op_StartProjectVersion.go +++ b/service/rekognition/api_op_StartProjectVersion.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) StartProjectVersion(ctx context.Context, params *StartProjectVe addawsAwsjson11_serdeOpStartProjectVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_StartSegmentDetection.go b/service/rekognition/api_op_StartSegmentDetection.go index b91724fdb2d..e1d79130a50 100644 --- a/service/rekognition/api_op_StartSegmentDetection.go +++ b/service/rekognition/api_op_StartSegmentDetection.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) StartSegmentDetection(ctx context.Context, params *StartSegment addawsAwsjson11_serdeOpStartSegmentDetectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_StartStreamProcessor.go b/service/rekognition/api_op_StartStreamProcessor.go index ebf5522c828..01cacea2e39 100644 --- a/service/rekognition/api_op_StartStreamProcessor.go +++ b/service/rekognition/api_op_StartStreamProcessor.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) StartStreamProcessor(ctx context.Context, params *StartStreamPr addawsAwsjson11_serdeOpStartStreamProcessorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_StartTextDetection.go b/service/rekognition/api_op_StartTextDetection.go index ada236a67cd..09d1931f7e4 100644 --- a/service/rekognition/api_op_StartTextDetection.go +++ b/service/rekognition/api_op_StartTextDetection.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) StartTextDetection(ctx context.Context, params *StartTextDetect addawsAwsjson11_serdeOpStartTextDetectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_StopProjectVersion.go b/service/rekognition/api_op_StopProjectVersion.go index 3bc1b5f7c22..70fff1091d3 100644 --- a/service/rekognition/api_op_StopProjectVersion.go +++ b/service/rekognition/api_op_StopProjectVersion.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/rekognition/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) StopProjectVersion(ctx context.Context, params *StopProjectVers addawsAwsjson11_serdeOpStopProjectVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/api_op_StopStreamProcessor.go b/service/rekognition/api_op_StopStreamProcessor.go index 124aa14d367..327fc56378f 100644 --- a/service/rekognition/api_op_StopStreamProcessor.go +++ b/service/rekognition/api_op_StopStreamProcessor.go @@ -5,7 +5,6 @@ package rekognition import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StopStreamProcessor(ctx context.Context, params *StopStreamProc addawsAwsjson11_serdeOpStopStreamProcessorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/rekognition/endpoints.go b/service/rekognition/endpoints.go index ea65cba222f..869a4bb46a5 100644 --- a/service/rekognition/endpoints.go +++ b/service/rekognition/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/resourcegroups/api_client.go b/service/resourcegroups/api_client.go index 4f5151ad2dc..f5456231ff4 100644 --- a/service/resourcegroups/api_client.go +++ b/service/resourcegroups/api_client.go @@ -100,30 +100,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -189,6 +165,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/resourcegroups/api_op_CreateGroup.go b/service/resourcegroups/api_op_CreateGroup.go index e56f29063b8..4be156b43a0 100644 --- a/service/resourcegroups/api_op_CreateGroup.go +++ b/service/resourcegroups/api_op_CreateGroup.go @@ -5,7 +5,6 @@ package resourcegroups import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/resourcegroups/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateGroup(ctx context.Context, params *CreateGroupInput, optF addawsRestjson1_serdeOpCreateGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroups/api_op_DeleteGroup.go b/service/resourcegroups/api_op_DeleteGroup.go index 16faa9ee08c..141cfc7a181 100644 --- a/service/resourcegroups/api_op_DeleteGroup.go +++ b/service/resourcegroups/api_op_DeleteGroup.go @@ -5,7 +5,6 @@ package resourcegroups import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/resourcegroups/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DeleteGroup(ctx context.Context, params *DeleteGroupInput, optF addawsRestjson1_serdeOpDeleteGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroups/api_op_GetGroup.go b/service/resourcegroups/api_op_GetGroup.go index 97ae0f218bc..fec4a4ecc3a 100644 --- a/service/resourcegroups/api_op_GetGroup.go +++ b/service/resourcegroups/api_op_GetGroup.go @@ -5,7 +5,6 @@ package resourcegroups import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/resourcegroups/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetGroup(ctx context.Context, params *GetGroupInput, optFns ... addawsRestjson1_serdeOpGetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroups/api_op_GetGroupConfiguration.go b/service/resourcegroups/api_op_GetGroupConfiguration.go index 4883948b7d1..a90500ee175 100644 --- a/service/resourcegroups/api_op_GetGroupConfiguration.go +++ b/service/resourcegroups/api_op_GetGroupConfiguration.go @@ -5,7 +5,6 @@ package resourcegroups import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/resourcegroups/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) GetGroupConfiguration(ctx context.Context, params *GetGroupConf addawsRestjson1_serdeOpGetGroupConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroups/api_op_GetGroupQuery.go b/service/resourcegroups/api_op_GetGroupQuery.go index f1805d1aea1..6bfb37f4c7e 100644 --- a/service/resourcegroups/api_op_GetGroupQuery.go +++ b/service/resourcegroups/api_op_GetGroupQuery.go @@ -5,7 +5,6 @@ package resourcegroups import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/resourcegroups/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetGroupQuery(ctx context.Context, params *GetGroupQueryInput, addawsRestjson1_serdeOpGetGroupQueryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroups/api_op_GetTags.go b/service/resourcegroups/api_op_GetTags.go index 31f6ef0aab7..50ebbb0a4be 100644 --- a/service/resourcegroups/api_op_GetTags.go +++ b/service/resourcegroups/api_op_GetTags.go @@ -5,7 +5,6 @@ package resourcegroups import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetTags(ctx context.Context, params *GetTagsInput, optFns ...fu addawsRestjson1_serdeOpGetTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroups/api_op_GroupResources.go b/service/resourcegroups/api_op_GroupResources.go index c4fb64d09b4..83b32f85799 100644 --- a/service/resourcegroups/api_op_GroupResources.go +++ b/service/resourcegroups/api_op_GroupResources.go @@ -5,7 +5,6 @@ package resourcegroups import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/resourcegroups/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GroupResources(ctx context.Context, params *GroupResourcesInput addawsRestjson1_serdeOpGroupResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroups/api_op_ListGroupResources.go b/service/resourcegroups/api_op_ListGroupResources.go index df93ceff8c9..c96d4038a2d 100644 --- a/service/resourcegroups/api_op_ListGroupResources.go +++ b/service/resourcegroups/api_op_ListGroupResources.go @@ -5,7 +5,6 @@ package resourcegroups import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/resourcegroups/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListGroupResources(ctx context.Context, params *ListGroupResour addawsRestjson1_serdeOpListGroupResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroups/api_op_ListGroups.go b/service/resourcegroups/api_op_ListGroups.go index a1e45308de4..38fbe12b377 100644 --- a/service/resourcegroups/api_op_ListGroups.go +++ b/service/resourcegroups/api_op_ListGroups.go @@ -5,7 +5,6 @@ package resourcegroups import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/resourcegroups/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListGroups(ctx context.Context, params *ListGroupsInput, optFns addawsRestjson1_serdeOpListGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroups/api_op_SearchResources.go b/service/resourcegroups/api_op_SearchResources.go index 4904061763b..c19cbaeb47d 100644 --- a/service/resourcegroups/api_op_SearchResources.go +++ b/service/resourcegroups/api_op_SearchResources.go @@ -5,7 +5,6 @@ package resourcegroups import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/resourcegroups/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) SearchResources(ctx context.Context, params *SearchResourcesInp addawsRestjson1_serdeOpSearchResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroups/api_op_Tag.go b/service/resourcegroups/api_op_Tag.go index 83ad1a0c9a6..add76b3f23b 100644 --- a/service/resourcegroups/api_op_Tag.go +++ b/service/resourcegroups/api_op_Tag.go @@ -5,7 +5,6 @@ package resourcegroups import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) Tag(ctx context.Context, params *TagInput, optFns ...func(*Opti addawsRestjson1_serdeOpTagMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroups/api_op_UngroupResources.go b/service/resourcegroups/api_op_UngroupResources.go index 2d8cbc67749..72863b68be5 100644 --- a/service/resourcegroups/api_op_UngroupResources.go +++ b/service/resourcegroups/api_op_UngroupResources.go @@ -5,7 +5,6 @@ package resourcegroups import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/resourcegroups/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UngroupResources(ctx context.Context, params *UngroupResourcesI addawsRestjson1_serdeOpUngroupResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroups/api_op_Untag.go b/service/resourcegroups/api_op_Untag.go index 225000d3b43..c55dd68bf41 100644 --- a/service/resourcegroups/api_op_Untag.go +++ b/service/resourcegroups/api_op_Untag.go @@ -5,7 +5,6 @@ package resourcegroups import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) Untag(ctx context.Context, params *UntagInput, optFns ...func(* addawsRestjson1_serdeOpUntagMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroups/api_op_UpdateGroup.go b/service/resourcegroups/api_op_UpdateGroup.go index 5405081783e..4b2637a006a 100644 --- a/service/resourcegroups/api_op_UpdateGroup.go +++ b/service/resourcegroups/api_op_UpdateGroup.go @@ -5,7 +5,6 @@ package resourcegroups import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/resourcegroups/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateGroup(ctx context.Context, params *UpdateGroupInput, optF addawsRestjson1_serdeOpUpdateGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroups/api_op_UpdateGroupQuery.go b/service/resourcegroups/api_op_UpdateGroupQuery.go index 65d9046d0b8..0f1fcfaf7b2 100644 --- a/service/resourcegroups/api_op_UpdateGroupQuery.go +++ b/service/resourcegroups/api_op_UpdateGroupQuery.go @@ -5,7 +5,6 @@ package resourcegroups import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/resourcegroups/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateGroupQuery(ctx context.Context, params *UpdateGroupQueryI addawsRestjson1_serdeOpUpdateGroupQueryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroups/endpoints.go b/service/resourcegroups/endpoints.go index c61e6a65890..33d74ccd5ce 100644 --- a/service/resourcegroups/endpoints.go +++ b/service/resourcegroups/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/resourcegroupstaggingapi/api_client.go b/service/resourcegroupstaggingapi/api_client.go index d9fd070d503..9e7a86030dd 100644 --- a/service/resourcegroupstaggingapi/api_client.go +++ b/service/resourcegroupstaggingapi/api_client.go @@ -149,30 +149,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -238,6 +214,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/resourcegroupstaggingapi/api_op_DescribeReportCreation.go b/service/resourcegroupstaggingapi/api_op_DescribeReportCreation.go index b0a35c2cf23..21c21dac718 100644 --- a/service/resourcegroupstaggingapi/api_op_DescribeReportCreation.go +++ b/service/resourcegroupstaggingapi/api_op_DescribeReportCreation.go @@ -5,7 +5,6 @@ package resourcegroupstaggingapi import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DescribeReportCreation(ctx context.Context, params *DescribeRep addawsAwsjson11_serdeOpDescribeReportCreationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroupstaggingapi/api_op_GetComplianceSummary.go b/service/resourcegroupstaggingapi/api_op_GetComplianceSummary.go index 393416901b4..8884070b66b 100644 --- a/service/resourcegroupstaggingapi/api_op_GetComplianceSummary.go +++ b/service/resourcegroupstaggingapi/api_op_GetComplianceSummary.go @@ -5,7 +5,6 @@ package resourcegroupstaggingapi import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetComplianceSummary(ctx context.Context, params *GetCompliance addawsAwsjson11_serdeOpGetComplianceSummaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroupstaggingapi/api_op_GetResources.go b/service/resourcegroupstaggingapi/api_op_GetResources.go index e1b47b6686c..f2a0a77bc24 100644 --- a/service/resourcegroupstaggingapi/api_op_GetResources.go +++ b/service/resourcegroupstaggingapi/api_op_GetResources.go @@ -5,7 +5,6 @@ package resourcegroupstaggingapi import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) GetResources(ctx context.Context, params *GetResourcesInput, op addawsAwsjson11_serdeOpGetResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroupstaggingapi/api_op_GetTagKeys.go b/service/resourcegroupstaggingapi/api_op_GetTagKeys.go index c38dddba52b..48d779e234e 100644 --- a/service/resourcegroupstaggingapi/api_op_GetTagKeys.go +++ b/service/resourcegroupstaggingapi/api_op_GetTagKeys.go @@ -5,7 +5,6 @@ package resourcegroupstaggingapi import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetTagKeys(ctx context.Context, params *GetTagKeysInput, optFns addawsAwsjson11_serdeOpGetTagKeysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroupstaggingapi/api_op_GetTagValues.go b/service/resourcegroupstaggingapi/api_op_GetTagValues.go index 0f78e6d45aa..1df5f959207 100644 --- a/service/resourcegroupstaggingapi/api_op_GetTagValues.go +++ b/service/resourcegroupstaggingapi/api_op_GetTagValues.go @@ -5,7 +5,6 @@ package resourcegroupstaggingapi import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetTagValues(ctx context.Context, params *GetTagValuesInput, op addawsAwsjson11_serdeOpGetTagValuesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroupstaggingapi/api_op_StartReportCreation.go b/service/resourcegroupstaggingapi/api_op_StartReportCreation.go index 53e2bbb1a50..e6bf937704c 100644 --- a/service/resourcegroupstaggingapi/api_op_StartReportCreation.go +++ b/service/resourcegroupstaggingapi/api_op_StartReportCreation.go @@ -5,7 +5,6 @@ package resourcegroupstaggingapi import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) StartReportCreation(ctx context.Context, params *StartReportCre addawsAwsjson11_serdeOpStartReportCreationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroupstaggingapi/api_op_TagResources.go b/service/resourcegroupstaggingapi/api_op_TagResources.go index d2af084f982..7de70aca460 100644 --- a/service/resourcegroupstaggingapi/api_op_TagResources.go +++ b/service/resourcegroupstaggingapi/api_op_TagResources.go @@ -5,7 +5,6 @@ package resourcegroupstaggingapi import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) TagResources(ctx context.Context, params *TagResourcesInput, op addawsAwsjson11_serdeOpTagResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroupstaggingapi/api_op_UntagResources.go b/service/resourcegroupstaggingapi/api_op_UntagResources.go index d288668036c..7c23a00cbb4 100644 --- a/service/resourcegroupstaggingapi/api_op_UntagResources.go +++ b/service/resourcegroupstaggingapi/api_op_UntagResources.go @@ -5,7 +5,6 @@ package resourcegroupstaggingapi import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) UntagResources(ctx context.Context, params *UntagResourcesInput addawsAwsjson11_serdeOpUntagResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/resourcegroupstaggingapi/endpoints.go b/service/resourcegroupstaggingapi/endpoints.go index cc9970af8cf..b5b354a4ac1 100644 --- a/service/resourcegroupstaggingapi/endpoints.go +++ b/service/resourcegroupstaggingapi/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/robomaker/api_client.go b/service/robomaker/api_client.go index a549ca13a62..126e6db54d4 100644 --- a/service/robomaker/api_client.go +++ b/service/robomaker/api_client.go @@ -85,34 +85,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -185,6 +157,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/robomaker/api_op_BatchDescribeSimulationJob.go b/service/robomaker/api_op_BatchDescribeSimulationJob.go index 5f29ce3ec8d..e7dfb7efc11 100644 --- a/service/robomaker/api_op_BatchDescribeSimulationJob.go +++ b/service/robomaker/api_op_BatchDescribeSimulationJob.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchDescribeSimulationJob(ctx context.Context, params *BatchDe addawsRestjson1_serdeOpBatchDescribeSimulationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_CancelDeploymentJob.go b/service/robomaker/api_op_CancelDeploymentJob.go index 5a81604f092..1f8f2ff6eeb 100644 --- a/service/robomaker/api_op_CancelDeploymentJob.go +++ b/service/robomaker/api_op_CancelDeploymentJob.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CancelDeploymentJob(ctx context.Context, params *CancelDeployme addawsRestjson1_serdeOpCancelDeploymentJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_CancelSimulationJob.go b/service/robomaker/api_op_CancelSimulationJob.go index a0c3e992dc1..330f60f2672 100644 --- a/service/robomaker/api_op_CancelSimulationJob.go +++ b/service/robomaker/api_op_CancelSimulationJob.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CancelSimulationJob(ctx context.Context, params *CancelSimulati addawsRestjson1_serdeOpCancelSimulationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_CancelSimulationJobBatch.go b/service/robomaker/api_op_CancelSimulationJobBatch.go index 001af04efb1..dc29a907654 100644 --- a/service/robomaker/api_op_CancelSimulationJobBatch.go +++ b/service/robomaker/api_op_CancelSimulationJobBatch.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CancelSimulationJobBatch(ctx context.Context, params *CancelSim addawsRestjson1_serdeOpCancelSimulationJobBatchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_CreateDeploymentJob.go b/service/robomaker/api_op_CreateDeploymentJob.go index 3cea0b4696f..9eb8864094d 100644 --- a/service/robomaker/api_op_CreateDeploymentJob.go +++ b/service/robomaker/api_op_CreateDeploymentJob.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateDeploymentJob(ctx context.Context, params *CreateDeployme addawsRestjson1_serdeOpCreateDeploymentJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_CreateFleet.go b/service/robomaker/api_op_CreateFleet.go index a7b0aaff914..8521fb9ec57 100644 --- a/service/robomaker/api_op_CreateFleet.go +++ b/service/robomaker/api_op_CreateFleet.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateFleet(ctx context.Context, params *CreateFleetInput, optF addawsRestjson1_serdeOpCreateFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_CreateRobot.go b/service/robomaker/api_op_CreateRobot.go index d9183bd74ac..1f2e5c76676 100644 --- a/service/robomaker/api_op_CreateRobot.go +++ b/service/robomaker/api_op_CreateRobot.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateRobot(ctx context.Context, params *CreateRobotInput, optF addawsRestjson1_serdeOpCreateRobotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_CreateRobotApplication.go b/service/robomaker/api_op_CreateRobotApplication.go index bd2377d0a17..b4b49f19ac7 100644 --- a/service/robomaker/api_op_CreateRobotApplication.go +++ b/service/robomaker/api_op_CreateRobotApplication.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateRobotApplication(ctx context.Context, params *CreateRobot addawsRestjson1_serdeOpCreateRobotApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_CreateRobotApplicationVersion.go b/service/robomaker/api_op_CreateRobotApplicationVersion.go index c093347161f..880f9939e5f 100644 --- a/service/robomaker/api_op_CreateRobotApplicationVersion.go +++ b/service/robomaker/api_op_CreateRobotApplicationVersion.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateRobotApplicationVersion(ctx context.Context, params *Crea addawsRestjson1_serdeOpCreateRobotApplicationVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_CreateSimulationApplication.go b/service/robomaker/api_op_CreateSimulationApplication.go index 625c2b01555..9970d372551 100644 --- a/service/robomaker/api_op_CreateSimulationApplication.go +++ b/service/robomaker/api_op_CreateSimulationApplication.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateSimulationApplication(ctx context.Context, params *Create addawsRestjson1_serdeOpCreateSimulationApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_CreateSimulationApplicationVersion.go b/service/robomaker/api_op_CreateSimulationApplicationVersion.go index c7b897280f6..0bf764d3421 100644 --- a/service/robomaker/api_op_CreateSimulationApplicationVersion.go +++ b/service/robomaker/api_op_CreateSimulationApplicationVersion.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateSimulationApplicationVersion(ctx context.Context, params addawsRestjson1_serdeOpCreateSimulationApplicationVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_CreateSimulationJob.go b/service/robomaker/api_op_CreateSimulationJob.go index 98a3f6e835a..93a64998f76 100644 --- a/service/robomaker/api_op_CreateSimulationJob.go +++ b/service/robomaker/api_op_CreateSimulationJob.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateSimulationJob(ctx context.Context, params *CreateSimulati addawsRestjson1_serdeOpCreateSimulationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_DeleteFleet.go b/service/robomaker/api_op_DeleteFleet.go index 46ca3f32319..92b612ac168 100644 --- a/service/robomaker/api_op_DeleteFleet.go +++ b/service/robomaker/api_op_DeleteFleet.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteFleet(ctx context.Context, params *DeleteFleetInput, optF addawsRestjson1_serdeOpDeleteFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_DeleteRobot.go b/service/robomaker/api_op_DeleteRobot.go index ee2bacb0056..ec83b7a0581 100644 --- a/service/robomaker/api_op_DeleteRobot.go +++ b/service/robomaker/api_op_DeleteRobot.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRobot(ctx context.Context, params *DeleteRobotInput, optF addawsRestjson1_serdeOpDeleteRobotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_DeleteRobotApplication.go b/service/robomaker/api_op_DeleteRobotApplication.go index e3337cfeecf..d42789cac76 100644 --- a/service/robomaker/api_op_DeleteRobotApplication.go +++ b/service/robomaker/api_op_DeleteRobotApplication.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRobotApplication(ctx context.Context, params *DeleteRobot addawsRestjson1_serdeOpDeleteRobotApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_DeleteSimulationApplication.go b/service/robomaker/api_op_DeleteSimulationApplication.go index a1eddf1b419..fc8c98de0dd 100644 --- a/service/robomaker/api_op_DeleteSimulationApplication.go +++ b/service/robomaker/api_op_DeleteSimulationApplication.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSimulationApplication(ctx context.Context, params *Delete addawsRestjson1_serdeOpDeleteSimulationApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_DeregisterRobot.go b/service/robomaker/api_op_DeregisterRobot.go index e443b43efc9..0964cfb13f3 100644 --- a/service/robomaker/api_op_DeregisterRobot.go +++ b/service/robomaker/api_op_DeregisterRobot.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeregisterRobot(ctx context.Context, params *DeregisterRobotInp addawsRestjson1_serdeOpDeregisterRobotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_DescribeDeploymentJob.go b/service/robomaker/api_op_DescribeDeploymentJob.go index f0cbe390951..cda50fa411b 100644 --- a/service/robomaker/api_op_DescribeDeploymentJob.go +++ b/service/robomaker/api_op_DescribeDeploymentJob.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDeploymentJob(ctx context.Context, params *DescribeDepl addawsRestjson1_serdeOpDescribeDeploymentJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_DescribeFleet.go b/service/robomaker/api_op_DescribeFleet.go index 5b484d577e3..5fc1a96320a 100644 --- a/service/robomaker/api_op_DescribeFleet.go +++ b/service/robomaker/api_op_DescribeFleet.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeFleet(ctx context.Context, params *DescribeFleetInput, addawsRestjson1_serdeOpDescribeFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_DescribeRobot.go b/service/robomaker/api_op_DescribeRobot.go index 724824bf088..482d5ecd681 100644 --- a/service/robomaker/api_op_DescribeRobot.go +++ b/service/robomaker/api_op_DescribeRobot.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeRobot(ctx context.Context, params *DescribeRobotInput, addawsRestjson1_serdeOpDescribeRobotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_DescribeRobotApplication.go b/service/robomaker/api_op_DescribeRobotApplication.go index 3bdb0716729..266039dd482 100644 --- a/service/robomaker/api_op_DescribeRobotApplication.go +++ b/service/robomaker/api_op_DescribeRobotApplication.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeRobotApplication(ctx context.Context, params *DescribeR addawsRestjson1_serdeOpDescribeRobotApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_DescribeSimulationApplication.go b/service/robomaker/api_op_DescribeSimulationApplication.go index dfa0a1af2be..7f0ebe2e08a 100644 --- a/service/robomaker/api_op_DescribeSimulationApplication.go +++ b/service/robomaker/api_op_DescribeSimulationApplication.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeSimulationApplication(ctx context.Context, params *Desc addawsRestjson1_serdeOpDescribeSimulationApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_DescribeSimulationJob.go b/service/robomaker/api_op_DescribeSimulationJob.go index 4230abf6463..486a83a15a2 100644 --- a/service/robomaker/api_op_DescribeSimulationJob.go +++ b/service/robomaker/api_op_DescribeSimulationJob.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeSimulationJob(ctx context.Context, params *DescribeSimu addawsRestjson1_serdeOpDescribeSimulationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_DescribeSimulationJobBatch.go b/service/robomaker/api_op_DescribeSimulationJobBatch.go index fa3500f0e49..ea5040236b4 100644 --- a/service/robomaker/api_op_DescribeSimulationJobBatch.go +++ b/service/robomaker/api_op_DescribeSimulationJobBatch.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeSimulationJobBatch(ctx context.Context, params *Describ addawsRestjson1_serdeOpDescribeSimulationJobBatchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_ListDeploymentJobs.go b/service/robomaker/api_op_ListDeploymentJobs.go index 0173d5ef29a..5e7953c888d 100644 --- a/service/robomaker/api_op_ListDeploymentJobs.go +++ b/service/robomaker/api_op_ListDeploymentJobs.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListDeploymentJobs(ctx context.Context, params *ListDeploymentJ addawsRestjson1_serdeOpListDeploymentJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_ListFleets.go b/service/robomaker/api_op_ListFleets.go index d45b9ba40ae..b0341001558 100644 --- a/service/robomaker/api_op_ListFleets.go +++ b/service/robomaker/api_op_ListFleets.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListFleets(ctx context.Context, params *ListFleetsInput, optFns addawsRestjson1_serdeOpListFleetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_ListRobotApplications.go b/service/robomaker/api_op_ListRobotApplications.go index d54625dd0f9..77217a4bf26 100644 --- a/service/robomaker/api_op_ListRobotApplications.go +++ b/service/robomaker/api_op_ListRobotApplications.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListRobotApplications(ctx context.Context, params *ListRobotApp addawsRestjson1_serdeOpListRobotApplicationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_ListRobots.go b/service/robomaker/api_op_ListRobots.go index fd6371bfd88..84d84d0edfe 100644 --- a/service/robomaker/api_op_ListRobots.go +++ b/service/robomaker/api_op_ListRobots.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListRobots(ctx context.Context, params *ListRobotsInput, optFns addawsRestjson1_serdeOpListRobotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_ListSimulationApplications.go b/service/robomaker/api_op_ListSimulationApplications.go index ce7dd4db521..4049e3b4143 100644 --- a/service/robomaker/api_op_ListSimulationApplications.go +++ b/service/robomaker/api_op_ListSimulationApplications.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListSimulationApplications(ctx context.Context, params *ListSim addawsRestjson1_serdeOpListSimulationApplicationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_ListSimulationJobBatches.go b/service/robomaker/api_op_ListSimulationJobBatches.go index d3d739b8c21..55942016e12 100644 --- a/service/robomaker/api_op_ListSimulationJobBatches.go +++ b/service/robomaker/api_op_ListSimulationJobBatches.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListSimulationJobBatches(ctx context.Context, params *ListSimul addawsRestjson1_serdeOpListSimulationJobBatchesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_ListSimulationJobs.go b/service/robomaker/api_op_ListSimulationJobs.go index 8813bf6aebb..7ffe9345cb2 100644 --- a/service/robomaker/api_op_ListSimulationJobs.go +++ b/service/robomaker/api_op_ListSimulationJobs.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListSimulationJobs(ctx context.Context, params *ListSimulationJ addawsRestjson1_serdeOpListSimulationJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_ListTagsForResource.go b/service/robomaker/api_op_ListTagsForResource.go index c30a2ddb0e2..e60b79a02bb 100644 --- a/service/robomaker/api_op_ListTagsForResource.go +++ b/service/robomaker/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_RegisterRobot.go b/service/robomaker/api_op_RegisterRobot.go index 1756c711993..64127666c74 100644 --- a/service/robomaker/api_op_RegisterRobot.go +++ b/service/robomaker/api_op_RegisterRobot.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RegisterRobot(ctx context.Context, params *RegisterRobotInput, addawsRestjson1_serdeOpRegisterRobotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_RestartSimulationJob.go b/service/robomaker/api_op_RestartSimulationJob.go index 190bae5ccac..5b686e1616f 100644 --- a/service/robomaker/api_op_RestartSimulationJob.go +++ b/service/robomaker/api_op_RestartSimulationJob.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RestartSimulationJob(ctx context.Context, params *RestartSimula addawsRestjson1_serdeOpRestartSimulationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_StartSimulationJobBatch.go b/service/robomaker/api_op_StartSimulationJobBatch.go index bb1305e901e..42816849deb 100644 --- a/service/robomaker/api_op_StartSimulationJobBatch.go +++ b/service/robomaker/api_op_StartSimulationJobBatch.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) StartSimulationJobBatch(ctx context.Context, params *StartSimul addawsRestjson1_serdeOpStartSimulationJobBatchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_SyncDeploymentJob.go b/service/robomaker/api_op_SyncDeploymentJob.go index 01ed0700b24..17ad2d98097 100644 --- a/service/robomaker/api_op_SyncDeploymentJob.go +++ b/service/robomaker/api_op_SyncDeploymentJob.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) SyncDeploymentJob(ctx context.Context, params *SyncDeploymentJo addawsRestjson1_serdeOpSyncDeploymentJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_TagResource.go b/service/robomaker/api_op_TagResource.go index d4b37896554..328ab12d351 100644 --- a/service/robomaker/api_op_TagResource.go +++ b/service/robomaker/api_op_TagResource.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_UntagResource.go b/service/robomaker/api_op_UntagResource.go index 0d4d8f8945d..2d809d18dc7 100644 --- a/service/robomaker/api_op_UntagResource.go +++ b/service/robomaker/api_op_UntagResource.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_UpdateRobotApplication.go b/service/robomaker/api_op_UpdateRobotApplication.go index dda9d515088..a0e5bd4d937 100644 --- a/service/robomaker/api_op_UpdateRobotApplication.go +++ b/service/robomaker/api_op_UpdateRobotApplication.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateRobotApplication(ctx context.Context, params *UpdateRobot addawsRestjson1_serdeOpUpdateRobotApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/api_op_UpdateSimulationApplication.go b/service/robomaker/api_op_UpdateSimulationApplication.go index 896713ba42d..376f87381db 100644 --- a/service/robomaker/api_op_UpdateSimulationApplication.go +++ b/service/robomaker/api_op_UpdateSimulationApplication.go @@ -5,7 +5,6 @@ package robomaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/robomaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateSimulationApplication(ctx context.Context, params *Update addawsRestjson1_serdeOpUpdateSimulationApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/robomaker/endpoints.go b/service/robomaker/endpoints.go index f9867fa45d3..01c64195eae 100644 --- a/service/robomaker/endpoints.go +++ b/service/robomaker/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/route53/api_client.go b/service/route53/api_client.go index fde430405c2..5d810954cc0 100644 --- a/service/route53/api_client.go +++ b/service/route53/api_client.go @@ -80,30 +80,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -169,6 +145,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/route53/api_op_AssociateVPCWithHostedZone.go b/service/route53/api_op_AssociateVPCWithHostedZone.go index a0991e34a88..b931db95e51 100644 --- a/service/route53/api_op_AssociateVPCWithHostedZone.go +++ b/service/route53/api_op_AssociateVPCWithHostedZone.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) AssociateVPCWithHostedZone(ctx context.Context, params *Associa addawsRestxml_serdeOpAssociateVPCWithHostedZoneMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_ChangeResourceRecordSets.go b/service/route53/api_op_ChangeResourceRecordSets.go index 4256d291683..44c1592311a 100644 --- a/service/route53/api_op_ChangeResourceRecordSets.go +++ b/service/route53/api_op_ChangeResourceRecordSets.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" route53cust "github.com/aws/aws-sdk-go-v2/service/route53/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/route53/types" @@ -84,9 +83,9 @@ func (c *Client) ChangeResourceRecordSets(ctx context.Context, params *ChangeRes addawsRestxml_serdeOpChangeResourceRecordSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_ChangeTagsForResource.go b/service/route53/api_op_ChangeTagsForResource.go index 38b40ea2356..283487849d0 100644 --- a/service/route53/api_op_ChangeTagsForResource.go +++ b/service/route53/api_op_ChangeTagsForResource.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ChangeTagsForResource(ctx context.Context, params *ChangeTagsFo addawsRestxml_serdeOpChangeTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_CreateHealthCheck.go b/service/route53/api_op_CreateHealthCheck.go index a33c6a249e6..0ffaedff0e7 100644 --- a/service/route53/api_op_CreateHealthCheck.go +++ b/service/route53/api_op_CreateHealthCheck.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) CreateHealthCheck(ctx context.Context, params *CreateHealthChec addawsRestxml_serdeOpCreateHealthCheckMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_CreateHostedZone.go b/service/route53/api_op_CreateHostedZone.go index ae1510f6aea..ea56c3f30b6 100644 --- a/service/route53/api_op_CreateHostedZone.go +++ b/service/route53/api_op_CreateHostedZone.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -58,9 +57,9 @@ func (c *Client) CreateHostedZone(ctx context.Context, params *CreateHostedZoneI addawsRestxml_serdeOpCreateHostedZoneMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_CreateQueryLoggingConfig.go b/service/route53/api_op_CreateQueryLoggingConfig.go index db1aa7b7970..6243981dd8d 100644 --- a/service/route53/api_op_CreateQueryLoggingConfig.go +++ b/service/route53/api_op_CreateQueryLoggingConfig.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -101,9 +100,9 @@ func (c *Client) CreateQueryLoggingConfig(ctx context.Context, params *CreateQue addawsRestxml_serdeOpCreateQueryLoggingConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_CreateReusableDelegationSet.go b/service/route53/api_op_CreateReusableDelegationSet.go index f0bf9e5d85c..d860c383053 100644 --- a/service/route53/api_op_CreateReusableDelegationSet.go +++ b/service/route53/api_op_CreateReusableDelegationSet.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -52,9 +51,9 @@ func (c *Client) CreateReusableDelegationSet(ctx context.Context, params *Create addawsRestxml_serdeOpCreateReusableDelegationSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_CreateTrafficPolicy.go b/service/route53/api_op_CreateTrafficPolicy.go index 936c8605254..9608c52c100 100644 --- a/service/route53/api_op_CreateTrafficPolicy.go +++ b/service/route53/api_op_CreateTrafficPolicy.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateTrafficPolicy(ctx context.Context, params *CreateTrafficP addawsRestxml_serdeOpCreateTrafficPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_CreateTrafficPolicyInstance.go b/service/route53/api_op_CreateTrafficPolicyInstance.go index 731da1ae36b..52dd722280b 100644 --- a/service/route53/api_op_CreateTrafficPolicyInstance.go +++ b/service/route53/api_op_CreateTrafficPolicyInstance.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateTrafficPolicyInstance(ctx context.Context, params *Create addawsRestxml_serdeOpCreateTrafficPolicyInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_CreateTrafficPolicyVersion.go b/service/route53/api_op_CreateTrafficPolicyVersion.go index 2e4edf2fd38..3121446faf8 100644 --- a/service/route53/api_op_CreateTrafficPolicyVersion.go +++ b/service/route53/api_op_CreateTrafficPolicyVersion.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateTrafficPolicyVersion(ctx context.Context, params *CreateT addawsRestxml_serdeOpCreateTrafficPolicyVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_CreateVPCAssociationAuthorization.go b/service/route53/api_op_CreateVPCAssociationAuthorization.go index 355f27f307e..0f80f27a353 100644 --- a/service/route53/api_op_CreateVPCAssociationAuthorization.go +++ b/service/route53/api_op_CreateVPCAssociationAuthorization.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateVPCAssociationAuthorization(ctx context.Context, params * addawsRestxml_serdeOpCreateVPCAssociationAuthorizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_DeleteHealthCheck.go b/service/route53/api_op_DeleteHealthCheck.go index bc7b898d7e7..334b64d6f0b 100644 --- a/service/route53/api_op_DeleteHealthCheck.go +++ b/service/route53/api_op_DeleteHealthCheck.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) DeleteHealthCheck(ctx context.Context, params *DeleteHealthChec addawsRestxml_serdeOpDeleteHealthCheckMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_DeleteHostedZone.go b/service/route53/api_op_DeleteHostedZone.go index e78fd48b325..3556e6e0146 100644 --- a/service/route53/api_op_DeleteHostedZone.go +++ b/service/route53/api_op_DeleteHostedZone.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -60,9 +59,9 @@ func (c *Client) DeleteHostedZone(ctx context.Context, params *DeleteHostedZoneI addawsRestxml_serdeOpDeleteHostedZoneMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_DeleteQueryLoggingConfig.go b/service/route53/api_op_DeleteQueryLoggingConfig.go index 2b5138bd7fb..854cd7b72b1 100644 --- a/service/route53/api_op_DeleteQueryLoggingConfig.go +++ b/service/route53/api_op_DeleteQueryLoggingConfig.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteQueryLoggingConfig(ctx context.Context, params *DeleteQue addawsRestxml_serdeOpDeleteQueryLoggingConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_DeleteReusableDelegationSet.go b/service/route53/api_op_DeleteReusableDelegationSet.go index be677c35bc6..eb4535a8f7a 100644 --- a/service/route53/api_op_DeleteReusableDelegationSet.go +++ b/service/route53/api_op_DeleteReusableDelegationSet.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeleteReusableDelegationSet(ctx context.Context, params *Delete addawsRestxml_serdeOpDeleteReusableDelegationSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_DeleteTrafficPolicy.go b/service/route53/api_op_DeleteTrafficPolicy.go index c9a8266eb96..d442b34c958 100644 --- a/service/route53/api_op_DeleteTrafficPolicy.go +++ b/service/route53/api_op_DeleteTrafficPolicy.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteTrafficPolicy(ctx context.Context, params *DeleteTrafficP addawsRestxml_serdeOpDeleteTrafficPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_DeleteTrafficPolicyInstance.go b/service/route53/api_op_DeleteTrafficPolicyInstance.go index 9af2d8ba186..0f35ae94a20 100644 --- a/service/route53/api_op_DeleteTrafficPolicyInstance.go +++ b/service/route53/api_op_DeleteTrafficPolicyInstance.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteTrafficPolicyInstance(ctx context.Context, params *Delete addawsRestxml_serdeOpDeleteTrafficPolicyInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_DeleteVPCAssociationAuthorization.go b/service/route53/api_op_DeleteVPCAssociationAuthorization.go index 2717834424b..b19cac3fdaa 100644 --- a/service/route53/api_op_DeleteVPCAssociationAuthorization.go +++ b/service/route53/api_op_DeleteVPCAssociationAuthorization.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DeleteVPCAssociationAuthorization(ctx context.Context, params * addawsRestxml_serdeOpDeleteVPCAssociationAuthorizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_DisassociateVPCFromHostedZone.go b/service/route53/api_op_DisassociateVPCFromHostedZone.go index 3db3f85ee03..7ff393cb7bb 100644 --- a/service/route53/api_op_DisassociateVPCFromHostedZone.go +++ b/service/route53/api_op_DisassociateVPCFromHostedZone.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) DisassociateVPCFromHostedZone(ctx context.Context, params *Disa addawsRestxml_serdeOpDisassociateVPCFromHostedZoneMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_GetAccountLimit.go b/service/route53/api_op_GetAccountLimit.go index 9923c934f0b..46b765dc57d 100644 --- a/service/route53/api_op_GetAccountLimit.go +++ b/service/route53/api_op_GetAccountLimit.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) GetAccountLimit(ctx context.Context, params *GetAccountLimitInp addawsRestxml_serdeOpGetAccountLimitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_GetChange.go b/service/route53/api_op_GetChange.go index 69b7c503921..19e4160dc80 100644 --- a/service/route53/api_op_GetChange.go +++ b/service/route53/api_op_GetChange.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) GetChange(ctx context.Context, params *GetChangeInput, optFns . addawsRestxml_serdeOpGetChangeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_GetCheckerIpRanges.go b/service/route53/api_op_GetCheckerIpRanges.go index cb2d464498e..e05ba4cb9da 100644 --- a/service/route53/api_op_GetCheckerIpRanges.go +++ b/service/route53/api_op_GetCheckerIpRanges.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) GetCheckerIpRanges(ctx context.Context, params *GetCheckerIpRan addawsRestxml_serdeOpGetCheckerIpRangesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_GetGeoLocation.go b/service/route53/api_op_GetGeoLocation.go index 3d94cd9607a..a9370fc4139 100644 --- a/service/route53/api_op_GetGeoLocation.go +++ b/service/route53/api_op_GetGeoLocation.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) GetGeoLocation(ctx context.Context, params *GetGeoLocationInput addawsRestxml_serdeOpGetGeoLocationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_GetHealthCheck.go b/service/route53/api_op_GetHealthCheck.go index fe6fbdc9965..521e1216946 100644 --- a/service/route53/api_op_GetHealthCheck.go +++ b/service/route53/api_op_GetHealthCheck.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetHealthCheck(ctx context.Context, params *GetHealthCheckInput addawsRestxml_serdeOpGetHealthCheckMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_GetHealthCheckCount.go b/service/route53/api_op_GetHealthCheckCount.go index 20f6e082af7..10233b00aa8 100644 --- a/service/route53/api_op_GetHealthCheckCount.go +++ b/service/route53/api_op_GetHealthCheckCount.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetHealthCheckCount(ctx context.Context, params *GetHealthCheck addawsRestxml_serdeOpGetHealthCheckCountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_GetHealthCheckLastFailureReason.go b/service/route53/api_op_GetHealthCheckLastFailureReason.go index 70f2d0f4a49..290c9aba0a5 100644 --- a/service/route53/api_op_GetHealthCheckLastFailureReason.go +++ b/service/route53/api_op_GetHealthCheckLastFailureReason.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetHealthCheckLastFailureReason(ctx context.Context, params *Ge addawsRestxml_serdeOpGetHealthCheckLastFailureReasonMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_GetHealthCheckStatus.go b/service/route53/api_op_GetHealthCheckStatus.go index 17ea3032f2c..13de23222e7 100644 --- a/service/route53/api_op_GetHealthCheckStatus.go +++ b/service/route53/api_op_GetHealthCheckStatus.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetHealthCheckStatus(ctx context.Context, params *GetHealthChec addawsRestxml_serdeOpGetHealthCheckStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_GetHostedZone.go b/service/route53/api_op_GetHostedZone.go index 520721be007..de513981670 100644 --- a/service/route53/api_op_GetHostedZone.go +++ b/service/route53/api_op_GetHostedZone.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetHostedZone(ctx context.Context, params *GetHostedZoneInput, addawsRestxml_serdeOpGetHostedZoneMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_GetHostedZoneCount.go b/service/route53/api_op_GetHostedZoneCount.go index 4e60f37b39c..acfcdf0a399 100644 --- a/service/route53/api_op_GetHostedZoneCount.go +++ b/service/route53/api_op_GetHostedZoneCount.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetHostedZoneCount(ctx context.Context, params *GetHostedZoneCo addawsRestxml_serdeOpGetHostedZoneCountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_GetHostedZoneLimit.go b/service/route53/api_op_GetHostedZoneLimit.go index b0336aa6ecf..c8f799810d4 100644 --- a/service/route53/api_op_GetHostedZoneLimit.go +++ b/service/route53/api_op_GetHostedZoneLimit.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetHostedZoneLimit(ctx context.Context, params *GetHostedZoneLi addawsRestxml_serdeOpGetHostedZoneLimitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_GetQueryLoggingConfig.go b/service/route53/api_op_GetQueryLoggingConfig.go index 2f01d952038..6a0a1576f3a 100644 --- a/service/route53/api_op_GetQueryLoggingConfig.go +++ b/service/route53/api_op_GetQueryLoggingConfig.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetQueryLoggingConfig(ctx context.Context, params *GetQueryLogg addawsRestxml_serdeOpGetQueryLoggingConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_GetReusableDelegationSet.go b/service/route53/api_op_GetReusableDelegationSet.go index 18b035c66af..409a2f0e071 100644 --- a/service/route53/api_op_GetReusableDelegationSet.go +++ b/service/route53/api_op_GetReusableDelegationSet.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetReusableDelegationSet(ctx context.Context, params *GetReusab addawsRestxml_serdeOpGetReusableDelegationSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_GetReusableDelegationSetLimit.go b/service/route53/api_op_GetReusableDelegationSetLimit.go index 3024596fd21..11947881462 100644 --- a/service/route53/api_op_GetReusableDelegationSetLimit.go +++ b/service/route53/api_op_GetReusableDelegationSetLimit.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetReusableDelegationSetLimit(ctx context.Context, params *GetR addawsRestxml_serdeOpGetReusableDelegationSetLimitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_GetTrafficPolicy.go b/service/route53/api_op_GetTrafficPolicy.go index f6d2279c5a0..71981306496 100644 --- a/service/route53/api_op_GetTrafficPolicy.go +++ b/service/route53/api_op_GetTrafficPolicy.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetTrafficPolicy(ctx context.Context, params *GetTrafficPolicyI addawsRestxml_serdeOpGetTrafficPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_GetTrafficPolicyInstance.go b/service/route53/api_op_GetTrafficPolicyInstance.go index 5e1897c8c44..17cd44beb98 100644 --- a/service/route53/api_op_GetTrafficPolicyInstance.go +++ b/service/route53/api_op_GetTrafficPolicyInstance.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetTrafficPolicyInstance(ctx context.Context, params *GetTraffi addawsRestxml_serdeOpGetTrafficPolicyInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_GetTrafficPolicyInstanceCount.go b/service/route53/api_op_GetTrafficPolicyInstanceCount.go index 67018b3d0fb..ea7c72769f3 100644 --- a/service/route53/api_op_GetTrafficPolicyInstanceCount.go +++ b/service/route53/api_op_GetTrafficPolicyInstanceCount.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetTrafficPolicyInstanceCount(ctx context.Context, params *GetT addawsRestxml_serdeOpGetTrafficPolicyInstanceCountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_ListGeoLocations.go b/service/route53/api_op_ListGeoLocations.go index 40123a6bd71..302cef08925 100644 --- a/service/route53/api_op_ListGeoLocations.go +++ b/service/route53/api_op_ListGeoLocations.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListGeoLocations(ctx context.Context, params *ListGeoLocationsI addawsRestxml_serdeOpListGeoLocationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_ListHealthChecks.go b/service/route53/api_op_ListHealthChecks.go index d9d552c8a69..66a4fb2930d 100644 --- a/service/route53/api_op_ListHealthChecks.go +++ b/service/route53/api_op_ListHealthChecks.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListHealthChecks(ctx context.Context, params *ListHealthChecksI addawsRestxml_serdeOpListHealthChecksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_ListHostedZones.go b/service/route53/api_op_ListHostedZones.go index 1766125f31b..a28cc248b38 100644 --- a/service/route53/api_op_ListHostedZones.go +++ b/service/route53/api_op_ListHostedZones.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListHostedZones(ctx context.Context, params *ListHostedZonesInp addawsRestxml_serdeOpListHostedZonesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_ListHostedZonesByName.go b/service/route53/api_op_ListHostedZonesByName.go index e651defb120..ee46ac0f5f6 100644 --- a/service/route53/api_op_ListHostedZonesByName.go +++ b/service/route53/api_op_ListHostedZonesByName.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -60,9 +59,9 @@ func (c *Client) ListHostedZonesByName(ctx context.Context, params *ListHostedZo addawsRestxml_serdeOpListHostedZonesByNameMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_ListHostedZonesByVPC.go b/service/route53/api_op_ListHostedZonesByVPC.go index 52217bb185e..34f497e09dd 100644 --- a/service/route53/api_op_ListHostedZonesByVPC.go +++ b/service/route53/api_op_ListHostedZonesByVPC.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) ListHostedZonesByVPC(ctx context.Context, params *ListHostedZon addawsRestxml_serdeOpListHostedZonesByVPCMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_ListQueryLoggingConfigs.go b/service/route53/api_op_ListQueryLoggingConfigs.go index 4d11c77956c..b0bc6648933 100644 --- a/service/route53/api_op_ListQueryLoggingConfigs.go +++ b/service/route53/api_op_ListQueryLoggingConfigs.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListQueryLoggingConfigs(ctx context.Context, params *ListQueryL addawsRestxml_serdeOpListQueryLoggingConfigsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_ListResourceRecordSets.go b/service/route53/api_op_ListResourceRecordSets.go index 8a1ed0f2457..3dc84ca414f 100644 --- a/service/route53/api_op_ListResourceRecordSets.go +++ b/service/route53/api_op_ListResourceRecordSets.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -60,9 +59,9 @@ func (c *Client) ListResourceRecordSets(ctx context.Context, params *ListResourc addawsRestxml_serdeOpListResourceRecordSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_ListReusableDelegationSets.go b/service/route53/api_op_ListReusableDelegationSets.go index 091a750a96c..c49f480b66e 100644 --- a/service/route53/api_op_ListReusableDelegationSets.go +++ b/service/route53/api_op_ListReusableDelegationSets.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListReusableDelegationSets(ctx context.Context, params *ListReu addawsRestxml_serdeOpListReusableDelegationSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_ListTagsForResource.go b/service/route53/api_op_ListTagsForResource.go index 4bc1744de5f..458a6f27a85 100644 --- a/service/route53/api_op_ListTagsForResource.go +++ b/service/route53/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestxml_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_ListTagsForResources.go b/service/route53/api_op_ListTagsForResources.go index 5fa57137c2a..0c17779f3f7 100644 --- a/service/route53/api_op_ListTagsForResources.go +++ b/service/route53/api_op_ListTagsForResources.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListTagsForResources(ctx context.Context, params *ListTagsForRe addawsRestxml_serdeOpListTagsForResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_ListTrafficPolicies.go b/service/route53/api_op_ListTrafficPolicies.go index 4ab389965b8..bf3b03dfc78 100644 --- a/service/route53/api_op_ListTrafficPolicies.go +++ b/service/route53/api_op_ListTrafficPolicies.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListTrafficPolicies(ctx context.Context, params *ListTrafficPol addawsRestxml_serdeOpListTrafficPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_ListTrafficPolicyInstances.go b/service/route53/api_op_ListTrafficPolicyInstances.go index 131ace6d1fa..492879fb512 100644 --- a/service/route53/api_op_ListTrafficPolicyInstances.go +++ b/service/route53/api_op_ListTrafficPolicyInstances.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListTrafficPolicyInstances(ctx context.Context, params *ListTra addawsRestxml_serdeOpListTrafficPolicyInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_ListTrafficPolicyInstancesByHostedZone.go b/service/route53/api_op_ListTrafficPolicyInstancesByHostedZone.go index 4e2e2f6e4c4..363342baff3 100644 --- a/service/route53/api_op_ListTrafficPolicyInstancesByHostedZone.go +++ b/service/route53/api_op_ListTrafficPolicyInstancesByHostedZone.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListTrafficPolicyInstancesByHostedZone(ctx context.Context, par addawsRestxml_serdeOpListTrafficPolicyInstancesByHostedZoneMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_ListTrafficPolicyInstancesByPolicy.go b/service/route53/api_op_ListTrafficPolicyInstancesByPolicy.go index 50a3692e273..aa60d4d4986 100644 --- a/service/route53/api_op_ListTrafficPolicyInstancesByPolicy.go +++ b/service/route53/api_op_ListTrafficPolicyInstancesByPolicy.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListTrafficPolicyInstancesByPolicy(ctx context.Context, params addawsRestxml_serdeOpListTrafficPolicyInstancesByPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_ListTrafficPolicyVersions.go b/service/route53/api_op_ListTrafficPolicyVersions.go index f888f437e78..27ecbe45a8d 100644 --- a/service/route53/api_op_ListTrafficPolicyVersions.go +++ b/service/route53/api_op_ListTrafficPolicyVersions.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTrafficPolicyVersions(ctx context.Context, params *ListTraf addawsRestxml_serdeOpListTrafficPolicyVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_ListVPCAssociationAuthorizations.go b/service/route53/api_op_ListVPCAssociationAuthorizations.go index df1ea2804e2..9eecb188e99 100644 --- a/service/route53/api_op_ListVPCAssociationAuthorizations.go +++ b/service/route53/api_op_ListVPCAssociationAuthorizations.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListVPCAssociationAuthorizations(ctx context.Context, params *L addawsRestxml_serdeOpListVPCAssociationAuthorizationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_TestDNSAnswer.go b/service/route53/api_op_TestDNSAnswer.go index 02e621c95d8..82718937123 100644 --- a/service/route53/api_op_TestDNSAnswer.go +++ b/service/route53/api_op_TestDNSAnswer.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) TestDNSAnswer(ctx context.Context, params *TestDNSAnswerInput, addawsRestxml_serdeOpTestDNSAnswerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_UpdateHealthCheck.go b/service/route53/api_op_UpdateHealthCheck.go index c9e806cbb38..da838de55c5 100644 --- a/service/route53/api_op_UpdateHealthCheck.go +++ b/service/route53/api_op_UpdateHealthCheck.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateHealthCheck(ctx context.Context, params *UpdateHealthChec addawsRestxml_serdeOpUpdateHealthCheckMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_UpdateHostedZoneComment.go b/service/route53/api_op_UpdateHostedZoneComment.go index 111d1e505ec..0737b9e7f4c 100644 --- a/service/route53/api_op_UpdateHostedZoneComment.go +++ b/service/route53/api_op_UpdateHostedZoneComment.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateHostedZoneComment(ctx context.Context, params *UpdateHost addawsRestxml_serdeOpUpdateHostedZoneCommentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_UpdateTrafficPolicyComment.go b/service/route53/api_op_UpdateTrafficPolicyComment.go index 5c69303db4b..18847e41e40 100644 --- a/service/route53/api_op_UpdateTrafficPolicyComment.go +++ b/service/route53/api_op_UpdateTrafficPolicyComment.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateTrafficPolicyComment(ctx context.Context, params *UpdateT addawsRestxml_serdeOpUpdateTrafficPolicyCommentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/api_op_UpdateTrafficPolicyInstance.go b/service/route53/api_op_UpdateTrafficPolicyInstance.go index 3a992ec6057..8955c356b40 100644 --- a/service/route53/api_op_UpdateTrafficPolicyInstance.go +++ b/service/route53/api_op_UpdateTrafficPolicyInstance.go @@ -5,7 +5,6 @@ package route53 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) UpdateTrafficPolicyInstance(ctx context.Context, params *Update addawsRestxml_serdeOpUpdateTrafficPolicyInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53/endpoints.go b/service/route53/endpoints.go index 9459a24c501..af0dae31bba 100644 --- a/service/route53/endpoints.go +++ b/service/route53/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/route53domains/api_client.go b/service/route53domains/api_client.go index 6466650ef45..51a51acc9e9 100644 --- a/service/route53domains/api_client.go +++ b/service/route53domains/api_client.go @@ -78,30 +78,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -167,6 +143,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/route53domains/api_op_AcceptDomainTransferFromAnotherAwsAccount.go b/service/route53domains/api_op_AcceptDomainTransferFromAnotherAwsAccount.go index 85f1a334942..528fb03ebd6 100644 --- a/service/route53domains/api_op_AcceptDomainTransferFromAnotherAwsAccount.go +++ b/service/route53domains/api_op_AcceptDomainTransferFromAnotherAwsAccount.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) AcceptDomainTransferFromAnotherAwsAccount(ctx context.Context, addawsAwsjson11_serdeOpAcceptDomainTransferFromAnotherAwsAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_CancelDomainTransferToAnotherAwsAccount.go b/service/route53domains/api_op_CancelDomainTransferToAnotherAwsAccount.go index 73ad0f4334b..cc255c4533c 100644 --- a/service/route53domains/api_op_CancelDomainTransferToAnotherAwsAccount.go +++ b/service/route53domains/api_op_CancelDomainTransferToAnotherAwsAccount.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -36,9 +35,9 @@ func (c *Client) CancelDomainTransferToAnotherAwsAccount(ctx context.Context, pa addawsAwsjson11_serdeOpCancelDomainTransferToAnotherAwsAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_CheckDomainAvailability.go b/service/route53domains/api_op_CheckDomainAvailability.go index d925937b243..45c18f8a998 100644 --- a/service/route53domains/api_op_CheckDomainAvailability.go +++ b/service/route53domains/api_op_CheckDomainAvailability.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53domains/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CheckDomainAvailability(ctx context.Context, params *CheckDomai addawsAwsjson11_serdeOpCheckDomainAvailabilityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_CheckDomainTransferability.go b/service/route53domains/api_op_CheckDomainTransferability.go index ffba3ba796c..69544904ac7 100644 --- a/service/route53domains/api_op_CheckDomainTransferability.go +++ b/service/route53domains/api_op_CheckDomainTransferability.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53domains/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CheckDomainTransferability(ctx context.Context, params *CheckDo addawsAwsjson11_serdeOpCheckDomainTransferabilityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_DeleteTagsForDomain.go b/service/route53domains/api_op_DeleteTagsForDomain.go index 0ecad960313..7302e5f6886 100644 --- a/service/route53domains/api_op_DeleteTagsForDomain.go +++ b/service/route53domains/api_op_DeleteTagsForDomain.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteTagsForDomain(ctx context.Context, params *DeleteTagsForD addawsAwsjson11_serdeOpDeleteTagsForDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_DisableDomainAutoRenew.go b/service/route53domains/api_op_DisableDomainAutoRenew.go index 316582181be..75d812672fd 100644 --- a/service/route53domains/api_op_DisableDomainAutoRenew.go +++ b/service/route53domains/api_op_DisableDomainAutoRenew.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisableDomainAutoRenew(ctx context.Context, params *DisableDoma addawsAwsjson11_serdeOpDisableDomainAutoRenewMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_DisableDomainTransferLock.go b/service/route53domains/api_op_DisableDomainTransferLock.go index 16d381e2ba6..d6518d054b1 100644 --- a/service/route53domains/api_op_DisableDomainTransferLock.go +++ b/service/route53domains/api_op_DisableDomainTransferLock.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DisableDomainTransferLock(ctx context.Context, params *DisableD addawsAwsjson11_serdeOpDisableDomainTransferLockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_EnableDomainAutoRenew.go b/service/route53domains/api_op_EnableDomainAutoRenew.go index c22392f7c41..2446e17de04 100644 --- a/service/route53domains/api_op_EnableDomainAutoRenew.go +++ b/service/route53domains/api_op_EnableDomainAutoRenew.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) EnableDomainAutoRenew(ctx context.Context, params *EnableDomain addawsAwsjson11_serdeOpEnableDomainAutoRenewMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_EnableDomainTransferLock.go b/service/route53domains/api_op_EnableDomainTransferLock.go index 0ae3082ecb1..134a98b961e 100644 --- a/service/route53domains/api_op_EnableDomainTransferLock.go +++ b/service/route53domains/api_op_EnableDomainTransferLock.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) EnableDomainTransferLock(ctx context.Context, params *EnableDom addawsAwsjson11_serdeOpEnableDomainTransferLockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_GetContactReachabilityStatus.go b/service/route53domains/api_op_GetContactReachabilityStatus.go index 0905dfe7f97..19e43d0ef35 100644 --- a/service/route53domains/api_op_GetContactReachabilityStatus.go +++ b/service/route53domains/api_op_GetContactReachabilityStatus.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53domains/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetContactReachabilityStatus(ctx context.Context, params *GetCo addawsAwsjson11_serdeOpGetContactReachabilityStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_GetDomainDetail.go b/service/route53domains/api_op_GetDomainDetail.go index 7b69404dbb1..7df02964114 100644 --- a/service/route53domains/api_op_GetDomainDetail.go +++ b/service/route53domains/api_op_GetDomainDetail.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53domains/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetDomainDetail(ctx context.Context, params *GetDomainDetailInp addawsAwsjson11_serdeOpGetDomainDetailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_GetDomainSuggestions.go b/service/route53domains/api_op_GetDomainSuggestions.go index b214b5c5b05..82b0bc5b6d5 100644 --- a/service/route53domains/api_op_GetDomainSuggestions.go +++ b/service/route53domains/api_op_GetDomainSuggestions.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53domains/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDomainSuggestions(ctx context.Context, params *GetDomainSugg addawsAwsjson11_serdeOpGetDomainSuggestionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_GetOperationDetail.go b/service/route53domains/api_op_GetOperationDetail.go index 9010b128622..9f9806344b9 100644 --- a/service/route53domains/api_op_GetOperationDetail.go +++ b/service/route53domains/api_op_GetOperationDetail.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53domains/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetOperationDetail(ctx context.Context, params *GetOperationDet addawsAwsjson11_serdeOpGetOperationDetailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_ListDomains.go b/service/route53domains/api_op_ListDomains.go index 2c8ecf3b0bc..326eaa63abe 100644 --- a/service/route53domains/api_op_ListDomains.go +++ b/service/route53domains/api_op_ListDomains.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53domains/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListDomains(ctx context.Context, params *ListDomainsInput, optF addawsAwsjson11_serdeOpListDomainsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_ListOperations.go b/service/route53domains/api_op_ListOperations.go index ec8e8ead0c6..b6e8e9e8eec 100644 --- a/service/route53domains/api_op_ListOperations.go +++ b/service/route53domains/api_op_ListOperations.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53domains/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListOperations(ctx context.Context, params *ListOperationsInput addawsAwsjson11_serdeOpListOperationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_ListTagsForDomain.go b/service/route53domains/api_op_ListTagsForDomain.go index 9973d93417b..bb53e184e0c 100644 --- a/service/route53domains/api_op_ListTagsForDomain.go +++ b/service/route53domains/api_op_ListTagsForDomain.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53domains/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListTagsForDomain(ctx context.Context, params *ListTagsForDomai addawsAwsjson11_serdeOpListTagsForDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_RegisterDomain.go b/service/route53domains/api_op_RegisterDomain.go index 9d2617e5352..c413d52c628 100644 --- a/service/route53domains/api_op_RegisterDomain.go +++ b/service/route53domains/api_op_RegisterDomain.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53domains/types" smithy "github.com/awslabs/smithy-go" @@ -51,9 +50,9 @@ func (c *Client) RegisterDomain(ctx context.Context, params *RegisterDomainInput addawsAwsjson11_serdeOpRegisterDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_RejectDomainTransferFromAnotherAwsAccount.go b/service/route53domains/api_op_RejectDomainTransferFromAnotherAwsAccount.go index eee408f461f..74d948f5e82 100644 --- a/service/route53domains/api_op_RejectDomainTransferFromAnotherAwsAccount.go +++ b/service/route53domains/api_op_RejectDomainTransferFromAnotherAwsAccount.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) RejectDomainTransferFromAnotherAwsAccount(ctx context.Context, addawsAwsjson11_serdeOpRejectDomainTransferFromAnotherAwsAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_RenewDomain.go b/service/route53domains/api_op_RenewDomain.go index ac3837e92f6..bb913d13e28 100644 --- a/service/route53domains/api_op_RenewDomain.go +++ b/service/route53domains/api_op_RenewDomain.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) RenewDomain(ctx context.Context, params *RenewDomainInput, optF addawsAwsjson11_serdeOpRenewDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_ResendContactReachabilityEmail.go b/service/route53domains/api_op_ResendContactReachabilityEmail.go index e1995ef706f..8d74e5e56e0 100644 --- a/service/route53domains/api_op_ResendContactReachabilityEmail.go +++ b/service/route53domains/api_op_ResendContactReachabilityEmail.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) ResendContactReachabilityEmail(ctx context.Context, params *Res addawsAwsjson11_serdeOpResendContactReachabilityEmailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_RetrieveDomainAuthCode.go b/service/route53domains/api_op_RetrieveDomainAuthCode.go index 33681a0cdf7..b5dc35d00c1 100644 --- a/service/route53domains/api_op_RetrieveDomainAuthCode.go +++ b/service/route53domains/api_op_RetrieveDomainAuthCode.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) RetrieveDomainAuthCode(ctx context.Context, params *RetrieveDom addawsAwsjson11_serdeOpRetrieveDomainAuthCodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_TransferDomain.go b/service/route53domains/api_op_TransferDomain.go index 49441bec463..7d6cc818be9 100644 --- a/service/route53domains/api_op_TransferDomain.go +++ b/service/route53domains/api_op_TransferDomain.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53domains/types" smithy "github.com/awslabs/smithy-go" @@ -58,9 +57,9 @@ func (c *Client) TransferDomain(ctx context.Context, params *TransferDomainInput addawsAwsjson11_serdeOpTransferDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_TransferDomainToAnotherAwsAccount.go b/service/route53domains/api_op_TransferDomainToAnotherAwsAccount.go index ad54016bcce..aa2b76c1daf 100644 --- a/service/route53domains/api_op_TransferDomainToAnotherAwsAccount.go +++ b/service/route53domains/api_op_TransferDomainToAnotherAwsAccount.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -55,9 +54,9 @@ func (c *Client) TransferDomainToAnotherAwsAccount(ctx context.Context, params * addawsAwsjson11_serdeOpTransferDomainToAnotherAwsAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_UpdateDomainContact.go b/service/route53domains/api_op_UpdateDomainContact.go index cb047e10e2e..b193bd6d83e 100644 --- a/service/route53domains/api_op_UpdateDomainContact.go +++ b/service/route53domains/api_op_UpdateDomainContact.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53domains/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateDomainContact(ctx context.Context, params *UpdateDomainCo addawsAwsjson11_serdeOpUpdateDomainContactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_UpdateDomainContactPrivacy.go b/service/route53domains/api_op_UpdateDomainContactPrivacy.go index 8169ccad24f..4d404ebd590 100644 --- a/service/route53domains/api_op_UpdateDomainContactPrivacy.go +++ b/service/route53domains/api_op_UpdateDomainContactPrivacy.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -40,9 +39,9 @@ func (c *Client) UpdateDomainContactPrivacy(ctx context.Context, params *UpdateD addawsAwsjson11_serdeOpUpdateDomainContactPrivacyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_UpdateDomainNameservers.go b/service/route53domains/api_op_UpdateDomainNameservers.go index 8c3eb7fc6a6..3a376a57f41 100644 --- a/service/route53domains/api_op_UpdateDomainNameservers.go +++ b/service/route53domains/api_op_UpdateDomainNameservers.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53domains/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) UpdateDomainNameservers(ctx context.Context, params *UpdateDoma addawsAwsjson11_serdeOpUpdateDomainNameserversMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_UpdateTagsForDomain.go b/service/route53domains/api_op_UpdateTagsForDomain.go index 360a0c15e41..5e6ee0b9293 100644 --- a/service/route53domains/api_op_UpdateTagsForDomain.go +++ b/service/route53domains/api_op_UpdateTagsForDomain.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53domains/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateTagsForDomain(ctx context.Context, params *UpdateTagsForD addawsAwsjson11_serdeOpUpdateTagsForDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/api_op_ViewBilling.go b/service/route53domains/api_op_ViewBilling.go index c636cb3e7ae..fe16f669751 100644 --- a/service/route53domains/api_op_ViewBilling.go +++ b/service/route53domains/api_op_ViewBilling.go @@ -5,7 +5,6 @@ package route53domains import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53domains/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ViewBilling(ctx context.Context, params *ViewBillingInput, optF addawsAwsjson11_serdeOpViewBillingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53domains/endpoints.go b/service/route53domains/endpoints.go index bf61234dc44..23967d2e12c 100644 --- a/service/route53domains/endpoints.go +++ b/service/route53domains/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/route53resolver/api_client.go b/service/route53resolver/api_client.go index 5feee9a4815..cebbbe1262d 100644 --- a/service/route53resolver/api_client.go +++ b/service/route53resolver/api_client.go @@ -96,30 +96,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -185,6 +161,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/route53resolver/api_op_AssociateResolverEndpointIpAddress.go b/service/route53resolver/api_op_AssociateResolverEndpointIpAddress.go index 8c360bdd88d..f1eb2535b3a 100644 --- a/service/route53resolver/api_op_AssociateResolverEndpointIpAddress.go +++ b/service/route53resolver/api_op_AssociateResolverEndpointIpAddress.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) AssociateResolverEndpointIpAddress(ctx context.Context, params addawsAwsjson11_serdeOpAssociateResolverEndpointIpAddressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_AssociateResolverRule.go b/service/route53resolver/api_op_AssociateResolverRule.go index 62add87cf2c..beae54a14d3 100644 --- a/service/route53resolver/api_op_AssociateResolverRule.go +++ b/service/route53resolver/api_op_AssociateResolverRule.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) AssociateResolverRule(ctx context.Context, params *AssociateRes addawsAwsjson11_serdeOpAssociateResolverRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_CreateResolverEndpoint.go b/service/route53resolver/api_op_CreateResolverEndpoint.go index 0efb62055dc..3eb05029f5f 100644 --- a/service/route53resolver/api_op_CreateResolverEndpoint.go +++ b/service/route53resolver/api_op_CreateResolverEndpoint.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateResolverEndpoint(ctx context.Context, params *CreateResol addawsAwsjson11_serdeOpCreateResolverEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_CreateResolverRule.go b/service/route53resolver/api_op_CreateResolverRule.go index db7bae9d82f..f3464fd1e65 100644 --- a/service/route53resolver/api_op_CreateResolverRule.go +++ b/service/route53resolver/api_op_CreateResolverRule.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateResolverRule(ctx context.Context, params *CreateResolverR addawsAwsjson11_serdeOpCreateResolverRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_DeleteResolverEndpoint.go b/service/route53resolver/api_op_DeleteResolverEndpoint.go index 3624d9fd0b6..b81861dab6a 100644 --- a/service/route53resolver/api_op_DeleteResolverEndpoint.go +++ b/service/route53resolver/api_op_DeleteResolverEndpoint.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DeleteResolverEndpoint(ctx context.Context, params *DeleteResol addawsAwsjson11_serdeOpDeleteResolverEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_DeleteResolverRule.go b/service/route53resolver/api_op_DeleteResolverRule.go index 302f797bfbb..8d1a2c5c03a 100644 --- a/service/route53resolver/api_op_DeleteResolverRule.go +++ b/service/route53resolver/api_op_DeleteResolverRule.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DeleteResolverRule(ctx context.Context, params *DeleteResolverR addawsAwsjson11_serdeOpDeleteResolverRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_DisassociateResolverEndpointIpAddress.go b/service/route53resolver/api_op_DisassociateResolverEndpointIpAddress.go index 6cddd0aab01..01b63278ca4 100644 --- a/service/route53resolver/api_op_DisassociateResolverEndpointIpAddress.go +++ b/service/route53resolver/api_op_DisassociateResolverEndpointIpAddress.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DisassociateResolverEndpointIpAddress(ctx context.Context, para addawsAwsjson11_serdeOpDisassociateResolverEndpointIpAddressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_DisassociateResolverRule.go b/service/route53resolver/api_op_DisassociateResolverRule.go index 0605d18e304..95213183ff8 100644 --- a/service/route53resolver/api_op_DisassociateResolverRule.go +++ b/service/route53resolver/api_op_DisassociateResolverRule.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DisassociateResolverRule(ctx context.Context, params *Disassoci addawsAwsjson11_serdeOpDisassociateResolverRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_GetResolverEndpoint.go b/service/route53resolver/api_op_GetResolverEndpoint.go index c29da482c0a..742fa4d9eb3 100644 --- a/service/route53resolver/api_op_GetResolverEndpoint.go +++ b/service/route53resolver/api_op_GetResolverEndpoint.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetResolverEndpoint(ctx context.Context, params *GetResolverEnd addawsAwsjson11_serdeOpGetResolverEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_GetResolverRule.go b/service/route53resolver/api_op_GetResolverRule.go index 76072db37dd..d3f13702d3c 100644 --- a/service/route53resolver/api_op_GetResolverRule.go +++ b/service/route53resolver/api_op_GetResolverRule.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetResolverRule(ctx context.Context, params *GetResolverRuleInp addawsAwsjson11_serdeOpGetResolverRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_GetResolverRuleAssociation.go b/service/route53resolver/api_op_GetResolverRuleAssociation.go index 985bc63764b..b1bd986508b 100644 --- a/service/route53resolver/api_op_GetResolverRuleAssociation.go +++ b/service/route53resolver/api_op_GetResolverRuleAssociation.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetResolverRuleAssociation(ctx context.Context, params *GetReso addawsAwsjson11_serdeOpGetResolverRuleAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_GetResolverRulePolicy.go b/service/route53resolver/api_op_GetResolverRulePolicy.go index cfef674d563..8fa41cdc903 100644 --- a/service/route53resolver/api_op_GetResolverRulePolicy.go +++ b/service/route53resolver/api_op_GetResolverRulePolicy.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) GetResolverRulePolicy(ctx context.Context, params *GetResolverR addawsAwsjson11_serdeOpGetResolverRulePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_ListResolverEndpointIpAddresses.go b/service/route53resolver/api_op_ListResolverEndpointIpAddresses.go index dbf6482272c..853122fd2d8 100644 --- a/service/route53resolver/api_op_ListResolverEndpointIpAddresses.go +++ b/service/route53resolver/api_op_ListResolverEndpointIpAddresses.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListResolverEndpointIpAddresses(ctx context.Context, params *Li addawsAwsjson11_serdeOpListResolverEndpointIpAddressesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_ListResolverEndpoints.go b/service/route53resolver/api_op_ListResolverEndpoints.go index 81ac3ab1d64..495f85fbb41 100644 --- a/service/route53resolver/api_op_ListResolverEndpoints.go +++ b/service/route53resolver/api_op_ListResolverEndpoints.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListResolverEndpoints(ctx context.Context, params *ListResolver addawsAwsjson11_serdeOpListResolverEndpointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_ListResolverRuleAssociations.go b/service/route53resolver/api_op_ListResolverRuleAssociations.go index 020b0828a20..ab5f9b26f98 100644 --- a/service/route53resolver/api_op_ListResolverRuleAssociations.go +++ b/service/route53resolver/api_op_ListResolverRuleAssociations.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListResolverRuleAssociations(ctx context.Context, params *ListR addawsAwsjson11_serdeOpListResolverRuleAssociationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_ListResolverRules.go b/service/route53resolver/api_op_ListResolverRules.go index 92aa06dfcdf..3cc281f488a 100644 --- a/service/route53resolver/api_op_ListResolverRules.go +++ b/service/route53resolver/api_op_ListResolverRules.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListResolverRules(ctx context.Context, params *ListResolverRule addawsAwsjson11_serdeOpListResolverRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_ListTagsForResource.go b/service/route53resolver/api_op_ListTagsForResource.go index 3d2c0f497ef..379670b9797 100644 --- a/service/route53resolver/api_op_ListTagsForResource.go +++ b/service/route53resolver/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_PutResolverRulePolicy.go b/service/route53resolver/api_op_PutResolverRulePolicy.go index 4f613891b8f..ad9e6c00757 100644 --- a/service/route53resolver/api_op_PutResolverRulePolicy.go +++ b/service/route53resolver/api_op_PutResolverRulePolicy.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) PutResolverRulePolicy(ctx context.Context, params *PutResolverR addawsAwsjson11_serdeOpPutResolverRulePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_TagResource.go b/service/route53resolver/api_op_TagResource.go index ed210681fb3..5e9ae8896bf 100644 --- a/service/route53resolver/api_op_TagResource.go +++ b/service/route53resolver/api_op_TagResource.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_UntagResource.go b/service/route53resolver/api_op_UntagResource.go index bc8aae8258e..56bcacb0552 100644 --- a/service/route53resolver/api_op_UntagResource.go +++ b/service/route53resolver/api_op_UntagResource.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_UpdateResolverEndpoint.go b/service/route53resolver/api_op_UpdateResolverEndpoint.go index 824fc69ea97..674c6bc7aa0 100644 --- a/service/route53resolver/api_op_UpdateResolverEndpoint.go +++ b/service/route53resolver/api_op_UpdateResolverEndpoint.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateResolverEndpoint(ctx context.Context, params *UpdateResol addawsAwsjson11_serdeOpUpdateResolverEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/api_op_UpdateResolverRule.go b/service/route53resolver/api_op_UpdateResolverRule.go index 27e7255412c..b089b6d009d 100644 --- a/service/route53resolver/api_op_UpdateResolverRule.go +++ b/service/route53resolver/api_op_UpdateResolverRule.go @@ -5,7 +5,6 @@ package route53resolver import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateResolverRule(ctx context.Context, params *UpdateResolverR addawsAwsjson11_serdeOpUpdateResolverRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/route53resolver/endpoints.go b/service/route53resolver/endpoints.go index d0e73460d9e..809d4bedbed 100644 --- a/service/route53resolver/endpoints.go +++ b/service/route53resolver/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/s3/api_client.go b/service/s3/api_client.go index b9b102da122..97a3d1557b6 100644 --- a/service/s3/api_client.go +++ b/service/s3/api_client.go @@ -84,34 +84,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - -func (o Options) GetUsePathStyle() bool { - return o.UsePathStyle -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -177,6 +149,17 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + +func addMetadataRetrieverMiddleware(stack *middleware.Stack) { + s3shared.AddMetadataRetrieverMiddleware(stack) +} + func addUpdateEndpointMiddleware(stack *middleware.Stack, options Options) { s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{UsePathStyle: options.UsePathStyle, GetBucketFromInput: getBucketFromInput}) } @@ -358,10 +341,6 @@ func addResponseErrorMiddleware(stack *middleware.Stack) { s3shared.AddResponseErrorMiddleware(stack) } -func addMetadataRetrieverMiddleware(stack *middleware.Stack) { - s3shared.AddMetadataRetrieverMiddleware(stack) -} - func disableAcceptEncodingGzip(stack *middleware.Stack) { acceptencodingcust.AddAcceptEncodingGzip(stack, acceptencodingcust.AddAcceptEncodingGzipOptions{}) } diff --git a/service/s3/api_op_AbortMultipartUpload.go b/service/s3/api_op_AbortMultipartUpload.go index 0d37a6d16f0..a8ea46121a6 100644 --- a/service/s3/api_op_AbortMultipartUpload.go +++ b/service/s3/api_op_AbortMultipartUpload.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) AbortMultipartUpload(ctx context.Context, params *AbortMultipar addawsRestxml_serdeOpAbortMultipartUploadMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -56,9 +55,9 @@ func (c *Client) AbortMultipartUpload(ctx context.Context, params *AbortMultipar smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpAbortMultipartUploadValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opAbortMultipartUpload(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_CompleteMultipartUpload.go b/service/s3/api_op_CompleteMultipartUpload.go index d1e9774dc42..84259c15bd1 100644 --- a/service/s3/api_op_CompleteMultipartUpload.go +++ b/service/s3/api_op_CompleteMultipartUpload.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -67,9 +66,9 @@ func (c *Client) CompleteMultipartUpload(ctx context.Context, params *CompleteMu addawsRestxml_serdeOpCompleteMultipartUploadMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -77,9 +76,9 @@ func (c *Client) CompleteMultipartUpload(ctx context.Context, params *CompleteMu smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpCompleteMultipartUploadValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opCompleteMultipartUpload(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) s3cust.HandleResponseErrorWith200Status(stack) diff --git a/service/s3/api_op_CopyObject.go b/service/s3/api_op_CopyObject.go index 42199567860..97a4d147086 100644 --- a/service/s3/api_op_CopyObject.go +++ b/service/s3/api_op_CopyObject.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -139,9 +138,9 @@ func (c *Client) CopyObject(ctx context.Context, params *CopyObjectInput, optFns addawsRestxml_serdeOpCopyObjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -149,9 +148,9 @@ func (c *Client) CopyObject(ctx context.Context, params *CopyObjectInput, optFns smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpCopyObjectValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opCopyObject(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) s3cust.HandleResponseErrorWith200Status(stack) diff --git a/service/s3/api_op_CreateBucket.go b/service/s3/api_op_CreateBucket.go index 5f588183382..76f3f03ab48 100644 --- a/service/s3/api_op_CreateBucket.go +++ b/service/s3/api_op_CreateBucket.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -105,9 +104,9 @@ func (c *Client) CreateBucket(ctx context.Context, params *CreateBucketInput, op addawsRestxml_serdeOpCreateBucketMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -115,9 +114,9 @@ func (c *Client) CreateBucket(ctx context.Context, params *CreateBucketInput, op smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpCreateBucketValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opCreateBucket(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_CreateMultipartUpload.go b/service/s3/api_op_CreateMultipartUpload.go index 26c07c3326b..5177aebf407 100644 --- a/service/s3/api_op_CreateMultipartUpload.go +++ b/service/s3/api_op_CreateMultipartUpload.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -161,9 +160,9 @@ func (c *Client) CreateMultipartUpload(ctx context.Context, params *CreateMultip addawsRestxml_serdeOpCreateMultipartUploadMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -171,9 +170,9 @@ func (c *Client) CreateMultipartUpload(ctx context.Context, params *CreateMultip smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpCreateMultipartUploadValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opCreateMultipartUpload(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_DeleteBucket.go b/service/s3/api_op_DeleteBucket.go index a11388a6433..5b1727c5cce 100644 --- a/service/s3/api_op_DeleteBucket.go +++ b/service/s3/api_op_DeleteBucket.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteBucket(ctx context.Context, params *DeleteBucketInput, op addawsRestxml_serdeOpDeleteBucketMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -35,9 +34,9 @@ func (c *Client) DeleteBucket(ctx context.Context, params *DeleteBucketInput, op smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteBucketValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteBucket(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go b/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go index 9c5dbb10b3c..f8357ed97d8 100644 --- a/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go +++ b/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) DeleteBucketAnalyticsConfiguration(ctx context.Context, params addawsRestxml_serdeOpDeleteBucketAnalyticsConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -45,9 +44,9 @@ func (c *Client) DeleteBucketAnalyticsConfiguration(ctx context.Context, params smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteBucketAnalyticsConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteBucketAnalyticsConfiguration(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_DeleteBucketCors.go b/service/s3/api_op_DeleteBucketCors.go index d80905ae790..960cf570ffc 100644 --- a/service/s3/api_op_DeleteBucketCors.go +++ b/service/s3/api_op_DeleteBucketCors.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DeleteBucketCors(ctx context.Context, params *DeleteBucketCorsI addawsRestxml_serdeOpDeleteBucketCorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -38,9 +37,9 @@ func (c *Client) DeleteBucketCors(ctx context.Context, params *DeleteBucketCorsI smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteBucketCorsValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteBucketCors(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_DeleteBucketEncryption.go b/service/s3/api_op_DeleteBucketEncryption.go index eb03a3e3336..4a423789ea7 100644 --- a/service/s3/api_op_DeleteBucketEncryption.go +++ b/service/s3/api_op_DeleteBucketEncryption.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -36,9 +35,9 @@ func (c *Client) DeleteBucketEncryption(ctx context.Context, params *DeleteBucke addawsRestxml_serdeOpDeleteBucketEncryptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -46,9 +45,9 @@ func (c *Client) DeleteBucketEncryption(ctx context.Context, params *DeleteBucke smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteBucketEncryptionValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteBucketEncryption(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_DeleteBucketInventoryConfiguration.go b/service/s3/api_op_DeleteBucketInventoryConfiguration.go index c14f40ab512..4395075528a 100644 --- a/service/s3/api_op_DeleteBucketInventoryConfiguration.go +++ b/service/s3/api_op_DeleteBucketInventoryConfiguration.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) DeleteBucketInventoryConfiguration(ctx context.Context, params addawsRestxml_serdeOpDeleteBucketInventoryConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -51,9 +50,9 @@ func (c *Client) DeleteBucketInventoryConfiguration(ctx context.Context, params smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteBucketInventoryConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteBucketInventoryConfiguration(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_DeleteBucketLifecycle.go b/service/s3/api_op_DeleteBucketLifecycle.go index f4d12e50cec..08490d84ae0 100644 --- a/service/s3/api_op_DeleteBucketLifecycle.go +++ b/service/s3/api_op_DeleteBucketLifecycle.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) DeleteBucketLifecycle(ctx context.Context, params *DeleteBucket addawsRestxml_serdeOpDeleteBucketLifecycleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -45,9 +44,9 @@ func (c *Client) DeleteBucketLifecycle(ctx context.Context, params *DeleteBucket smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteBucketLifecycleValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteBucketLifecycle(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_DeleteBucketMetricsConfiguration.go b/service/s3/api_op_DeleteBucketMetricsConfiguration.go index 0efb2e29e79..2e073d4fa88 100644 --- a/service/s3/api_op_DeleteBucketMetricsConfiguration.go +++ b/service/s3/api_op_DeleteBucketMetricsConfiguration.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -40,9 +39,9 @@ func (c *Client) DeleteBucketMetricsConfiguration(ctx context.Context, params *D addawsRestxml_serdeOpDeleteBucketMetricsConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -50,9 +49,9 @@ func (c *Client) DeleteBucketMetricsConfiguration(ctx context.Context, params *D smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteBucketMetricsConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteBucketMetricsConfiguration(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_DeleteBucketPolicy.go b/service/s3/api_op_DeleteBucketPolicy.go index fd2407ec197..5184ef9387b 100644 --- a/service/s3/api_op_DeleteBucketPolicy.go +++ b/service/s3/api_op_DeleteBucketPolicy.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) DeleteBucketPolicy(ctx context.Context, params *DeleteBucketPol addawsRestxml_serdeOpDeleteBucketPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -51,9 +50,9 @@ func (c *Client) DeleteBucketPolicy(ctx context.Context, params *DeleteBucketPol smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteBucketPolicyValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteBucketPolicy(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_DeleteBucketReplication.go b/service/s3/api_op_DeleteBucketReplication.go index 3af996589a4..efb8871aa62 100644 --- a/service/s3/api_op_DeleteBucketReplication.go +++ b/service/s3/api_op_DeleteBucketReplication.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -36,9 +35,9 @@ func (c *Client) DeleteBucketReplication(ctx context.Context, params *DeleteBuck addawsRestxml_serdeOpDeleteBucketReplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -46,9 +45,9 @@ func (c *Client) DeleteBucketReplication(ctx context.Context, params *DeleteBuck smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteBucketReplicationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteBucketReplication(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_DeleteBucketTagging.go b/service/s3/api_op_DeleteBucketTagging.go index 7213535c829..389e834ea29 100644 --- a/service/s3/api_op_DeleteBucketTagging.go +++ b/service/s3/api_op_DeleteBucketTagging.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteBucketTagging(ctx context.Context, params *DeleteBucketTa addawsRestxml_serdeOpDeleteBucketTaggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -37,9 +36,9 @@ func (c *Client) DeleteBucketTagging(ctx context.Context, params *DeleteBucketTa smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteBucketTaggingValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteBucketTagging(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_DeleteBucketWebsite.go b/service/s3/api_op_DeleteBucketWebsite.go index 2ac72420de7..dd65e588312 100644 --- a/service/s3/api_op_DeleteBucketWebsite.go +++ b/service/s3/api_op_DeleteBucketWebsite.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -36,9 +35,9 @@ func (c *Client) DeleteBucketWebsite(ctx context.Context, params *DeleteBucketWe addawsRestxml_serdeOpDeleteBucketWebsiteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -46,9 +45,9 @@ func (c *Client) DeleteBucketWebsite(ctx context.Context, params *DeleteBucketWe smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteBucketWebsiteValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteBucketWebsite(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_DeleteObject.go b/service/s3/api_op_DeleteObject.go index 7b92453e235..1cd788b7130 100644 --- a/service/s3/api_op_DeleteObject.go +++ b/service/s3/api_op_DeleteObject.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) DeleteObject(ctx context.Context, params *DeleteObjectInput, op addawsRestxml_serdeOpDeleteObjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -55,9 +54,9 @@ func (c *Client) DeleteObject(ctx context.Context, params *DeleteObjectInput, op smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteObjectValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteObject(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_DeleteObjectTagging.go b/service/s3/api_op_DeleteObjectTagging.go index bccd9a762c0..c9ba8d2b3ea 100644 --- a/service/s3/api_op_DeleteObjectTagging.go +++ b/service/s3/api_op_DeleteObjectTagging.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) DeleteObjectTagging(ctx context.Context, params *DeleteObjectTa addawsRestxml_serdeOpDeleteObjectTaggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -42,9 +41,9 @@ func (c *Client) DeleteObjectTagging(ctx context.Context, params *DeleteObjectTa smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteObjectTaggingValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteObjectTagging(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_DeleteObjects.go b/service/s3/api_op_DeleteObjects.go index 50a84f2cd71..27790b97ae3 100644 --- a/service/s3/api_op_DeleteObjects.go +++ b/service/s3/api_op_DeleteObjects.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -51,9 +50,9 @@ func (c *Client) DeleteObjects(ctx context.Context, params *DeleteObjectsInput, addawsRestxml_serdeOpDeleteObjectsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -61,9 +60,9 @@ func (c *Client) DeleteObjects(ctx context.Context, params *DeleteObjectsInput, smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteObjectsValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteObjects(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_DeletePublicAccessBlock.go b/service/s3/api_op_DeletePublicAccessBlock.go index f9fd5065e7f..c47c1448852 100644 --- a/service/s3/api_op_DeletePublicAccessBlock.go +++ b/service/s3/api_op_DeletePublicAccessBlock.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -34,9 +33,9 @@ func (c *Client) DeletePublicAccessBlock(ctx context.Context, params *DeletePubl addawsRestxml_serdeOpDeletePublicAccessBlockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -44,9 +43,9 @@ func (c *Client) DeletePublicAccessBlock(ctx context.Context, params *DeletePubl smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeletePublicAccessBlockValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeletePublicAccessBlock(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetBucketAccelerateConfiguration.go b/service/s3/api_op_GetBucketAccelerateConfiguration.go index d94a6f4aa84..b1143a16abb 100644 --- a/service/s3/api_op_GetBucketAccelerateConfiguration.go +++ b/service/s3/api_op_GetBucketAccelerateConfiguration.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) GetBucketAccelerateConfiguration(ctx context.Context, params *G addawsRestxml_serdeOpGetBucketAccelerateConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -53,9 +52,9 @@ func (c *Client) GetBucketAccelerateConfiguration(ctx context.Context, params *G smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketAccelerateConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketAccelerateConfiguration(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetBucketAcl.go b/service/s3/api_op_GetBucketAcl.go index fd63a691559..23728e5273b 100644 --- a/service/s3/api_op_GetBucketAcl.go +++ b/service/s3/api_op_GetBucketAcl.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetBucketAcl(ctx context.Context, params *GetBucketAclInput, op addawsRestxml_serdeOpGetBucketAclMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -38,9 +37,9 @@ func (c *Client) GetBucketAcl(ctx context.Context, params *GetBucketAclInput, op smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketAclValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketAcl(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetBucketAnalyticsConfiguration.go b/service/s3/api_op_GetBucketAnalyticsConfiguration.go index bb23279d328..c43e15ff2ff 100644 --- a/service/s3/api_op_GetBucketAnalyticsConfiguration.go +++ b/service/s3/api_op_GetBucketAnalyticsConfiguration.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) GetBucketAnalyticsConfiguration(ctx context.Context, params *Ge addawsRestxml_serdeOpGetBucketAnalyticsConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -47,9 +46,9 @@ func (c *Client) GetBucketAnalyticsConfiguration(ctx context.Context, params *Ge smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketAnalyticsConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketAnalyticsConfiguration(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetBucketCors.go b/service/s3/api_op_GetBucketCors.go index fe90ca8e785..addab25af9e 100644 --- a/service/s3/api_op_GetBucketCors.go +++ b/service/s3/api_op_GetBucketCors.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetBucketCors(ctx context.Context, params *GetBucketCorsInput, addawsRestxml_serdeOpGetBucketCorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -40,9 +39,9 @@ func (c *Client) GetBucketCors(ctx context.Context, params *GetBucketCorsInput, smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketCorsValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketCors(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetBucketEncryption.go b/service/s3/api_op_GetBucketEncryption.go index 13d4de23b9d..3b63697df5c 100644 --- a/service/s3/api_op_GetBucketEncryption.go +++ b/service/s3/api_op_GetBucketEncryption.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) GetBucketEncryption(ctx context.Context, params *GetBucketEncry addawsRestxml_serdeOpGetBucketEncryptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -47,9 +46,9 @@ func (c *Client) GetBucketEncryption(ctx context.Context, params *GetBucketEncry smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketEncryptionValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketEncryption(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetBucketInventoryConfiguration.go b/service/s3/api_op_GetBucketInventoryConfiguration.go index 05309b42372..11ef82fda64 100644 --- a/service/s3/api_op_GetBucketInventoryConfiguration.go +++ b/service/s3/api_op_GetBucketInventoryConfiguration.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) GetBucketInventoryConfiguration(ctx context.Context, params *Ge addawsRestxml_serdeOpGetBucketInventoryConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -48,9 +47,9 @@ func (c *Client) GetBucketInventoryConfiguration(ctx context.Context, params *Ge smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketInventoryConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketInventoryConfiguration(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetBucketLifecycleConfiguration.go b/service/s3/api_op_GetBucketLifecycleConfiguration.go index 498af343d91..a5341356816 100644 --- a/service/s3/api_op_GetBucketLifecycleConfiguration.go +++ b/service/s3/api_op_GetBucketLifecycleConfiguration.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) GetBucketLifecycleConfiguration(ctx context.Context, params *Ge addawsRestxml_serdeOpGetBucketLifecycleConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -57,9 +56,9 @@ func (c *Client) GetBucketLifecycleConfiguration(ctx context.Context, params *Ge smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketLifecycleConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketLifecycleConfiguration(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetBucketLocation.go b/service/s3/api_op_GetBucketLocation.go index a34bb33fc43..925c1820e37 100644 --- a/service/s3/api_op_GetBucketLocation.go +++ b/service/s3/api_op_GetBucketLocation.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetBucketLocation(ctx context.Context, params *GetBucketLocatio addawsRestxml_serdeOpGetBucketLocationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -38,9 +37,9 @@ func (c *Client) GetBucketLocation(ctx context.Context, params *GetBucketLocatio smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketLocationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketLocation(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetBucketLogging.go b/service/s3/api_op_GetBucketLogging.go index ef122f8bc4e..db42480988f 100644 --- a/service/s3/api_op_GetBucketLogging.go +++ b/service/s3/api_op_GetBucketLogging.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetBucketLogging(ctx context.Context, params *GetBucketLoggingI addawsRestxml_serdeOpGetBucketLoggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -37,9 +36,9 @@ func (c *Client) GetBucketLogging(ctx context.Context, params *GetBucketLoggingI smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketLoggingValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketLogging(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetBucketMetricsConfiguration.go b/service/s3/api_op_GetBucketMetricsConfiguration.go index f195ee89fa6..1e38e554947 100644 --- a/service/s3/api_op_GetBucketMetricsConfiguration.go +++ b/service/s3/api_op_GetBucketMetricsConfiguration.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) GetBucketMetricsConfiguration(ctx context.Context, params *GetB addawsRestxml_serdeOpGetBucketMetricsConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -51,9 +50,9 @@ func (c *Client) GetBucketMetricsConfiguration(ctx context.Context, params *GetB smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketMetricsConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketMetricsConfiguration(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetBucketNotificationConfiguration.go b/service/s3/api_op_GetBucketNotificationConfiguration.go index 7a65ea3d3e0..5e57a8135b2 100644 --- a/service/s3/api_op_GetBucketNotificationConfiguration.go +++ b/service/s3/api_op_GetBucketNotificationConfiguration.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) GetBucketNotificationConfiguration(ctx context.Context, params addawsRestxml_serdeOpGetBucketNotificationConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -46,9 +45,9 @@ func (c *Client) GetBucketNotificationConfiguration(ctx context.Context, params smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketNotificationConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketNotificationConfiguration(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetBucketPolicy.go b/service/s3/api_op_GetBucketPolicy.go index ea9ca591b2c..bbd3853e429 100644 --- a/service/s3/api_op_GetBucketPolicy.go +++ b/service/s3/api_op_GetBucketPolicy.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -37,9 +36,9 @@ func (c *Client) GetBucketPolicy(ctx context.Context, params *GetBucketPolicyInp addawsRestxml_serdeOpGetBucketPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -47,9 +46,9 @@ func (c *Client) GetBucketPolicy(ctx context.Context, params *GetBucketPolicyInp smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketPolicyValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketPolicy(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetBucketPolicyStatus.go b/service/s3/api_op_GetBucketPolicyStatus.go index 1c6dede594f..703bd1eb8eb 100644 --- a/service/s3/api_op_GetBucketPolicyStatus.go +++ b/service/s3/api_op_GetBucketPolicyStatus.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) GetBucketPolicyStatus(ctx context.Context, params *GetBucketPol addawsRestxml_serdeOpGetBucketPolicyStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -45,9 +44,9 @@ func (c *Client) GetBucketPolicyStatus(ctx context.Context, params *GetBucketPol smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketPolicyStatusValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketPolicyStatus(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetBucketReplication.go b/service/s3/api_op_GetBucketReplication.go index f3e509894a3..274e2143eaf 100644 --- a/service/s3/api_op_GetBucketReplication.go +++ b/service/s3/api_op_GetBucketReplication.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) GetBucketReplication(ctx context.Context, params *GetBucketRepl addawsRestxml_serdeOpGetBucketReplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -49,9 +48,9 @@ func (c *Client) GetBucketReplication(ctx context.Context, params *GetBucketRepl smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketReplicationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketReplication(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetBucketRequestPayment.go b/service/s3/api_op_GetBucketRequestPayment.go index 98de9a8c8ff..cbc371d59e3 100644 --- a/service/s3/api_op_GetBucketRequestPayment.go +++ b/service/s3/api_op_GetBucketRequestPayment.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetBucketRequestPayment(ctx context.Context, params *GetBucketR addawsRestxml_serdeOpGetBucketRequestPaymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -39,9 +38,9 @@ func (c *Client) GetBucketRequestPayment(ctx context.Context, params *GetBucketR smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketRequestPaymentValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketRequestPayment(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetBucketTagging.go b/service/s3/api_op_GetBucketTagging.go index 5516661dac0..f4eb461be2f 100644 --- a/service/s3/api_op_GetBucketTagging.go +++ b/service/s3/api_op_GetBucketTagging.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) GetBucketTagging(ctx context.Context, params *GetBucketTaggingI addawsRestxml_serdeOpGetBucketTaggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -41,9 +40,9 @@ func (c *Client) GetBucketTagging(ctx context.Context, params *GetBucketTaggingI smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketTaggingValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketTagging(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetBucketVersioning.go b/service/s3/api_op_GetBucketVersioning.go index bf977477d1a..3eb97eccf28 100644 --- a/service/s3/api_op_GetBucketVersioning.go +++ b/service/s3/api_op_GetBucketVersioning.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetBucketVersioning(ctx context.Context, params *GetBucketVersi addawsRestxml_serdeOpGetBucketVersioningMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -40,9 +39,9 @@ func (c *Client) GetBucketVersioning(ctx context.Context, params *GetBucketVersi smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketVersioningValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketVersioning(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetBucketWebsite.go b/service/s3/api_op_GetBucketWebsite.go index dc099bbfa21..67b9a8d8214 100644 --- a/service/s3/api_op_GetBucketWebsite.go +++ b/service/s3/api_op_GetBucketWebsite.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) GetBucketWebsite(ctx context.Context, params *GetBucketWebsiteI addawsRestxml_serdeOpGetBucketWebsiteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -46,9 +45,9 @@ func (c *Client) GetBucketWebsite(ctx context.Context, params *GetBucketWebsiteI smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketWebsiteValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketWebsite(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetObject.go b/service/s3/api_op_GetObject.go index 267c296595f..ae76344cb66 100644 --- a/service/s3/api_op_GetObject.go +++ b/service/s3/api_op_GetObject.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -122,18 +121,18 @@ func (c *Client) GetObject(ctx context.Context, params *GetObjectInput, optFns . addawsRestxml_serdeOpGetObjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) addOpGetObjectValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetObject(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetObjectAcl.go b/service/s3/api_op_GetObjectAcl.go index 3162381119b..9860bcaf5f8 100644 --- a/service/s3/api_op_GetObjectAcl.go +++ b/service/s3/api_op_GetObjectAcl.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetObjectAcl(ctx context.Context, params *GetObjectAclInput, op addawsRestxml_serdeOpGetObjectAclMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -39,9 +38,9 @@ func (c *Client) GetObjectAcl(ctx context.Context, params *GetObjectAclInput, op smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetObjectAclValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetObjectAcl(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetObjectLegalHold.go b/service/s3/api_op_GetObjectLegalHold.go index efa4bcc9d83..c333621763d 100644 --- a/service/s3/api_op_GetObjectLegalHold.go +++ b/service/s3/api_op_GetObjectLegalHold.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetObjectLegalHold(ctx context.Context, params *GetObjectLegalH addawsRestxml_serdeOpGetObjectLegalHoldMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -34,9 +33,9 @@ func (c *Client) GetObjectLegalHold(ctx context.Context, params *GetObjectLegalH smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetObjectLegalHoldValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetObjectLegalHold(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetObjectLockConfiguration.go b/service/s3/api_op_GetObjectLockConfiguration.go index 82384013c87..5fd2d744d1b 100644 --- a/service/s3/api_op_GetObjectLockConfiguration.go +++ b/service/s3/api_op_GetObjectLockConfiguration.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetObjectLockConfiguration(ctx context.Context, params *GetObje addawsRestxml_serdeOpGetObjectLockConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -36,9 +35,9 @@ func (c *Client) GetObjectLockConfiguration(ctx context.Context, params *GetObje smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetObjectLockConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetObjectLockConfiguration(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetObjectRetention.go b/service/s3/api_op_GetObjectRetention.go index bdc84656e90..bf541462790 100644 --- a/service/s3/api_op_GetObjectRetention.go +++ b/service/s3/api_op_GetObjectRetention.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetObjectRetention(ctx context.Context, params *GetObjectRetent addawsRestxml_serdeOpGetObjectRetentionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -34,9 +33,9 @@ func (c *Client) GetObjectRetention(ctx context.Context, params *GetObjectRetent smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetObjectRetentionValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetObjectRetention(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetObjectTagging.go b/service/s3/api_op_GetObjectTagging.go index ced18e529c4..735e47938c3 100644 --- a/service/s3/api_op_GetObjectTagging.go +++ b/service/s3/api_op_GetObjectTagging.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) GetObjectTagging(ctx context.Context, params *GetObjectTaggingI addawsRestxml_serdeOpGetObjectTaggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -46,9 +45,9 @@ func (c *Client) GetObjectTagging(ctx context.Context, params *GetObjectTaggingI smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetObjectTaggingValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetObjectTagging(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetObjectTorrent.go b/service/s3/api_op_GetObjectTorrent.go index 296b50de56e..712b7eeba82 100644 --- a/service/s3/api_op_GetObjectTorrent.go +++ b/service/s3/api_op_GetObjectTorrent.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -32,18 +31,18 @@ func (c *Client) GetObjectTorrent(ctx context.Context, params *GetObjectTorrentI addawsRestxml_serdeOpGetObjectTorrentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) addOpGetObjectTorrentValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetObjectTorrent(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_GetPublicAccessBlock.go b/service/s3/api_op_GetPublicAccessBlock.go index 27438fb1842..190dbace204 100644 --- a/service/s3/api_op_GetPublicAccessBlock.go +++ b/service/s3/api_op_GetPublicAccessBlock.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) GetPublicAccessBlock(ctx context.Context, params *GetPublicAcce addawsRestxml_serdeOpGetPublicAccessBlockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -52,9 +51,9 @@ func (c *Client) GetPublicAccessBlock(ctx context.Context, params *GetPublicAcce smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetPublicAccessBlockValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetPublicAccessBlock(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_HeadBucket.go b/service/s3/api_op_HeadBucket.go index fbf4b6ac662..5a2b2501eee 100644 --- a/service/s3/api_op_HeadBucket.go +++ b/service/s3/api_op_HeadBucket.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) HeadBucket(ctx context.Context, params *HeadBucketInput, optFns addawsRestxml_serdeOpHeadBucketMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -42,9 +41,9 @@ func (c *Client) HeadBucket(ctx context.Context, params *HeadBucketInput, optFns smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpHeadBucketValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opHeadBucket(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_HeadObject.go b/service/s3/api_op_HeadObject.go index 0c7024850ad..715361e40bc 100644 --- a/service/s3/api_op_HeadObject.go +++ b/service/s3/api_op_HeadObject.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -71,9 +70,9 @@ func (c *Client) HeadObject(ctx context.Context, params *HeadObjectInput, optFns addawsRestxml_serdeOpHeadObjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -81,9 +80,9 @@ func (c *Client) HeadObject(ctx context.Context, params *HeadObjectInput, optFns smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpHeadObjectValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opHeadObject(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_ListBucketAnalyticsConfigurations.go b/service/s3/api_op_ListBucketAnalyticsConfigurations.go index 588f4ac3483..3731ccb5278 100644 --- a/service/s3/api_op_ListBucketAnalyticsConfigurations.go +++ b/service/s3/api_op_ListBucketAnalyticsConfigurations.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) ListBucketAnalyticsConfigurations(ctx context.Context, params * addawsRestxml_serdeOpListBucketAnalyticsConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -56,9 +55,9 @@ func (c *Client) ListBucketAnalyticsConfigurations(ctx context.Context, params * smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpListBucketAnalyticsConfigurationsValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opListBucketAnalyticsConfigurations(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_ListBucketInventoryConfigurations.go b/service/s3/api_op_ListBucketInventoryConfigurations.go index 2cd23bca239..29e600e143c 100644 --- a/service/s3/api_op_ListBucketInventoryConfigurations.go +++ b/service/s3/api_op_ListBucketInventoryConfigurations.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) ListBucketInventoryConfigurations(ctx context.Context, params * addawsRestxml_serdeOpListBucketInventoryConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -56,9 +55,9 @@ func (c *Client) ListBucketInventoryConfigurations(ctx context.Context, params * smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpListBucketInventoryConfigurationsValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opListBucketInventoryConfigurations(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_ListBucketMetricsConfigurations.go b/service/s3/api_op_ListBucketMetricsConfigurations.go index 17128539f6e..e69dd0bb831 100644 --- a/service/s3/api_op_ListBucketMetricsConfigurations.go +++ b/service/s3/api_op_ListBucketMetricsConfigurations.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -48,9 +47,9 @@ func (c *Client) ListBucketMetricsConfigurations(ctx context.Context, params *Li addawsRestxml_serdeOpListBucketMetricsConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -58,9 +57,9 @@ func (c *Client) ListBucketMetricsConfigurations(ctx context.Context, params *Li smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpListBucketMetricsConfigurationsValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opListBucketMetricsConfigurations(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_ListBuckets.go b/service/s3/api_op_ListBuckets.go index c3ebdb552df..e3746d14b00 100644 --- a/service/s3/api_op_ListBuckets.go +++ b/service/s3/api_op_ListBuckets.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -23,18 +22,18 @@ func (c *Client) ListBuckets(ctx context.Context, params *ListBucketsInput, optF addawsRestxml_serdeOpListBucketsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) smithyhttp.AddCloseResponseBodyMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opListBuckets(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_ListMultipartUploads.go b/service/s3/api_op_ListMultipartUploads.go index c532008cbb1..2e4b1ed6d1e 100644 --- a/service/s3/api_op_ListMultipartUploads.go +++ b/service/s3/api_op_ListMultipartUploads.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) ListMultipartUploads(ctx context.Context, params *ListMultipart addawsRestxml_serdeOpListMultipartUploadsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -57,9 +56,9 @@ func (c *Client) ListMultipartUploads(ctx context.Context, params *ListMultipart smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpListMultipartUploadsValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opListMultipartUploads(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_ListObjectVersions.go b/service/s3/api_op_ListObjectVersions.go index 5be8bccf9a5..ea2772aaca3 100644 --- a/service/s3/api_op_ListObjectVersions.go +++ b/service/s3/api_op_ListObjectVersions.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) ListObjectVersions(ctx context.Context, params *ListObjectVersi addawsRestxml_serdeOpListObjectVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -41,9 +40,9 @@ func (c *Client) ListObjectVersions(ctx context.Context, params *ListObjectVersi smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpListObjectVersionsValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opListObjectVersions(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_ListObjects.go b/service/s3/api_op_ListObjects.go index d4277fa52be..cb45520a0c9 100644 --- a/service/s3/api_op_ListObjects.go +++ b/service/s3/api_op_ListObjects.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) ListObjects(ctx context.Context, params *ListObjectsInput, optF addawsRestxml_serdeOpListObjectsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -43,9 +42,9 @@ func (c *Client) ListObjects(ctx context.Context, params *ListObjectsInput, optF smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpListObjectsValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opListObjects(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_ListObjectsV2.go b/service/s3/api_op_ListObjectsV2.go index b2e753abf6b..06d74c517ba 100644 --- a/service/s3/api_op_ListObjectsV2.go +++ b/service/s3/api_op_ListObjectsV2.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) ListObjectsV2(ctx context.Context, params *ListObjectsV2Input, addawsRestxml_serdeOpListObjectsV2Middlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -53,9 +52,9 @@ func (c *Client) ListObjectsV2(ctx context.Context, params *ListObjectsV2Input, smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpListObjectsV2ValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opListObjectsV2(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_ListParts.go b/service/s3/api_op_ListParts.go index b09b81e520d..37cb523b956 100644 --- a/service/s3/api_op_ListParts.go +++ b/service/s3/api_op_ListParts.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) ListParts(ctx context.Context, params *ListPartsInput, optFns . addawsRestxml_serdeOpListPartsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -53,9 +52,9 @@ func (c *Client) ListParts(ctx context.Context, params *ListPartsInput, optFns . smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpListPartsValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opListParts(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutBucketAccelerateConfiguration.go b/service/s3/api_op_PutBucketAccelerateConfiguration.go index 0a4807d00b9..f28d3f07e55 100644 --- a/service/s3/api_op_PutBucketAccelerateConfiguration.go +++ b/service/s3/api_op_PutBucketAccelerateConfiguration.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) PutBucketAccelerateConfiguration(ctx context.Context, params *P addawsRestxml_serdeOpPutBucketAccelerateConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -57,9 +56,9 @@ func (c *Client) PutBucketAccelerateConfiguration(ctx context.Context, params *P smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketAccelerateConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketAccelerateConfiguration(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutBucketAcl.go b/service/s3/api_op_PutBucketAcl.go index 2de4c61be88..367f57abee4 100644 --- a/service/s3/api_op_PutBucketAcl.go +++ b/service/s3/api_op_PutBucketAcl.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -96,9 +95,9 @@ func (c *Client) PutBucketAcl(ctx context.Context, params *PutBucketAclInput, op addawsRestxml_serdeOpPutBucketAclMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -106,9 +105,9 @@ func (c *Client) PutBucketAcl(ctx context.Context, params *PutBucketAclInput, op smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketAclValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketAcl(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutBucketAnalyticsConfiguration.go b/service/s3/api_op_PutBucketAnalyticsConfiguration.go index 0ae250f0e7e..2980734beff 100644 --- a/service/s3/api_op_PutBucketAnalyticsConfiguration.go +++ b/service/s3/api_op_PutBucketAnalyticsConfiguration.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -60,9 +59,9 @@ func (c *Client) PutBucketAnalyticsConfiguration(ctx context.Context, params *Pu addawsRestxml_serdeOpPutBucketAnalyticsConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -70,9 +69,9 @@ func (c *Client) PutBucketAnalyticsConfiguration(ctx context.Context, params *Pu smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketAnalyticsConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketAnalyticsConfiguration(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutBucketCors.go b/service/s3/api_op_PutBucketCors.go index 623fdf6a51a..8383b8ead5e 100644 --- a/service/s3/api_op_PutBucketCors.go +++ b/service/s3/api_op_PutBucketCors.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -57,9 +56,9 @@ func (c *Client) PutBucketCors(ctx context.Context, params *PutBucketCorsInput, addawsRestxml_serdeOpPutBucketCorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -67,9 +66,9 @@ func (c *Client) PutBucketCors(ctx context.Context, params *PutBucketCorsInput, smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketCorsValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketCors(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutBucketEncryption.go b/service/s3/api_op_PutBucketEncryption.go index 9707ce63061..571c97698cc 100644 --- a/service/s3/api_op_PutBucketEncryption.go +++ b/service/s3/api_op_PutBucketEncryption.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) PutBucketEncryption(ctx context.Context, params *PutBucketEncry addawsRestxml_serdeOpPutBucketEncryptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -51,9 +50,9 @@ func (c *Client) PutBucketEncryption(ctx context.Context, params *PutBucketEncry smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketEncryptionValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketEncryption(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutBucketInventoryConfiguration.go b/service/s3/api_op_PutBucketInventoryConfiguration.go index ef3c54e7c25..669633362ae 100644 --- a/service/s3/api_op_PutBucketInventoryConfiguration.go +++ b/service/s3/api_op_PutBucketInventoryConfiguration.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -63,9 +62,9 @@ func (c *Client) PutBucketInventoryConfiguration(ctx context.Context, params *Pu addawsRestxml_serdeOpPutBucketInventoryConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -73,9 +72,9 @@ func (c *Client) PutBucketInventoryConfiguration(ctx context.Context, params *Pu smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketInventoryConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketInventoryConfiguration(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutBucketLifecycleConfiguration.go b/service/s3/api_op_PutBucketLifecycleConfiguration.go index bedd4000408..f2503fd7967 100644 --- a/service/s3/api_op_PutBucketLifecycleConfiguration.go +++ b/service/s3/api_op_PutBucketLifecycleConfiguration.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -67,9 +66,9 @@ func (c *Client) PutBucketLifecycleConfiguration(ctx context.Context, params *Pu addawsRestxml_serdeOpPutBucketLifecycleConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -77,9 +76,9 @@ func (c *Client) PutBucketLifecycleConfiguration(ctx context.Context, params *Pu smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketLifecycleConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketLifecycleConfiguration(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutBucketLogging.go b/service/s3/api_op_PutBucketLogging.go index 644ed59706a..ddfcc31daf5 100644 --- a/service/s3/api_op_PutBucketLogging.go +++ b/service/s3/api_op_PutBucketLogging.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -54,9 +53,9 @@ func (c *Client) PutBucketLogging(ctx context.Context, params *PutBucketLoggingI addawsRestxml_serdeOpPutBucketLoggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -64,9 +63,9 @@ func (c *Client) PutBucketLogging(ctx context.Context, params *PutBucketLoggingI smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketLoggingValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketLogging(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutBucketMetricsConfiguration.go b/service/s3/api_op_PutBucketMetricsConfiguration.go index bb1e8eb071a..43c2ff5b10f 100644 --- a/service/s3/api_op_PutBucketMetricsConfiguration.go +++ b/service/s3/api_op_PutBucketMetricsConfiguration.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) PutBucketMetricsConfiguration(ctx context.Context, params *PutB addawsRestxml_serdeOpPutBucketMetricsConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -56,9 +55,9 @@ func (c *Client) PutBucketMetricsConfiguration(ctx context.Context, params *PutB smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketMetricsConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketMetricsConfiguration(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutBucketNotificationConfiguration.go b/service/s3/api_op_PutBucketNotificationConfiguration.go index 2de07843098..dcd2a926d4c 100644 --- a/service/s3/api_op_PutBucketNotificationConfiguration.go +++ b/service/s3/api_op_PutBucketNotificationConfiguration.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -59,9 +58,9 @@ func (c *Client) PutBucketNotificationConfiguration(ctx context.Context, params addawsRestxml_serdeOpPutBucketNotificationConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -69,9 +68,9 @@ func (c *Client) PutBucketNotificationConfiguration(ctx context.Context, params smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketNotificationConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketNotificationConfiguration(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutBucketPolicy.go b/service/s3/api_op_PutBucketPolicy.go index 62485af045d..6a373c3e443 100644 --- a/service/s3/api_op_PutBucketPolicy.go +++ b/service/s3/api_op_PutBucketPolicy.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -37,9 +36,9 @@ func (c *Client) PutBucketPolicy(ctx context.Context, params *PutBucketPolicyInp addawsRestxml_serdeOpPutBucketPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -47,9 +46,9 @@ func (c *Client) PutBucketPolicy(ctx context.Context, params *PutBucketPolicyInp smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketPolicyValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketPolicy(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutBucketReplication.go b/service/s3/api_op_PutBucketReplication.go index 7cd8fe8bcca..43489b1ace1 100644 --- a/service/s3/api_op_PutBucketReplication.go +++ b/service/s3/api_op_PutBucketReplication.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -65,9 +64,9 @@ func (c *Client) PutBucketReplication(ctx context.Context, params *PutBucketRepl addawsRestxml_serdeOpPutBucketReplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -75,9 +74,9 @@ func (c *Client) PutBucketReplication(ctx context.Context, params *PutBucketRepl smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketReplicationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketReplication(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutBucketRequestPayment.go b/service/s3/api_op_PutBucketRequestPayment.go index 76d8a985d6e..e5fcd74003a 100644 --- a/service/s3/api_op_PutBucketRequestPayment.go +++ b/service/s3/api_op_PutBucketRequestPayment.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) PutBucketRequestPayment(ctx context.Context, params *PutBucketR addawsRestxml_serdeOpPutBucketRequestPaymentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -40,9 +39,9 @@ func (c *Client) PutBucketRequestPayment(ctx context.Context, params *PutBucketR smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketRequestPaymentValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketRequestPayment(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutBucketTagging.go b/service/s3/api_op_PutBucketTagging.go index a4d42271c4d..ffde517f4b1 100644 --- a/service/s3/api_op_PutBucketTagging.go +++ b/service/s3/api_op_PutBucketTagging.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -59,9 +58,9 @@ func (c *Client) PutBucketTagging(ctx context.Context, params *PutBucketTaggingI addawsRestxml_serdeOpPutBucketTaggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -69,9 +68,9 @@ func (c *Client) PutBucketTagging(ctx context.Context, params *PutBucketTaggingI smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketTaggingValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketTagging(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutBucketVersioning.go b/service/s3/api_op_PutBucketVersioning.go index 77fc187a781..29b4fa6e814 100644 --- a/service/s3/api_op_PutBucketVersioning.go +++ b/service/s3/api_op_PutBucketVersioning.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) PutBucketVersioning(ctx context.Context, params *PutBucketVersi addawsRestxml_serdeOpPutBucketVersioningMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -55,9 +54,9 @@ func (c *Client) PutBucketVersioning(ctx context.Context, params *PutBucketVersi smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketVersioningValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketVersioning(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutBucketWebsite.go b/service/s3/api_op_PutBucketWebsite.go index 44bd114f17d..3c62377dd8f 100644 --- a/service/s3/api_op_PutBucketWebsite.go +++ b/service/s3/api_op_PutBucketWebsite.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -59,9 +58,9 @@ func (c *Client) PutBucketWebsite(ctx context.Context, params *PutBucketWebsiteI addawsRestxml_serdeOpPutBucketWebsiteMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -69,9 +68,9 @@ func (c *Client) PutBucketWebsite(ctx context.Context, params *PutBucketWebsiteI smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketWebsiteValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketWebsite(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutObject.go b/service/s3/api_op_PutObject.go index b0a0dd30aca..a532a848efd 100644 --- a/service/s3/api_op_PutObject.go +++ b/service/s3/api_op_PutObject.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -74,9 +73,9 @@ func (c *Client) PutObject(ctx context.Context, params *PutObjectInput, optFns . addawsRestxml_serdeOpPutObjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -84,9 +83,9 @@ func (c *Client) PutObject(ctx context.Context, params *PutObjectInput, optFns . smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutObjectValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutObject(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutObjectAcl.go b/service/s3/api_op_PutObjectAcl.go index ef48da922f8..749dad9e1a9 100644 --- a/service/s3/api_op_PutObjectAcl.go +++ b/service/s3/api_op_PutObjectAcl.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -94,9 +93,9 @@ func (c *Client) PutObjectAcl(ctx context.Context, params *PutObjectAclInput, op addawsRestxml_serdeOpPutObjectAclMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -104,9 +103,9 @@ func (c *Client) PutObjectAcl(ctx context.Context, params *PutObjectAclInput, op smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutObjectAclValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutObjectAcl(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutObjectLegalHold.go b/service/s3/api_op_PutObjectLegalHold.go index 25a64e8f98a..b895793296e 100644 --- a/service/s3/api_op_PutObjectLegalHold.go +++ b/service/s3/api_op_PutObjectLegalHold.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) PutObjectLegalHold(ctx context.Context, params *PutObjectLegalH addawsRestxml_serdeOpPutObjectLegalHoldMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -37,9 +36,9 @@ func (c *Client) PutObjectLegalHold(ctx context.Context, params *PutObjectLegalH smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutObjectLegalHoldValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutObjectLegalHold(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutObjectLockConfiguration.go b/service/s3/api_op_PutObjectLockConfiguration.go index 1db3b388ebd..14d2dae5512 100644 --- a/service/s3/api_op_PutObjectLockConfiguration.go +++ b/service/s3/api_op_PutObjectLockConfiguration.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) PutObjectLockConfiguration(ctx context.Context, params *PutObje addawsRestxml_serdeOpPutObjectLockConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -39,9 +38,9 @@ func (c *Client) PutObjectLockConfiguration(ctx context.Context, params *PutObje smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutObjectLockConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutObjectLockConfiguration(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutObjectRetention.go b/service/s3/api_op_PutObjectRetention.go index 1405af26d48..8e478dd9d2f 100644 --- a/service/s3/api_op_PutObjectRetention.go +++ b/service/s3/api_op_PutObjectRetention.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) PutObjectRetention(ctx context.Context, params *PutObjectRetent addawsRestxml_serdeOpPutObjectRetentionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -37,9 +36,9 @@ func (c *Client) PutObjectRetention(ctx context.Context, params *PutObjectRetent smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutObjectRetentionValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutObjectRetention(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutObjectTagging.go b/service/s3/api_op_PutObjectTagging.go index a616bb242bf..591ccf5cf23 100644 --- a/service/s3/api_op_PutObjectTagging.go +++ b/service/s3/api_op_PutObjectTagging.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -52,9 +51,9 @@ func (c *Client) PutObjectTagging(ctx context.Context, params *PutObjectTaggingI addawsRestxml_serdeOpPutObjectTaggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -62,9 +61,9 @@ func (c *Client) PutObjectTagging(ctx context.Context, params *PutObjectTaggingI smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutObjectTaggingValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutObjectTagging(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_PutPublicAccessBlock.go b/service/s3/api_op_PutPublicAccessBlock.go index b9ab632d0da..0dd162c77ff 100644 --- a/service/s3/api_op_PutPublicAccessBlock.go +++ b/service/s3/api_op_PutPublicAccessBlock.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) PutPublicAccessBlock(ctx context.Context, params *PutPublicAcce addawsRestxml_serdeOpPutPublicAccessBlockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -52,9 +51,9 @@ func (c *Client) PutPublicAccessBlock(ctx context.Context, params *PutPublicAcce smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutPublicAccessBlockValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutPublicAccessBlock(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_RestoreObject.go b/service/s3/api_op_RestoreObject.go index cbbb6ee9c7e..7f2ffbfbb28 100644 --- a/service/s3/api_op_RestoreObject.go +++ b/service/s3/api_op_RestoreObject.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -231,9 +230,9 @@ func (c *Client) RestoreObject(ctx context.Context, params *RestoreObjectInput, addawsRestxml_serdeOpRestoreObjectMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -241,9 +240,9 @@ func (c *Client) RestoreObject(ctx context.Context, params *RestoreObjectInput, smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpRestoreObjectValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opRestoreObject(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_UploadPart.go b/service/s3/api_op_UploadPart.go index 6a9782b67d4..a9fa93ba047 100644 --- a/service/s3/api_op_UploadPart.go +++ b/service/s3/api_op_UploadPart.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/awslabs/smithy-go" @@ -81,9 +80,9 @@ func (c *Client) UploadPart(ctx context.Context, params *UploadPartInput, optFns addawsRestxml_serdeOpUploadPartMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -91,9 +90,9 @@ func (c *Client) UploadPart(ctx context.Context, params *UploadPartInput, optFns smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpUploadPartValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opUploadPart(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) diff --git a/service/s3/api_op_UploadPartCopy.go b/service/s3/api_op_UploadPartCopy.go index afa1bcf6cb9..de8290aa2ad 100644 --- a/service/s3/api_op_UploadPartCopy.go +++ b/service/s3/api_op_UploadPartCopy.go @@ -5,7 +5,6 @@ package s3 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -94,9 +93,9 @@ func (c *Client) UploadPartCopy(ctx context.Context, params *UploadPartCopyInput addawsRestxml_serdeOpUploadPartCopyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -104,9 +103,9 @@ func (c *Client) UploadPartCopy(ctx context.Context, params *UploadPartCopyInput smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpUploadPartCopyValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opUploadPartCopy(options.Region), middleware.Before) + addMetadataRetrieverMiddleware(stack) addUpdateEndpointMiddleware(stack, options) addResponseErrorMiddleware(stack) - addMetadataRetrieverMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) disableAcceptEncodingGzip(stack) s3cust.HandleResponseErrorWith200Status(stack) diff --git a/service/s3/endpoints.go b/service/s3/endpoints.go index bbe27abde37..a1f67191abf 100644 --- a/service/s3/endpoints.go +++ b/service/s3/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/s3control/api_client.go b/service/s3control/api_client.go index 9c576e70cd9..ac0bc76b094 100644 --- a/service/s3control/api_client.go +++ b/service/s3control/api_client.go @@ -85,34 +85,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -185,15 +157,22 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) } -func addResponseErrorMiddleware(stack *middleware.Stack) { - s3shared.AddResponseErrorMiddleware(stack) -} - func addMetadataRetrieverMiddleware(stack *middleware.Stack) { s3shared.AddMetadataRetrieverMiddleware(stack) } + +func addResponseErrorMiddleware(stack *middleware.Stack) { + s3shared.AddResponseErrorMiddleware(stack) +} diff --git a/service/s3control/api_op_CreateAccessPoint.go b/service/s3control/api_op_CreateAccessPoint.go index d6183d0f8eb..c3c822c1b9f 100644 --- a/service/s3control/api_op_CreateAccessPoint.go +++ b/service/s3control/api_op_CreateAccessPoint.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3control/types" smithy "github.com/awslabs/smithy-go" @@ -61,9 +60,9 @@ func (c *Client) CreateAccessPoint(ctx context.Context, params *CreateAccessPoin addawsRestxml_serdeOpCreateAccessPointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -71,8 +70,8 @@ func (c *Client) CreateAccessPoint(ctx context.Context, params *CreateAccessPoin smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpCreateAccessPointValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opCreateAccessPoint(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_CreateBucket.go b/service/s3control/api_op_CreateBucket.go index 51fbd413594..0021db79d91 100644 --- a/service/s3control/api_op_CreateBucket.go +++ b/service/s3control/api_op_CreateBucket.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3control/types" smithy "github.com/awslabs/smithy-go" @@ -52,9 +51,9 @@ func (c *Client) CreateBucket(ctx context.Context, params *CreateBucketInput, op addawsRestxml_serdeOpCreateBucketMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -62,8 +61,8 @@ func (c *Client) CreateBucket(ctx context.Context, params *CreateBucketInput, op smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpCreateBucketValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opCreateBucket(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_CreateJob.go b/service/s3control/api_op_CreateJob.go index f6756a6887b..72774082eb4 100644 --- a/service/s3control/api_op_CreateJob.go +++ b/service/s3control/api_op_CreateJob.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3control/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) CreateJob(ctx context.Context, params *CreateJobInput, optFns . addawsRestxml_serdeOpCreateJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -55,8 +54,8 @@ func (c *Client) CreateJob(ctx context.Context, params *CreateJobInput, optFns . addIdempotencyToken_opCreateJobMiddleware(stack, options) addOpCreateJobValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opCreateJob(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_DeleteAccessPoint.go b/service/s3control/api_op_DeleteAccessPoint.go index 643c79018ce..00284e4bb89 100644 --- a/service/s3control/api_op_DeleteAccessPoint.go +++ b/service/s3control/api_op_DeleteAccessPoint.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -36,9 +35,9 @@ func (c *Client) DeleteAccessPoint(ctx context.Context, params *DeleteAccessPoin addawsRestxml_serdeOpDeleteAccessPointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -46,8 +45,8 @@ func (c *Client) DeleteAccessPoint(ctx context.Context, params *DeleteAccessPoin smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteAccessPointValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteAccessPoint(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_DeleteAccessPointPolicy.go b/service/s3control/api_op_DeleteAccessPointPolicy.go index c8d8cf3a55c..357a92af84d 100644 --- a/service/s3control/api_op_DeleteAccessPointPolicy.go +++ b/service/s3control/api_op_DeleteAccessPointPolicy.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -37,9 +36,9 @@ func (c *Client) DeleteAccessPointPolicy(ctx context.Context, params *DeleteAcce addawsRestxml_serdeOpDeleteAccessPointPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -47,8 +46,8 @@ func (c *Client) DeleteAccessPointPolicy(ctx context.Context, params *DeleteAcce smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteAccessPointPolicyValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteAccessPointPolicy(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_DeleteBucket.go b/service/s3control/api_op_DeleteBucket.go index b7b4823fa44..9a63187cd1a 100644 --- a/service/s3control/api_op_DeleteBucket.go +++ b/service/s3control/api_op_DeleteBucket.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -48,9 +47,9 @@ func (c *Client) DeleteBucket(ctx context.Context, params *DeleteBucketInput, op addawsRestxml_serdeOpDeleteBucketMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -58,8 +57,8 @@ func (c *Client) DeleteBucket(ctx context.Context, params *DeleteBucketInput, op smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteBucketValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteBucket(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_DeleteBucketLifecycleConfiguration.go b/service/s3control/api_op_DeleteBucketLifecycleConfiguration.go index f91638e984e..47f533ec069 100644 --- a/service/s3control/api_op_DeleteBucketLifecycleConfiguration.go +++ b/service/s3control/api_op_DeleteBucketLifecycleConfiguration.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -50,9 +49,9 @@ func (c *Client) DeleteBucketLifecycleConfiguration(ctx context.Context, params addawsRestxml_serdeOpDeleteBucketLifecycleConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -60,8 +59,8 @@ func (c *Client) DeleteBucketLifecycleConfiguration(ctx context.Context, params smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteBucketLifecycleConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteBucketLifecycleConfiguration(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_DeleteBucketPolicy.go b/service/s3control/api_op_DeleteBucketPolicy.go index 2e77cc60591..9e91d68f918 100644 --- a/service/s3control/api_op_DeleteBucketPolicy.go +++ b/service/s3control/api_op_DeleteBucketPolicy.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -55,9 +54,9 @@ func (c *Client) DeleteBucketPolicy(ctx context.Context, params *DeleteBucketPol addawsRestxml_serdeOpDeleteBucketPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -65,8 +64,8 @@ func (c *Client) DeleteBucketPolicy(ctx context.Context, params *DeleteBucketPol smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteBucketPolicyValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteBucketPolicy(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_DeleteBucketTagging.go b/service/s3control/api_op_DeleteBucketTagging.go index 5ba4e167e64..75a735bc33e 100644 --- a/service/s3control/api_op_DeleteBucketTagging.go +++ b/service/s3control/api_op_DeleteBucketTagging.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -43,9 +42,9 @@ func (c *Client) DeleteBucketTagging(ctx context.Context, params *DeleteBucketTa addawsRestxml_serdeOpDeleteBucketTaggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -53,8 +52,8 @@ func (c *Client) DeleteBucketTagging(ctx context.Context, params *DeleteBucketTa smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteBucketTaggingValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteBucketTagging(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_DeleteJobTagging.go b/service/s3control/api_op_DeleteJobTagging.go index 8ee65720fb9..afafd2a6c53 100644 --- a/service/s3control/api_op_DeleteJobTagging.go +++ b/service/s3control/api_op_DeleteJobTagging.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -39,9 +38,9 @@ func (c *Client) DeleteJobTagging(ctx context.Context, params *DeleteJobTaggingI addawsRestxml_serdeOpDeleteJobTaggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -49,8 +48,8 @@ func (c *Client) DeleteJobTagging(ctx context.Context, params *DeleteJobTaggingI smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeleteJobTaggingValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteJobTagging(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_DeletePublicAccessBlock.go b/service/s3control/api_op_DeletePublicAccessBlock.go index e83cdd566c5..8f66ccc85bb 100644 --- a/service/s3control/api_op_DeletePublicAccessBlock.go +++ b/service/s3control/api_op_DeletePublicAccessBlock.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) DeletePublicAccessBlock(ctx context.Context, params *DeletePubl addawsRestxml_serdeOpDeletePublicAccessBlockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -42,8 +41,8 @@ func (c *Client) DeletePublicAccessBlock(ctx context.Context, params *DeletePubl smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDeletePublicAccessBlockValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDeletePublicAccessBlock(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_DescribeJob.go b/service/s3control/api_op_DescribeJob.go index fffc6ef1b45..0980fe46135 100644 --- a/service/s3control/api_op_DescribeJob.go +++ b/service/s3control/api_op_DescribeJob.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3control/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) DescribeJob(ctx context.Context, params *DescribeJobInput, optF addawsRestxml_serdeOpDescribeJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -52,8 +51,8 @@ func (c *Client) DescribeJob(ctx context.Context, params *DescribeJobInput, optF smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpDescribeJobValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opDescribeJob(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_GetAccessPoint.go b/service/s3control/api_op_GetAccessPoint.go index e6556e6d50d..a1481473c70 100644 --- a/service/s3control/api_op_GetAccessPoint.go +++ b/service/s3control/api_op_GetAccessPoint.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3control/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) GetAccessPoint(ctx context.Context, params *GetAccessPointInput addawsRestxml_serdeOpGetAccessPointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -48,8 +47,8 @@ func (c *Client) GetAccessPoint(ctx context.Context, params *GetAccessPointInput smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetAccessPointValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetAccessPoint(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_GetAccessPointPolicy.go b/service/s3control/api_op_GetAccessPointPolicy.go index 804ba6e92d9..5ed5b09b563 100644 --- a/service/s3control/api_op_GetAccessPointPolicy.go +++ b/service/s3control/api_op_GetAccessPointPolicy.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) GetAccessPointPolicy(ctx context.Context, params *GetAccessPoin addawsRestxml_serdeOpGetAccessPointPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -41,8 +40,8 @@ func (c *Client) GetAccessPointPolicy(ctx context.Context, params *GetAccessPoin smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetAccessPointPolicyValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetAccessPointPolicy(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_GetAccessPointPolicyStatus.go b/service/s3control/api_op_GetAccessPointPolicyStatus.go index 552bbbcf84a..fcb09ba06e0 100644 --- a/service/s3control/api_op_GetAccessPointPolicyStatus.go +++ b/service/s3control/api_op_GetAccessPointPolicyStatus.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3control/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetAccessPointPolicyStatus(ctx context.Context, params *GetAcce addawsRestxml_serdeOpGetAccessPointPolicyStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -37,8 +36,8 @@ func (c *Client) GetAccessPointPolicyStatus(ctx context.Context, params *GetAcce smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetAccessPointPolicyStatusValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetAccessPointPolicyStatus(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_GetBucket.go b/service/s3control/api_op_GetBucket.go index 88ad3c4fdbb..942b8e8e932 100644 --- a/service/s3control/api_op_GetBucket.go +++ b/service/s3control/api_op_GetBucket.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -37,9 +36,9 @@ func (c *Client) GetBucket(ctx context.Context, params *GetBucketInput, optFns . addawsRestxml_serdeOpGetBucketMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -47,8 +46,8 @@ func (c *Client) GetBucket(ctx context.Context, params *GetBucketInput, optFns . smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucket(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_GetBucketLifecycleConfiguration.go b/service/s3control/api_op_GetBucketLifecycleConfiguration.go index 7e522a79736..59e6abc8304 100644 --- a/service/s3control/api_op_GetBucketLifecycleConfiguration.go +++ b/service/s3control/api_op_GetBucketLifecycleConfiguration.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3control/types" smithy "github.com/awslabs/smithy-go" @@ -58,9 +57,9 @@ func (c *Client) GetBucketLifecycleConfiguration(ctx context.Context, params *Ge addawsRestxml_serdeOpGetBucketLifecycleConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -68,8 +67,8 @@ func (c *Client) GetBucketLifecycleConfiguration(ctx context.Context, params *Ge smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketLifecycleConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketLifecycleConfiguration(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_GetBucketPolicy.go b/service/s3control/api_op_GetBucketPolicy.go index 52855e26bc6..62bcb12373e 100644 --- a/service/s3control/api_op_GetBucketPolicy.go +++ b/service/s3control/api_op_GetBucketPolicy.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -55,9 +54,9 @@ func (c *Client) GetBucketPolicy(ctx context.Context, params *GetBucketPolicyInp addawsRestxml_serdeOpGetBucketPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -65,8 +64,8 @@ func (c *Client) GetBucketPolicy(ctx context.Context, params *GetBucketPolicyInp smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketPolicyValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketPolicy(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_GetBucketTagging.go b/service/s3control/api_op_GetBucketTagging.go index bea9a1d2f6d..4aea5d3a117 100644 --- a/service/s3control/api_op_GetBucketTagging.go +++ b/service/s3control/api_op_GetBucketTagging.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3control/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) GetBucketTagging(ctx context.Context, params *GetBucketTaggingI addawsRestxml_serdeOpGetBucketTaggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -57,8 +56,8 @@ func (c *Client) GetBucketTagging(ctx context.Context, params *GetBucketTaggingI smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetBucketTaggingValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetBucketTagging(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_GetJobTagging.go b/service/s3control/api_op_GetJobTagging.go index 1b06ee3eed4..c5663c8bb79 100644 --- a/service/s3control/api_op_GetJobTagging.go +++ b/service/s3control/api_op_GetJobTagging.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3control/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) GetJobTagging(ctx context.Context, params *GetJobTaggingInput, addawsRestxml_serdeOpGetJobTaggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -49,8 +48,8 @@ func (c *Client) GetJobTagging(ctx context.Context, params *GetJobTaggingInput, smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetJobTaggingValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetJobTagging(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_GetPublicAccessBlock.go b/service/s3control/api_op_GetPublicAccessBlock.go index c5d70f8db30..aae928553e1 100644 --- a/service/s3control/api_op_GetPublicAccessBlock.go +++ b/service/s3control/api_op_GetPublicAccessBlock.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3control/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) GetPublicAccessBlock(ctx context.Context, params *GetPublicAcce addawsRestxml_serdeOpGetPublicAccessBlockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -43,8 +42,8 @@ func (c *Client) GetPublicAccessBlock(ctx context.Context, params *GetPublicAcce smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpGetPublicAccessBlockValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opGetPublicAccessBlock(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_ListAccessPoints.go b/service/s3control/api_op_ListAccessPoints.go index b5f81f8968c..488cce1bc9d 100644 --- a/service/s3control/api_op_ListAccessPoints.go +++ b/service/s3control/api_op_ListAccessPoints.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3control/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) ListAccessPoints(ctx context.Context, params *ListAccessPointsI addawsRestxml_serdeOpListAccessPointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -56,8 +55,8 @@ func (c *Client) ListAccessPoints(ctx context.Context, params *ListAccessPointsI smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpListAccessPointsValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opListAccessPoints(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_ListJobs.go b/service/s3control/api_op_ListJobs.go index 8733df6ae8c..e321251ca7e 100644 --- a/service/s3control/api_op_ListJobs.go +++ b/service/s3control/api_op_ListJobs.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3control/types" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) ListJobs(ctx context.Context, params *ListJobsInput, optFns ... addawsRestxml_serdeOpListJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -53,8 +52,8 @@ func (c *Client) ListJobs(ctx context.Context, params *ListJobsInput, optFns ... smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpListJobsValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opListJobs(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_ListRegionalBuckets.go b/service/s3control/api_op_ListRegionalBuckets.go index 906ce189920..0e31d3fe655 100644 --- a/service/s3control/api_op_ListRegionalBuckets.go +++ b/service/s3control/api_op_ListRegionalBuckets.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3control/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListRegionalBuckets(ctx context.Context, params *ListRegionalBu addawsRestxml_serdeOpListRegionalBucketsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -40,8 +39,8 @@ func (c *Client) ListRegionalBuckets(ctx context.Context, params *ListRegionalBu smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpListRegionalBucketsValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opListRegionalBuckets(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_PutAccessPointPolicy.go b/service/s3control/api_op_PutAccessPointPolicy.go index 6a40747d67b..e8790439133 100644 --- a/service/s3control/api_op_PutAccessPointPolicy.go +++ b/service/s3control/api_op_PutAccessPointPolicy.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -39,9 +38,9 @@ func (c *Client) PutAccessPointPolicy(ctx context.Context, params *PutAccessPoin addawsRestxml_serdeOpPutAccessPointPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -49,8 +48,8 @@ func (c *Client) PutAccessPointPolicy(ctx context.Context, params *PutAccessPoin smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutAccessPointPolicyValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutAccessPointPolicy(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_PutBucketLifecycleConfiguration.go b/service/s3control/api_op_PutBucketLifecycleConfiguration.go index 98e4094e4d0..4fef095b144 100644 --- a/service/s3control/api_op_PutBucketLifecycleConfiguration.go +++ b/service/s3control/api_op_PutBucketLifecycleConfiguration.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3control/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) PutBucketLifecycleConfiguration(ctx context.Context, params *Pu addawsRestxml_serdeOpPutBucketLifecycleConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -57,8 +56,8 @@ func (c *Client) PutBucketLifecycleConfiguration(ctx context.Context, params *Pu smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketLifecycleConfigurationValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketLifecycleConfiguration(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_PutBucketPolicy.go b/service/s3control/api_op_PutBucketPolicy.go index 27d0b4b06c6..0661a57e831 100644 --- a/service/s3control/api_op_PutBucketPolicy.go +++ b/service/s3control/api_op_PutBucketPolicy.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -53,9 +52,9 @@ func (c *Client) PutBucketPolicy(ctx context.Context, params *PutBucketPolicyInp addawsRestxml_serdeOpPutBucketPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -63,8 +62,8 @@ func (c *Client) PutBucketPolicy(ctx context.Context, params *PutBucketPolicyInp smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketPolicyValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketPolicy(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_PutBucketTagging.go b/service/s3control/api_op_PutBucketTagging.go index 1a338ba2e65..712837bbbed 100644 --- a/service/s3control/api_op_PutBucketTagging.go +++ b/service/s3control/api_op_PutBucketTagging.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3control/types" smithy "github.com/awslabs/smithy-go" @@ -76,9 +75,9 @@ func (c *Client) PutBucketTagging(ctx context.Context, params *PutBucketTaggingI addawsRestxml_serdeOpPutBucketTaggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -86,8 +85,8 @@ func (c *Client) PutBucketTagging(ctx context.Context, params *PutBucketTaggingI smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutBucketTaggingValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutBucketTagging(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_PutJobTagging.go b/service/s3control/api_op_PutJobTagging.go index 5312da44762..f7950f4f160 100644 --- a/service/s3control/api_op_PutJobTagging.go +++ b/service/s3control/api_op_PutJobTagging.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3control/types" smithy "github.com/awslabs/smithy-go" @@ -81,9 +80,9 @@ func (c *Client) PutJobTagging(ctx context.Context, params *PutJobTaggingInput, addawsRestxml_serdeOpPutJobTaggingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -91,8 +90,8 @@ func (c *Client) PutJobTagging(ctx context.Context, params *PutJobTaggingInput, smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutJobTaggingValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutJobTagging(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_PutPublicAccessBlock.go b/service/s3control/api_op_PutPublicAccessBlock.go index 1b9c6403df1..9705e8ccd45 100644 --- a/service/s3control/api_op_PutPublicAccessBlock.go +++ b/service/s3control/api_op_PutPublicAccessBlock.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3control/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) PutPublicAccessBlock(ctx context.Context, params *PutPublicAcce addawsRestxml_serdeOpPutPublicAccessBlockMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -43,8 +42,8 @@ func (c *Client) PutPublicAccessBlock(ctx context.Context, params *PutPublicAcce smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpPutPublicAccessBlockValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opPutPublicAccessBlock(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_UpdateJobPriority.go b/service/s3control/api_op_UpdateJobPriority.go index 78ab8022834..f32add58cf7 100644 --- a/service/s3control/api_op_UpdateJobPriority.go +++ b/service/s3control/api_op_UpdateJobPriority.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) UpdateJobPriority(ctx context.Context, params *UpdateJobPriorit addawsRestxml_serdeOpUpdateJobPriorityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -51,8 +50,8 @@ func (c *Client) UpdateJobPriority(ctx context.Context, params *UpdateJobPriorit smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpUpdateJobPriorityValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opUpdateJobPriority(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/api_op_UpdateJobStatus.go b/service/s3control/api_op_UpdateJobStatus.go index 6866caf8f7a..1a3407712e3 100644 --- a/service/s3control/api_op_UpdateJobStatus.go +++ b/service/s3control/api_op_UpdateJobStatus.go @@ -5,7 +5,6 @@ package s3control import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/s3control/types" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) UpdateJobStatus(ctx context.Context, params *UpdateJobStatusInp addawsRestxml_serdeOpUpdateJobStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) @@ -53,8 +52,8 @@ func (c *Client) UpdateJobStatus(ctx context.Context, params *UpdateJobStatusInp smithyhttp.AddCloseResponseBodyMiddleware(stack) addOpUpdateJobStatusValidationMiddleware(stack) stack.Initialize.Add(newServiceMetadataMiddleware_opUpdateJobStatus(options.Region), middleware.Before) - addResponseErrorMiddleware(stack) addMetadataRetrieverMiddleware(stack) + addResponseErrorMiddleware(stack) v4.AddContentSHA256HeaderMiddleware(stack) for _, fn := range options.APIOptions { diff --git a/service/s3control/endpoints.go b/service/s3control/endpoints.go index a9226c07607..817f50ed50f 100644 --- a/service/s3control/endpoints.go +++ b/service/s3control/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/sagemaker/api_client.go b/service/sagemaker/api_client.go index ad7a7716a05..df809f34e8b 100644 --- a/service/sagemaker/api_client.go +++ b/service/sagemaker/api_client.go @@ -85,30 +85,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -174,6 +150,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/sagemaker/api_op_AddTags.go b/service/sagemaker/api_op_AddTags.go index c1eea848b24..7d409847818 100644 --- a/service/sagemaker/api_op_AddTags.go +++ b/service/sagemaker/api_op_AddTags.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) AddTags(ctx context.Context, params *AddTagsInput, optFns ...fu addawsAwsjson11_serdeOpAddTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_AssociateTrialComponent.go b/service/sagemaker/api_op_AssociateTrialComponent.go index 93dd690e2f4..723347a4e2b 100644 --- a/service/sagemaker/api_op_AssociateTrialComponent.go +++ b/service/sagemaker/api_op_AssociateTrialComponent.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) AssociateTrialComponent(ctx context.Context, params *AssociateT addawsAwsjson11_serdeOpAssociateTrialComponentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateAlgorithm.go b/service/sagemaker/api_op_CreateAlgorithm.go index 1b5eae3b6d4..0432e0d0203 100644 --- a/service/sagemaker/api_op_CreateAlgorithm.go +++ b/service/sagemaker/api_op_CreateAlgorithm.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateAlgorithm(ctx context.Context, params *CreateAlgorithmInp addawsAwsjson11_serdeOpCreateAlgorithmMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateApp.go b/service/sagemaker/api_op_CreateApp.go index 8a18ab5fed7..59b35f30f8d 100644 --- a/service/sagemaker/api_op_CreateApp.go +++ b/service/sagemaker/api_op_CreateApp.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateApp(ctx context.Context, params *CreateAppInput, optFns . addawsAwsjson11_serdeOpCreateAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateAutoMLJob.go b/service/sagemaker/api_op_CreateAutoMLJob.go index fa319b909dc..0909bfe5ac8 100644 --- a/service/sagemaker/api_op_CreateAutoMLJob.go +++ b/service/sagemaker/api_op_CreateAutoMLJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateAutoMLJob(ctx context.Context, params *CreateAutoMLJobInp addawsAwsjson11_serdeOpCreateAutoMLJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateCodeRepository.go b/service/sagemaker/api_op_CreateCodeRepository.go index b51907fd0ea..4a9a55ab36a 100644 --- a/service/sagemaker/api_op_CreateCodeRepository.go +++ b/service/sagemaker/api_op_CreateCodeRepository.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateCodeRepository(ctx context.Context, params *CreateCodeRep addawsAwsjson11_serdeOpCreateCodeRepositoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateCompilationJob.go b/service/sagemaker/api_op_CreateCompilationJob.go index 3d54339b9bd..bb090b109ce 100644 --- a/service/sagemaker/api_op_CreateCompilationJob.go +++ b/service/sagemaker/api_op_CreateCompilationJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -48,9 +47,9 @@ func (c *Client) CreateCompilationJob(ctx context.Context, params *CreateCompila addawsAwsjson11_serdeOpCreateCompilationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateDomain.go b/service/sagemaker/api_op_CreateDomain.go index 33faef543ac..d3b95688630 100644 --- a/service/sagemaker/api_op_CreateDomain.go +++ b/service/sagemaker/api_op_CreateDomain.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) CreateDomain(ctx context.Context, params *CreateDomainInput, op addawsAwsjson11_serdeOpCreateDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateEndpoint.go b/service/sagemaker/api_op_CreateEndpoint.go index 15f7c9d0edc..b76e273ac06 100644 --- a/service/sagemaker/api_op_CreateEndpoint.go +++ b/service/sagemaker/api_op_CreateEndpoint.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -60,9 +59,9 @@ func (c *Client) CreateEndpoint(ctx context.Context, params *CreateEndpointInput addawsAwsjson11_serdeOpCreateEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateEndpointConfig.go b/service/sagemaker/api_op_CreateEndpointConfig.go index 764fc81f8a9..f16f9463594 100644 --- a/service/sagemaker/api_op_CreateEndpointConfig.go +++ b/service/sagemaker/api_op_CreateEndpointConfig.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -50,9 +49,9 @@ func (c *Client) CreateEndpointConfig(ctx context.Context, params *CreateEndpoin addawsAwsjson11_serdeOpCreateEndpointConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateExperiment.go b/service/sagemaker/api_op_CreateExperiment.go index 3ec5528eec8..748da994675 100644 --- a/service/sagemaker/api_op_CreateExperiment.go +++ b/service/sagemaker/api_op_CreateExperiment.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) CreateExperiment(ctx context.Context, params *CreateExperimentI addawsAwsjson11_serdeOpCreateExperimentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateFlowDefinition.go b/service/sagemaker/api_op_CreateFlowDefinition.go index 1a97337c933..296eff5dedc 100644 --- a/service/sagemaker/api_op_CreateFlowDefinition.go +++ b/service/sagemaker/api_op_CreateFlowDefinition.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateFlowDefinition(ctx context.Context, params *CreateFlowDef addawsAwsjson11_serdeOpCreateFlowDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateHumanTaskUi.go b/service/sagemaker/api_op_CreateHumanTaskUi.go index 757aaed7599..3bc57265a31 100644 --- a/service/sagemaker/api_op_CreateHumanTaskUi.go +++ b/service/sagemaker/api_op_CreateHumanTaskUi.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateHumanTaskUi(ctx context.Context, params *CreateHumanTaskU addawsAwsjson11_serdeOpCreateHumanTaskUiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateHyperParameterTuningJob.go b/service/sagemaker/api_op_CreateHyperParameterTuningJob.go index fe091145aba..5bd187f576d 100644 --- a/service/sagemaker/api_op_CreateHyperParameterTuningJob.go +++ b/service/sagemaker/api_op_CreateHyperParameterTuningJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateHyperParameterTuningJob(ctx context.Context, params *Crea addawsAwsjson11_serdeOpCreateHyperParameterTuningJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateLabelingJob.go b/service/sagemaker/api_op_CreateLabelingJob.go index 82fbc2f80ba..1942409005b 100644 --- a/service/sagemaker/api_op_CreateLabelingJob.go +++ b/service/sagemaker/api_op_CreateLabelingJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -51,9 +50,9 @@ func (c *Client) CreateLabelingJob(ctx context.Context, params *CreateLabelingJo addawsAwsjson11_serdeOpCreateLabelingJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateModel.go b/service/sagemaker/api_op_CreateModel.go index 321e5dda5b3..596822788c2 100644 --- a/service/sagemaker/api_op_CreateModel.go +++ b/service/sagemaker/api_op_CreateModel.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) CreateModel(ctx context.Context, params *CreateModelInput, optF addawsAwsjson11_serdeOpCreateModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateModelPackage.go b/service/sagemaker/api_op_CreateModelPackage.go index 92a8ca85131..13134a57f24 100644 --- a/service/sagemaker/api_op_CreateModelPackage.go +++ b/service/sagemaker/api_op_CreateModelPackage.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateModelPackage(ctx context.Context, params *CreateModelPack addawsAwsjson11_serdeOpCreateModelPackageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateMonitoringSchedule.go b/service/sagemaker/api_op_CreateMonitoringSchedule.go index 38e70a97e0f..f67fc0d68f8 100644 --- a/service/sagemaker/api_op_CreateMonitoringSchedule.go +++ b/service/sagemaker/api_op_CreateMonitoringSchedule.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateMonitoringSchedule(ctx context.Context, params *CreateMon addawsAwsjson11_serdeOpCreateMonitoringScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateNotebookInstance.go b/service/sagemaker/api_op_CreateNotebookInstance.go index 797bcd1c2ef..1951db8e33a 100644 --- a/service/sagemaker/api_op_CreateNotebookInstance.go +++ b/service/sagemaker/api_op_CreateNotebookInstance.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -54,9 +53,9 @@ func (c *Client) CreateNotebookInstance(ctx context.Context, params *CreateNoteb addawsAwsjson11_serdeOpCreateNotebookInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateNotebookInstanceLifecycleConfig.go b/service/sagemaker/api_op_CreateNotebookInstanceLifecycleConfig.go index 4af9a8a33d5..90b0ce48c00 100644 --- a/service/sagemaker/api_op_CreateNotebookInstanceLifecycleConfig.go +++ b/service/sagemaker/api_op_CreateNotebookInstanceLifecycleConfig.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) CreateNotebookInstanceLifecycleConfig(ctx context.Context, para addawsAwsjson11_serdeOpCreateNotebookInstanceLifecycleConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreatePresignedDomainUrl.go b/service/sagemaker/api_op_CreatePresignedDomainUrl.go index 1ddf6406c8e..51c028d400f 100644 --- a/service/sagemaker/api_op_CreatePresignedDomainUrl.go +++ b/service/sagemaker/api_op_CreatePresignedDomainUrl.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) CreatePresignedDomainUrl(ctx context.Context, params *CreatePre addawsAwsjson11_serdeOpCreatePresignedDomainUrlMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreatePresignedNotebookInstanceUrl.go b/service/sagemaker/api_op_CreatePresignedNotebookInstanceUrl.go index fe51f8df121..fb6a9695f34 100644 --- a/service/sagemaker/api_op_CreatePresignedNotebookInstanceUrl.go +++ b/service/sagemaker/api_op_CreatePresignedNotebookInstanceUrl.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -39,9 +38,9 @@ func (c *Client) CreatePresignedNotebookInstanceUrl(ctx context.Context, params addawsAwsjson11_serdeOpCreatePresignedNotebookInstanceUrlMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateProcessingJob.go b/service/sagemaker/api_op_CreateProcessingJob.go index 4120d5f9d4f..69239a93261 100644 --- a/service/sagemaker/api_op_CreateProcessingJob.go +++ b/service/sagemaker/api_op_CreateProcessingJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateProcessingJob(ctx context.Context, params *CreateProcessi addawsAwsjson11_serdeOpCreateProcessingJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateTrainingJob.go b/service/sagemaker/api_op_CreateTrainingJob.go index 7f3c9d23746..e6e139f5fc6 100644 --- a/service/sagemaker/api_op_CreateTrainingJob.go +++ b/service/sagemaker/api_op_CreateTrainingJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -57,9 +56,9 @@ func (c *Client) CreateTrainingJob(ctx context.Context, params *CreateTrainingJo addawsAwsjson11_serdeOpCreateTrainingJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateTransformJob.go b/service/sagemaker/api_op_CreateTransformJob.go index c64238d42e2..2ee65883d24 100644 --- a/service/sagemaker/api_op_CreateTransformJob.go +++ b/service/sagemaker/api_op_CreateTransformJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -49,9 +48,9 @@ func (c *Client) CreateTransformJob(ctx context.Context, params *CreateTransform addawsAwsjson11_serdeOpCreateTransformJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateTrial.go b/service/sagemaker/api_op_CreateTrial.go index 84390eae7f8..24a7ab05b5f 100644 --- a/service/sagemaker/api_op_CreateTrial.go +++ b/service/sagemaker/api_op_CreateTrial.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) CreateTrial(ctx context.Context, params *CreateTrialInput, optF addawsAwsjson11_serdeOpCreateTrialMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateTrialComponent.go b/service/sagemaker/api_op_CreateTrialComponent.go index e763356ed0f..14d3c450dc1 100644 --- a/service/sagemaker/api_op_CreateTrialComponent.go +++ b/service/sagemaker/api_op_CreateTrialComponent.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) CreateTrialComponent(ctx context.Context, params *CreateTrialCo addawsAwsjson11_serdeOpCreateTrialComponentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateUserProfile.go b/service/sagemaker/api_op_CreateUserProfile.go index e4db3fc05dd..9772b43da67 100644 --- a/service/sagemaker/api_op_CreateUserProfile.go +++ b/service/sagemaker/api_op_CreateUserProfile.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateUserProfile(ctx context.Context, params *CreateUserProfil addawsAwsjson11_serdeOpCreateUserProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateWorkforce.go b/service/sagemaker/api_op_CreateWorkforce.go index a788dd9189c..206aad0ddfc 100644 --- a/service/sagemaker/api_op_CreateWorkforce.go +++ b/service/sagemaker/api_op_CreateWorkforce.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) CreateWorkforce(ctx context.Context, params *CreateWorkforceInp addawsAwsjson11_serdeOpCreateWorkforceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_CreateWorkteam.go b/service/sagemaker/api_op_CreateWorkteam.go index 26edd305543..d020dcc5fc9 100644 --- a/service/sagemaker/api_op_CreateWorkteam.go +++ b/service/sagemaker/api_op_CreateWorkteam.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateWorkteam(ctx context.Context, params *CreateWorkteamInput addawsAwsjson11_serdeOpCreateWorkteamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteAlgorithm.go b/service/sagemaker/api_op_DeleteAlgorithm.go index 345c0f95219..01e9ab5c1d6 100644 --- a/service/sagemaker/api_op_DeleteAlgorithm.go +++ b/service/sagemaker/api_op_DeleteAlgorithm.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteAlgorithm(ctx context.Context, params *DeleteAlgorithmInp addawsAwsjson11_serdeOpDeleteAlgorithmMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteApp.go b/service/sagemaker/api_op_DeleteApp.go index e84db01e8c7..08764c04307 100644 --- a/service/sagemaker/api_op_DeleteApp.go +++ b/service/sagemaker/api_op_DeleteApp.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteApp(ctx context.Context, params *DeleteAppInput, optFns . addawsAwsjson11_serdeOpDeleteAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteCodeRepository.go b/service/sagemaker/api_op_DeleteCodeRepository.go index 845cb003aac..126fe8ecdd5 100644 --- a/service/sagemaker/api_op_DeleteCodeRepository.go +++ b/service/sagemaker/api_op_DeleteCodeRepository.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteCodeRepository(ctx context.Context, params *DeleteCodeRep addawsAwsjson11_serdeOpDeleteCodeRepositoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteDomain.go b/service/sagemaker/api_op_DeleteDomain.go index 508d46b2f9f..314fa6bf7f6 100644 --- a/service/sagemaker/api_op_DeleteDomain.go +++ b/service/sagemaker/api_op_DeleteDomain.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteDomain(ctx context.Context, params *DeleteDomainInput, op addawsAwsjson11_serdeOpDeleteDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteEndpoint.go b/service/sagemaker/api_op_DeleteEndpoint.go index f7e2b96aec4..1853bde6410 100644 --- a/service/sagemaker/api_op_DeleteEndpoint.go +++ b/service/sagemaker/api_op_DeleteEndpoint.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteEndpoint(ctx context.Context, params *DeleteEndpointInput addawsAwsjson11_serdeOpDeleteEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteEndpointConfig.go b/service/sagemaker/api_op_DeleteEndpointConfig.go index a99d4ebfac0..7b2efd66192 100644 --- a/service/sagemaker/api_op_DeleteEndpointConfig.go +++ b/service/sagemaker/api_op_DeleteEndpointConfig.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DeleteEndpointConfig(ctx context.Context, params *DeleteEndpoin addawsAwsjson11_serdeOpDeleteEndpointConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteExperiment.go b/service/sagemaker/api_op_DeleteExperiment.go index b7c032f7f56..b5b5bf01681 100644 --- a/service/sagemaker/api_op_DeleteExperiment.go +++ b/service/sagemaker/api_op_DeleteExperiment.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteExperiment(ctx context.Context, params *DeleteExperimentI addawsAwsjson11_serdeOpDeleteExperimentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteFlowDefinition.go b/service/sagemaker/api_op_DeleteFlowDefinition.go index a727f26e522..9aa0b9db289 100644 --- a/service/sagemaker/api_op_DeleteFlowDefinition.go +++ b/service/sagemaker/api_op_DeleteFlowDefinition.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteFlowDefinition(ctx context.Context, params *DeleteFlowDef addawsAwsjson11_serdeOpDeleteFlowDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteHumanTaskUi.go b/service/sagemaker/api_op_DeleteHumanTaskUi.go index 983729f5877..09bd67b5027 100644 --- a/service/sagemaker/api_op_DeleteHumanTaskUi.go +++ b/service/sagemaker/api_op_DeleteHumanTaskUi.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteHumanTaskUi(ctx context.Context, params *DeleteHumanTaskU addawsAwsjson11_serdeOpDeleteHumanTaskUiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteModel.go b/service/sagemaker/api_op_DeleteModel.go index ca92536fa99..5dfe503a16a 100644 --- a/service/sagemaker/api_op_DeleteModel.go +++ b/service/sagemaker/api_op_DeleteModel.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteModel(ctx context.Context, params *DeleteModelInput, optF addawsAwsjson11_serdeOpDeleteModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteModelPackage.go b/service/sagemaker/api_op_DeleteModelPackage.go index c6f9872be11..6741105c12d 100644 --- a/service/sagemaker/api_op_DeleteModelPackage.go +++ b/service/sagemaker/api_op_DeleteModelPackage.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteModelPackage(ctx context.Context, params *DeleteModelPack addawsAwsjson11_serdeOpDeleteModelPackageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteMonitoringSchedule.go b/service/sagemaker/api_op_DeleteMonitoringSchedule.go index 954dd563bf6..7655f1240b8 100644 --- a/service/sagemaker/api_op_DeleteMonitoringSchedule.go +++ b/service/sagemaker/api_op_DeleteMonitoringSchedule.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteMonitoringSchedule(ctx context.Context, params *DeleteMon addawsAwsjson11_serdeOpDeleteMonitoringScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteNotebookInstance.go b/service/sagemaker/api_op_DeleteNotebookInstance.go index 36e087fffcb..21383300788 100644 --- a/service/sagemaker/api_op_DeleteNotebookInstance.go +++ b/service/sagemaker/api_op_DeleteNotebookInstance.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteNotebookInstance(ctx context.Context, params *DeleteNoteb addawsAwsjson11_serdeOpDeleteNotebookInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteNotebookInstanceLifecycleConfig.go b/service/sagemaker/api_op_DeleteNotebookInstanceLifecycleConfig.go index 6470b522ad1..c0676f85101 100644 --- a/service/sagemaker/api_op_DeleteNotebookInstanceLifecycleConfig.go +++ b/service/sagemaker/api_op_DeleteNotebookInstanceLifecycleConfig.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteNotebookInstanceLifecycleConfig(ctx context.Context, para addawsAwsjson11_serdeOpDeleteNotebookInstanceLifecycleConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteTags.go b/service/sagemaker/api_op_DeleteTags.go index ae8ed802594..b6a9b19648d 100644 --- a/service/sagemaker/api_op_DeleteTags.go +++ b/service/sagemaker/api_op_DeleteTags.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteTags(ctx context.Context, params *DeleteTagsInput, optFns addawsAwsjson11_serdeOpDeleteTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteTrial.go b/service/sagemaker/api_op_DeleteTrial.go index 61dee373042..5ad248d06cb 100644 --- a/service/sagemaker/api_op_DeleteTrial.go +++ b/service/sagemaker/api_op_DeleteTrial.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteTrial(ctx context.Context, params *DeleteTrialInput, optF addawsAwsjson11_serdeOpDeleteTrialMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteTrialComponent.go b/service/sagemaker/api_op_DeleteTrialComponent.go index f3602590d5f..c98ebd11638 100644 --- a/service/sagemaker/api_op_DeleteTrialComponent.go +++ b/service/sagemaker/api_op_DeleteTrialComponent.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteTrialComponent(ctx context.Context, params *DeleteTrialCo addawsAwsjson11_serdeOpDeleteTrialComponentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteUserProfile.go b/service/sagemaker/api_op_DeleteUserProfile.go index 29f1afc0d6d..cc2d4e346c4 100644 --- a/service/sagemaker/api_op_DeleteUserProfile.go +++ b/service/sagemaker/api_op_DeleteUserProfile.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteUserProfile(ctx context.Context, params *DeleteUserProfil addawsAwsjson11_serdeOpDeleteUserProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteWorkforce.go b/service/sagemaker/api_op_DeleteWorkforce.go index 7231ebae519..34befddd893 100644 --- a/service/sagemaker/api_op_DeleteWorkforce.go +++ b/service/sagemaker/api_op_DeleteWorkforce.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteWorkforce(ctx context.Context, params *DeleteWorkforceInp addawsAwsjson11_serdeOpDeleteWorkforceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DeleteWorkteam.go b/service/sagemaker/api_op_DeleteWorkteam.go index 5053a8ab53f..0c4d4c067ee 100644 --- a/service/sagemaker/api_op_DeleteWorkteam.go +++ b/service/sagemaker/api_op_DeleteWorkteam.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteWorkteam(ctx context.Context, params *DeleteWorkteamInput addawsAwsjson11_serdeOpDeleteWorkteamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeAlgorithm.go b/service/sagemaker/api_op_DescribeAlgorithm.go index 6d933db344e..64421195ee6 100644 --- a/service/sagemaker/api_op_DescribeAlgorithm.go +++ b/service/sagemaker/api_op_DescribeAlgorithm.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAlgorithm(ctx context.Context, params *DescribeAlgorith addawsAwsjson11_serdeOpDescribeAlgorithmMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeApp.go b/service/sagemaker/api_op_DescribeApp.go index 1e56e5c0010..43bf50a1734 100644 --- a/service/sagemaker/api_op_DescribeApp.go +++ b/service/sagemaker/api_op_DescribeApp.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeApp(ctx context.Context, params *DescribeAppInput, optF addawsAwsjson11_serdeOpDescribeAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeAutoMLJob.go b/service/sagemaker/api_op_DescribeAutoMLJob.go index b03c102b9f0..ff48a1a962d 100644 --- a/service/sagemaker/api_op_DescribeAutoMLJob.go +++ b/service/sagemaker/api_op_DescribeAutoMLJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAutoMLJob(ctx context.Context, params *DescribeAutoMLJo addawsAwsjson11_serdeOpDescribeAutoMLJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeCodeRepository.go b/service/sagemaker/api_op_DescribeCodeRepository.go index ab21c380b38..683a697d63f 100644 --- a/service/sagemaker/api_op_DescribeCodeRepository.go +++ b/service/sagemaker/api_op_DescribeCodeRepository.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeCodeRepository(ctx context.Context, params *DescribeCod addawsAwsjson11_serdeOpDescribeCodeRepositoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeCompilationJob.go b/service/sagemaker/api_op_DescribeCompilationJob.go index 20c65c1117a..b16124293dc 100644 --- a/service/sagemaker/api_op_DescribeCompilationJob.go +++ b/service/sagemaker/api_op_DescribeCompilationJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeCompilationJob(ctx context.Context, params *DescribeCom addawsAwsjson11_serdeOpDescribeCompilationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeDomain.go b/service/sagemaker/api_op_DescribeDomain.go index 731450a04fc..d3cc802c081 100644 --- a/service/sagemaker/api_op_DescribeDomain.go +++ b/service/sagemaker/api_op_DescribeDomain.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDomain(ctx context.Context, params *DescribeDomainInput addawsAwsjson11_serdeOpDescribeDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeEndpoint.go b/service/sagemaker/api_op_DescribeEndpoint.go index 40d7e9374ba..12527d4b031 100644 --- a/service/sagemaker/api_op_DescribeEndpoint.go +++ b/service/sagemaker/api_op_DescribeEndpoint.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeEndpoint(ctx context.Context, params *DescribeEndpointI addawsAwsjson11_serdeOpDescribeEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeEndpointConfig.go b/service/sagemaker/api_op_DescribeEndpointConfig.go index f4136757d22..4b02e9c6f36 100644 --- a/service/sagemaker/api_op_DescribeEndpointConfig.go +++ b/service/sagemaker/api_op_DescribeEndpointConfig.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeEndpointConfig(ctx context.Context, params *DescribeEnd addawsAwsjson11_serdeOpDescribeEndpointConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeExperiment.go b/service/sagemaker/api_op_DescribeExperiment.go index 621969c49c2..390c8d3b1b4 100644 --- a/service/sagemaker/api_op_DescribeExperiment.go +++ b/service/sagemaker/api_op_DescribeExperiment.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeExperiment(ctx context.Context, params *DescribeExperim addawsAwsjson11_serdeOpDescribeExperimentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeFlowDefinition.go b/service/sagemaker/api_op_DescribeFlowDefinition.go index cb9ac51b5b4..c21d9d3a800 100644 --- a/service/sagemaker/api_op_DescribeFlowDefinition.go +++ b/service/sagemaker/api_op_DescribeFlowDefinition.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeFlowDefinition(ctx context.Context, params *DescribeFlo addawsAwsjson11_serdeOpDescribeFlowDefinitionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeHumanTaskUi.go b/service/sagemaker/api_op_DescribeHumanTaskUi.go index 3277954518e..0dc8cafe2f4 100644 --- a/service/sagemaker/api_op_DescribeHumanTaskUi.go +++ b/service/sagemaker/api_op_DescribeHumanTaskUi.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeHumanTaskUi(ctx context.Context, params *DescribeHumanT addawsAwsjson11_serdeOpDescribeHumanTaskUiMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeHyperParameterTuningJob.go b/service/sagemaker/api_op_DescribeHyperParameterTuningJob.go index 30d3635cb99..1b81fe0b76a 100644 --- a/service/sagemaker/api_op_DescribeHyperParameterTuningJob.go +++ b/service/sagemaker/api_op_DescribeHyperParameterTuningJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeHyperParameterTuningJob(ctx context.Context, params *De addawsAwsjson11_serdeOpDescribeHyperParameterTuningJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeLabelingJob.go b/service/sagemaker/api_op_DescribeLabelingJob.go index 74a15c85afa..bf53eef3c5e 100644 --- a/service/sagemaker/api_op_DescribeLabelingJob.go +++ b/service/sagemaker/api_op_DescribeLabelingJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeLabelingJob(ctx context.Context, params *DescribeLabeli addawsAwsjson11_serdeOpDescribeLabelingJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeModel.go b/service/sagemaker/api_op_DescribeModel.go index 996aaabe220..b95a59af076 100644 --- a/service/sagemaker/api_op_DescribeModel.go +++ b/service/sagemaker/api_op_DescribeModel.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeModel(ctx context.Context, params *DescribeModelInput, addawsAwsjson11_serdeOpDescribeModelMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeModelPackage.go b/service/sagemaker/api_op_DescribeModelPackage.go index a3ca0250127..d7416128d7f 100644 --- a/service/sagemaker/api_op_DescribeModelPackage.go +++ b/service/sagemaker/api_op_DescribeModelPackage.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeModelPackage(ctx context.Context, params *DescribeModel addawsAwsjson11_serdeOpDescribeModelPackageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeMonitoringSchedule.go b/service/sagemaker/api_op_DescribeMonitoringSchedule.go index c010ce655c1..2c74ede1a50 100644 --- a/service/sagemaker/api_op_DescribeMonitoringSchedule.go +++ b/service/sagemaker/api_op_DescribeMonitoringSchedule.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeMonitoringSchedule(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeMonitoringScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeNotebookInstance.go b/service/sagemaker/api_op_DescribeNotebookInstance.go index 3d1abd5ced4..5c71eea714c 100644 --- a/service/sagemaker/api_op_DescribeNotebookInstance.go +++ b/service/sagemaker/api_op_DescribeNotebookInstance.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeNotebookInstance(ctx context.Context, params *DescribeN addawsAwsjson11_serdeOpDescribeNotebookInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeNotebookInstanceLifecycleConfig.go b/service/sagemaker/api_op_DescribeNotebookInstanceLifecycleConfig.go index 7f160448d63..1edc79deaa9 100644 --- a/service/sagemaker/api_op_DescribeNotebookInstanceLifecycleConfig.go +++ b/service/sagemaker/api_op_DescribeNotebookInstanceLifecycleConfig.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeNotebookInstanceLifecycleConfig(ctx context.Context, pa addawsAwsjson11_serdeOpDescribeNotebookInstanceLifecycleConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeProcessingJob.go b/service/sagemaker/api_op_DescribeProcessingJob.go index 36fa24a3132..5c10244c3d2 100644 --- a/service/sagemaker/api_op_DescribeProcessingJob.go +++ b/service/sagemaker/api_op_DescribeProcessingJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeProcessingJob(ctx context.Context, params *DescribeProc addawsAwsjson11_serdeOpDescribeProcessingJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeSubscribedWorkteam.go b/service/sagemaker/api_op_DescribeSubscribedWorkteam.go index 45d0ad6b057..5df37f5f06a 100644 --- a/service/sagemaker/api_op_DescribeSubscribedWorkteam.go +++ b/service/sagemaker/api_op_DescribeSubscribedWorkteam.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeSubscribedWorkteam(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeSubscribedWorkteamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeTrainingJob.go b/service/sagemaker/api_op_DescribeTrainingJob.go index 098a2f6c937..670cace0365 100644 --- a/service/sagemaker/api_op_DescribeTrainingJob.go +++ b/service/sagemaker/api_op_DescribeTrainingJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeTrainingJob(ctx context.Context, params *DescribeTraini addawsAwsjson11_serdeOpDescribeTrainingJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeTransformJob.go b/service/sagemaker/api_op_DescribeTransformJob.go index 641c5d1993a..5ed0df3d599 100644 --- a/service/sagemaker/api_op_DescribeTransformJob.go +++ b/service/sagemaker/api_op_DescribeTransformJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeTransformJob(ctx context.Context, params *DescribeTrans addawsAwsjson11_serdeOpDescribeTransformJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeTrial.go b/service/sagemaker/api_op_DescribeTrial.go index b84fa5c7054..e9c47b8a843 100644 --- a/service/sagemaker/api_op_DescribeTrial.go +++ b/service/sagemaker/api_op_DescribeTrial.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeTrial(ctx context.Context, params *DescribeTrialInput, addawsAwsjson11_serdeOpDescribeTrialMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeTrialComponent.go b/service/sagemaker/api_op_DescribeTrialComponent.go index 853a3741d82..9ab86120976 100644 --- a/service/sagemaker/api_op_DescribeTrialComponent.go +++ b/service/sagemaker/api_op_DescribeTrialComponent.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeTrialComponent(ctx context.Context, params *DescribeTri addawsAwsjson11_serdeOpDescribeTrialComponentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeUserProfile.go b/service/sagemaker/api_op_DescribeUserProfile.go index ed994710beb..25afe1fec88 100644 --- a/service/sagemaker/api_op_DescribeUserProfile.go +++ b/service/sagemaker/api_op_DescribeUserProfile.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeUserProfile(ctx context.Context, params *DescribeUserPr addawsAwsjson11_serdeOpDescribeUserProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeWorkforce.go b/service/sagemaker/api_op_DescribeWorkforce.go index e76f63cfe22..8b9ff46e885 100644 --- a/service/sagemaker/api_op_DescribeWorkforce.go +++ b/service/sagemaker/api_op_DescribeWorkforce.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeWorkforce(ctx context.Context, params *DescribeWorkforc addawsAwsjson11_serdeOpDescribeWorkforceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DescribeWorkteam.go b/service/sagemaker/api_op_DescribeWorkteam.go index 3c60bd14ded..a0c88825686 100644 --- a/service/sagemaker/api_op_DescribeWorkteam.go +++ b/service/sagemaker/api_op_DescribeWorkteam.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeWorkteam(ctx context.Context, params *DescribeWorkteamI addawsAwsjson11_serdeOpDescribeWorkteamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_DisassociateTrialComponent.go b/service/sagemaker/api_op_DisassociateTrialComponent.go index bd81f393550..68d82b7178b 100644 --- a/service/sagemaker/api_op_DisassociateTrialComponent.go +++ b/service/sagemaker/api_op_DisassociateTrialComponent.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DisassociateTrialComponent(ctx context.Context, params *Disasso addawsAwsjson11_serdeOpDisassociateTrialComponentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_GetSearchSuggestions.go b/service/sagemaker/api_op_GetSearchSuggestions.go index 269bfe060e9..fca6aea2378 100644 --- a/service/sagemaker/api_op_GetSearchSuggestions.go +++ b/service/sagemaker/api_op_GetSearchSuggestions.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetSearchSuggestions(ctx context.Context, params *GetSearchSugg addawsAwsjson11_serdeOpGetSearchSuggestionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListAlgorithms.go b/service/sagemaker/api_op_ListAlgorithms.go index 8be4eec727c..e6cf5473477 100644 --- a/service/sagemaker/api_op_ListAlgorithms.go +++ b/service/sagemaker/api_op_ListAlgorithms.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListAlgorithms(ctx context.Context, params *ListAlgorithmsInput addawsAwsjson11_serdeOpListAlgorithmsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListApps.go b/service/sagemaker/api_op_ListApps.go index 2e7b0c16748..9be836c0e5a 100644 --- a/service/sagemaker/api_op_ListApps.go +++ b/service/sagemaker/api_op_ListApps.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListApps(ctx context.Context, params *ListAppsInput, optFns ... addawsAwsjson11_serdeOpListAppsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListAutoMLJobs.go b/service/sagemaker/api_op_ListAutoMLJobs.go index 3a18b49b99a..a472b243dfd 100644 --- a/service/sagemaker/api_op_ListAutoMLJobs.go +++ b/service/sagemaker/api_op_ListAutoMLJobs.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListAutoMLJobs(ctx context.Context, params *ListAutoMLJobsInput addawsAwsjson11_serdeOpListAutoMLJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListCandidatesForAutoMLJob.go b/service/sagemaker/api_op_ListCandidatesForAutoMLJob.go index 1529cbf4572..0cfa4a4656c 100644 --- a/service/sagemaker/api_op_ListCandidatesForAutoMLJob.go +++ b/service/sagemaker/api_op_ListCandidatesForAutoMLJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListCandidatesForAutoMLJob(ctx context.Context, params *ListCan addawsAwsjson11_serdeOpListCandidatesForAutoMLJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListCodeRepositories.go b/service/sagemaker/api_op_ListCodeRepositories.go index d9c696415c5..75de26ef248 100644 --- a/service/sagemaker/api_op_ListCodeRepositories.go +++ b/service/sagemaker/api_op_ListCodeRepositories.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListCodeRepositories(ctx context.Context, params *ListCodeRepos addawsAwsjson11_serdeOpListCodeRepositoriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListCompilationJobs.go b/service/sagemaker/api_op_ListCompilationJobs.go index b44f73f0f4f..dbb91d7cc86 100644 --- a/service/sagemaker/api_op_ListCompilationJobs.go +++ b/service/sagemaker/api_op_ListCompilationJobs.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListCompilationJobs(ctx context.Context, params *ListCompilatio addawsAwsjson11_serdeOpListCompilationJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListDomains.go b/service/sagemaker/api_op_ListDomains.go index a332e60bcef..76c1935ab8b 100644 --- a/service/sagemaker/api_op_ListDomains.go +++ b/service/sagemaker/api_op_ListDomains.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDomains(ctx context.Context, params *ListDomainsInput, optF addawsAwsjson11_serdeOpListDomainsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListEndpointConfigs.go b/service/sagemaker/api_op_ListEndpointConfigs.go index 7bc38bf4cff..5ec0f737b61 100644 --- a/service/sagemaker/api_op_ListEndpointConfigs.go +++ b/service/sagemaker/api_op_ListEndpointConfigs.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListEndpointConfigs(ctx context.Context, params *ListEndpointCo addawsAwsjson11_serdeOpListEndpointConfigsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListEndpoints.go b/service/sagemaker/api_op_ListEndpoints.go index 6b6c43defd8..8646295c46a 100644 --- a/service/sagemaker/api_op_ListEndpoints.go +++ b/service/sagemaker/api_op_ListEndpoints.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListEndpoints(ctx context.Context, params *ListEndpointsInput, addawsAwsjson11_serdeOpListEndpointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListExperiments.go b/service/sagemaker/api_op_ListExperiments.go index c7660230f07..902ab313e44 100644 --- a/service/sagemaker/api_op_ListExperiments.go +++ b/service/sagemaker/api_op_ListExperiments.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListExperiments(ctx context.Context, params *ListExperimentsInp addawsAwsjson11_serdeOpListExperimentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListFlowDefinitions.go b/service/sagemaker/api_op_ListFlowDefinitions.go index 99666ba1cc6..a1563a9d02c 100644 --- a/service/sagemaker/api_op_ListFlowDefinitions.go +++ b/service/sagemaker/api_op_ListFlowDefinitions.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListFlowDefinitions(ctx context.Context, params *ListFlowDefini addawsAwsjson11_serdeOpListFlowDefinitionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListHumanTaskUis.go b/service/sagemaker/api_op_ListHumanTaskUis.go index b94e4c22db4..17b395dd424 100644 --- a/service/sagemaker/api_op_ListHumanTaskUis.go +++ b/service/sagemaker/api_op_ListHumanTaskUis.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListHumanTaskUis(ctx context.Context, params *ListHumanTaskUisI addawsAwsjson11_serdeOpListHumanTaskUisMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListHyperParameterTuningJobs.go b/service/sagemaker/api_op_ListHyperParameterTuningJobs.go index 76674b18ace..880d1d41a1e 100644 --- a/service/sagemaker/api_op_ListHyperParameterTuningJobs.go +++ b/service/sagemaker/api_op_ListHyperParameterTuningJobs.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListHyperParameterTuningJobs(ctx context.Context, params *ListH addawsAwsjson11_serdeOpListHyperParameterTuningJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListLabelingJobs.go b/service/sagemaker/api_op_ListLabelingJobs.go index e88076f6591..b871bfee895 100644 --- a/service/sagemaker/api_op_ListLabelingJobs.go +++ b/service/sagemaker/api_op_ListLabelingJobs.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListLabelingJobs(ctx context.Context, params *ListLabelingJobsI addawsAwsjson11_serdeOpListLabelingJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListLabelingJobsForWorkteam.go b/service/sagemaker/api_op_ListLabelingJobsForWorkteam.go index e920f506c84..99313c118b3 100644 --- a/service/sagemaker/api_op_ListLabelingJobsForWorkteam.go +++ b/service/sagemaker/api_op_ListLabelingJobsForWorkteam.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListLabelingJobsForWorkteam(ctx context.Context, params *ListLa addawsAwsjson11_serdeOpListLabelingJobsForWorkteamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListModelPackages.go b/service/sagemaker/api_op_ListModelPackages.go index 433a1f21fdb..4a252001748 100644 --- a/service/sagemaker/api_op_ListModelPackages.go +++ b/service/sagemaker/api_op_ListModelPackages.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListModelPackages(ctx context.Context, params *ListModelPackage addawsAwsjson11_serdeOpListModelPackagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListModels.go b/service/sagemaker/api_op_ListModels.go index be020538f98..03b611b51c2 100644 --- a/service/sagemaker/api_op_ListModels.go +++ b/service/sagemaker/api_op_ListModels.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListModels(ctx context.Context, params *ListModelsInput, optFns addawsAwsjson11_serdeOpListModelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListMonitoringExecutions.go b/service/sagemaker/api_op_ListMonitoringExecutions.go index cf2b635adc4..f1256709c2b 100644 --- a/service/sagemaker/api_op_ListMonitoringExecutions.go +++ b/service/sagemaker/api_op_ListMonitoringExecutions.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListMonitoringExecutions(ctx context.Context, params *ListMonit addawsAwsjson11_serdeOpListMonitoringExecutionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListMonitoringSchedules.go b/service/sagemaker/api_op_ListMonitoringSchedules.go index 99e761d8da0..f054aeb56bd 100644 --- a/service/sagemaker/api_op_ListMonitoringSchedules.go +++ b/service/sagemaker/api_op_ListMonitoringSchedules.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListMonitoringSchedules(ctx context.Context, params *ListMonito addawsAwsjson11_serdeOpListMonitoringSchedulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListNotebookInstanceLifecycleConfigs.go b/service/sagemaker/api_op_ListNotebookInstanceLifecycleConfigs.go index 4d0a544df9c..a2c8e8f94c3 100644 --- a/service/sagemaker/api_op_ListNotebookInstanceLifecycleConfigs.go +++ b/service/sagemaker/api_op_ListNotebookInstanceLifecycleConfigs.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListNotebookInstanceLifecycleConfigs(ctx context.Context, param addawsAwsjson11_serdeOpListNotebookInstanceLifecycleConfigsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListNotebookInstances.go b/service/sagemaker/api_op_ListNotebookInstances.go index 7b9e2c28a18..28fba4ec7d8 100644 --- a/service/sagemaker/api_op_ListNotebookInstances.go +++ b/service/sagemaker/api_op_ListNotebookInstances.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListNotebookInstances(ctx context.Context, params *ListNotebook addawsAwsjson11_serdeOpListNotebookInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListProcessingJobs.go b/service/sagemaker/api_op_ListProcessingJobs.go index f4a54cec11f..c818f73cfac 100644 --- a/service/sagemaker/api_op_ListProcessingJobs.go +++ b/service/sagemaker/api_op_ListProcessingJobs.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListProcessingJobs(ctx context.Context, params *ListProcessingJ addawsAwsjson11_serdeOpListProcessingJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListSubscribedWorkteams.go b/service/sagemaker/api_op_ListSubscribedWorkteams.go index 89d7e40e4a0..e016a6cfcc9 100644 --- a/service/sagemaker/api_op_ListSubscribedWorkteams.go +++ b/service/sagemaker/api_op_ListSubscribedWorkteams.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListSubscribedWorkteams(ctx context.Context, params *ListSubscr addawsAwsjson11_serdeOpListSubscribedWorkteamsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListTags.go b/service/sagemaker/api_op_ListTags.go index e2c69e25199..ef7873da003 100644 --- a/service/sagemaker/api_op_ListTags.go +++ b/service/sagemaker/api_op_ListTags.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTags(ctx context.Context, params *ListTagsInput, optFns ... addawsAwsjson11_serdeOpListTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListTrainingJobs.go b/service/sagemaker/api_op_ListTrainingJobs.go index 83da553b4ef..9050bd578b8 100644 --- a/service/sagemaker/api_op_ListTrainingJobs.go +++ b/service/sagemaker/api_op_ListTrainingJobs.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTrainingJobs(ctx context.Context, params *ListTrainingJobsI addawsAwsjson11_serdeOpListTrainingJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListTrainingJobsForHyperParameterTuningJob.go b/service/sagemaker/api_op_ListTrainingJobsForHyperParameterTuningJob.go index e0f73f89aad..d40ca879e8a 100644 --- a/service/sagemaker/api_op_ListTrainingJobsForHyperParameterTuningJob.go +++ b/service/sagemaker/api_op_ListTrainingJobsForHyperParameterTuningJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTrainingJobsForHyperParameterTuningJob(ctx context.Context, addawsAwsjson11_serdeOpListTrainingJobsForHyperParameterTuningJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListTransformJobs.go b/service/sagemaker/api_op_ListTransformJobs.go index 4b995a4380d..02b20b2b895 100644 --- a/service/sagemaker/api_op_ListTransformJobs.go +++ b/service/sagemaker/api_op_ListTransformJobs.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTransformJobs(ctx context.Context, params *ListTransformJob addawsAwsjson11_serdeOpListTransformJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListTrialComponents.go b/service/sagemaker/api_op_ListTrialComponents.go index 82ca21a3b2d..929d2a54cc3 100644 --- a/service/sagemaker/api_op_ListTrialComponents.go +++ b/service/sagemaker/api_op_ListTrialComponents.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) ListTrialComponents(ctx context.Context, params *ListTrialCompo addawsAwsjson11_serdeOpListTrialComponentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListTrials.go b/service/sagemaker/api_op_ListTrials.go index 10f1df46996..00fae4cef56 100644 --- a/service/sagemaker/api_op_ListTrials.go +++ b/service/sagemaker/api_op_ListTrials.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListTrials(ctx context.Context, params *ListTrialsInput, optFns addawsAwsjson11_serdeOpListTrialsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListUserProfiles.go b/service/sagemaker/api_op_ListUserProfiles.go index f5d624e85f0..d177bd11d7e 100644 --- a/service/sagemaker/api_op_ListUserProfiles.go +++ b/service/sagemaker/api_op_ListUserProfiles.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListUserProfiles(ctx context.Context, params *ListUserProfilesI addawsAwsjson11_serdeOpListUserProfilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListWorkforces.go b/service/sagemaker/api_op_ListWorkforces.go index 65fb60456b1..352d93f6d0c 100644 --- a/service/sagemaker/api_op_ListWorkforces.go +++ b/service/sagemaker/api_op_ListWorkforces.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListWorkforces(ctx context.Context, params *ListWorkforcesInput addawsAwsjson11_serdeOpListWorkforcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_ListWorkteams.go b/service/sagemaker/api_op_ListWorkteams.go index 7570d21b966..21772c4c8ad 100644 --- a/service/sagemaker/api_op_ListWorkteams.go +++ b/service/sagemaker/api_op_ListWorkteams.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListWorkteams(ctx context.Context, params *ListWorkteamsInput, addawsAwsjson11_serdeOpListWorkteamsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_RenderUiTemplate.go b/service/sagemaker/api_op_RenderUiTemplate.go index 64bf08720d4..20e188bb992 100644 --- a/service/sagemaker/api_op_RenderUiTemplate.go +++ b/service/sagemaker/api_op_RenderUiTemplate.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RenderUiTemplate(ctx context.Context, params *RenderUiTemplateI addawsAwsjson11_serdeOpRenderUiTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_Search.go b/service/sagemaker/api_op_Search.go index 041b0c6c62b..a02fdeb7ac5 100644 --- a/service/sagemaker/api_op_Search.go +++ b/service/sagemaker/api_op_Search.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) Search(ctx context.Context, params *SearchInput, optFns ...func addawsAwsjson11_serdeOpSearchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_StartMonitoringSchedule.go b/service/sagemaker/api_op_StartMonitoringSchedule.go index 7c8d29f32e5..ba9caa5e94e 100644 --- a/service/sagemaker/api_op_StartMonitoringSchedule.go +++ b/service/sagemaker/api_op_StartMonitoringSchedule.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) StartMonitoringSchedule(ctx context.Context, params *StartMonit addawsAwsjson11_serdeOpStartMonitoringScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_StartNotebookInstance.go b/service/sagemaker/api_op_StartNotebookInstance.go index 206d34cb53e..6c702eb75a5 100644 --- a/service/sagemaker/api_op_StartNotebookInstance.go +++ b/service/sagemaker/api_op_StartNotebookInstance.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) StartNotebookInstance(ctx context.Context, params *StartNoteboo addawsAwsjson11_serdeOpStartNotebookInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_StopAutoMLJob.go b/service/sagemaker/api_op_StopAutoMLJob.go index 8375318819c..d295fda224f 100644 --- a/service/sagemaker/api_op_StopAutoMLJob.go +++ b/service/sagemaker/api_op_StopAutoMLJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StopAutoMLJob(ctx context.Context, params *StopAutoMLJobInput, addawsAwsjson11_serdeOpStopAutoMLJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_StopCompilationJob.go b/service/sagemaker/api_op_StopCompilationJob.go index b8b922a70a5..06648979611 100644 --- a/service/sagemaker/api_op_StopCompilationJob.go +++ b/service/sagemaker/api_op_StopCompilationJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) StopCompilationJob(ctx context.Context, params *StopCompilation addawsAwsjson11_serdeOpStopCompilationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_StopHyperParameterTuningJob.go b/service/sagemaker/api_op_StopHyperParameterTuningJob.go index 3f6f96e6fe1..084edafce18 100644 --- a/service/sagemaker/api_op_StopHyperParameterTuningJob.go +++ b/service/sagemaker/api_op_StopHyperParameterTuningJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) StopHyperParameterTuningJob(ctx context.Context, params *StopHy addawsAwsjson11_serdeOpStopHyperParameterTuningJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_StopLabelingJob.go b/service/sagemaker/api_op_StopLabelingJob.go index cf8a7e7ad68..a7beb0435e7 100644 --- a/service/sagemaker/api_op_StopLabelingJob.go +++ b/service/sagemaker/api_op_StopLabelingJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) StopLabelingJob(ctx context.Context, params *StopLabelingJobInp addawsAwsjson11_serdeOpStopLabelingJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_StopMonitoringSchedule.go b/service/sagemaker/api_op_StopMonitoringSchedule.go index 52cc7024171..a4c028c0d73 100644 --- a/service/sagemaker/api_op_StopMonitoringSchedule.go +++ b/service/sagemaker/api_op_StopMonitoringSchedule.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StopMonitoringSchedule(ctx context.Context, params *StopMonitor addawsAwsjson11_serdeOpStopMonitoringScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_StopNotebookInstance.go b/service/sagemaker/api_op_StopNotebookInstance.go index c8dcea845de..97faebf3716 100644 --- a/service/sagemaker/api_op_StopNotebookInstance.go +++ b/service/sagemaker/api_op_StopNotebookInstance.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) StopNotebookInstance(ctx context.Context, params *StopNotebookI addawsAwsjson11_serdeOpStopNotebookInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_StopProcessingJob.go b/service/sagemaker/api_op_StopProcessingJob.go index 5616515204d..be8d85fbfb8 100644 --- a/service/sagemaker/api_op_StopProcessingJob.go +++ b/service/sagemaker/api_op_StopProcessingJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StopProcessingJob(ctx context.Context, params *StopProcessingJo addawsAwsjson11_serdeOpStopProcessingJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_StopTrainingJob.go b/service/sagemaker/api_op_StopTrainingJob.go index bda2988ce26..acbea19e4aa 100644 --- a/service/sagemaker/api_op_StopTrainingJob.go +++ b/service/sagemaker/api_op_StopTrainingJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) StopTrainingJob(ctx context.Context, params *StopTrainingJobInp addawsAwsjson11_serdeOpStopTrainingJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_StopTransformJob.go b/service/sagemaker/api_op_StopTransformJob.go index 6ef013d58dc..2b6abdbf195 100644 --- a/service/sagemaker/api_op_StopTransformJob.go +++ b/service/sagemaker/api_op_StopTransformJob.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) StopTransformJob(ctx context.Context, params *StopTransformJobI addawsAwsjson11_serdeOpStopTransformJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_UpdateCodeRepository.go b/service/sagemaker/api_op_UpdateCodeRepository.go index 79c8e15f43c..b26b572e6cf 100644 --- a/service/sagemaker/api_op_UpdateCodeRepository.go +++ b/service/sagemaker/api_op_UpdateCodeRepository.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateCodeRepository(ctx context.Context, params *UpdateCodeRep addawsAwsjson11_serdeOpUpdateCodeRepositoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_UpdateDomain.go b/service/sagemaker/api_op_UpdateDomain.go index 40cbecff6b8..686a13b8d0e 100644 --- a/service/sagemaker/api_op_UpdateDomain.go +++ b/service/sagemaker/api_op_UpdateDomain.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDomain(ctx context.Context, params *UpdateDomainInput, op addawsAwsjson11_serdeOpUpdateDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_UpdateEndpoint.go b/service/sagemaker/api_op_UpdateEndpoint.go index 642d3d315ff..02d7f4d244f 100644 --- a/service/sagemaker/api_op_UpdateEndpoint.go +++ b/service/sagemaker/api_op_UpdateEndpoint.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) UpdateEndpoint(ctx context.Context, params *UpdateEndpointInput addawsAwsjson11_serdeOpUpdateEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_UpdateEndpointWeightsAndCapacities.go b/service/sagemaker/api_op_UpdateEndpointWeightsAndCapacities.go index 3404f54ae9a..a0ef3ac32a6 100644 --- a/service/sagemaker/api_op_UpdateEndpointWeightsAndCapacities.go +++ b/service/sagemaker/api_op_UpdateEndpointWeightsAndCapacities.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateEndpointWeightsAndCapacities(ctx context.Context, params addawsAwsjson11_serdeOpUpdateEndpointWeightsAndCapacitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_UpdateExperiment.go b/service/sagemaker/api_op_UpdateExperiment.go index 1b522dc453c..8d7b18f2bfa 100644 --- a/service/sagemaker/api_op_UpdateExperiment.go +++ b/service/sagemaker/api_op_UpdateExperiment.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpdateExperiment(ctx context.Context, params *UpdateExperimentI addawsAwsjson11_serdeOpUpdateExperimentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_UpdateMonitoringSchedule.go b/service/sagemaker/api_op_UpdateMonitoringSchedule.go index c0764558395..c580dc76713 100644 --- a/service/sagemaker/api_op_UpdateMonitoringSchedule.go +++ b/service/sagemaker/api_op_UpdateMonitoringSchedule.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateMonitoringSchedule(ctx context.Context, params *UpdateMon addawsAwsjson11_serdeOpUpdateMonitoringScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_UpdateNotebookInstance.go b/service/sagemaker/api_op_UpdateNotebookInstance.go index 87222615300..cbab7158c93 100644 --- a/service/sagemaker/api_op_UpdateNotebookInstance.go +++ b/service/sagemaker/api_op_UpdateNotebookInstance.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateNotebookInstance(ctx context.Context, params *UpdateNoteb addawsAwsjson11_serdeOpUpdateNotebookInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_UpdateNotebookInstanceLifecycleConfig.go b/service/sagemaker/api_op_UpdateNotebookInstanceLifecycleConfig.go index 9863ca8b9b0..08ebb2957d3 100644 --- a/service/sagemaker/api_op_UpdateNotebookInstanceLifecycleConfig.go +++ b/service/sagemaker/api_op_UpdateNotebookInstanceLifecycleConfig.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateNotebookInstanceLifecycleConfig(ctx context.Context, para addawsAwsjson11_serdeOpUpdateNotebookInstanceLifecycleConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_UpdateTrial.go b/service/sagemaker/api_op_UpdateTrial.go index 10c824ed49d..343a66fe431 100644 --- a/service/sagemaker/api_op_UpdateTrial.go +++ b/service/sagemaker/api_op_UpdateTrial.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateTrial(ctx context.Context, params *UpdateTrialInput, optF addawsAwsjson11_serdeOpUpdateTrialMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_UpdateTrialComponent.go b/service/sagemaker/api_op_UpdateTrialComponent.go index ab3eef089a1..c178b4f6e94 100644 --- a/service/sagemaker/api_op_UpdateTrialComponent.go +++ b/service/sagemaker/api_op_UpdateTrialComponent.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateTrialComponent(ctx context.Context, params *UpdateTrialCo addawsAwsjson11_serdeOpUpdateTrialComponentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_UpdateUserProfile.go b/service/sagemaker/api_op_UpdateUserProfile.go index 14aaa773cdf..7c1e74b7fb1 100644 --- a/service/sagemaker/api_op_UpdateUserProfile.go +++ b/service/sagemaker/api_op_UpdateUserProfile.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateUserProfile(ctx context.Context, params *UpdateUserProfil addawsAwsjson11_serdeOpUpdateUserProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_UpdateWorkforce.go b/service/sagemaker/api_op_UpdateWorkforce.go index c01afa685b3..83693ffbf24 100644 --- a/service/sagemaker/api_op_UpdateWorkforce.go +++ b/service/sagemaker/api_op_UpdateWorkforce.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) UpdateWorkforce(ctx context.Context, params *UpdateWorkforceInp addawsAwsjson11_serdeOpUpdateWorkforceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/api_op_UpdateWorkteam.go b/service/sagemaker/api_op_UpdateWorkteam.go index 7ecb497b845..4f3fb0f5e5e 100644 --- a/service/sagemaker/api_op_UpdateWorkteam.go +++ b/service/sagemaker/api_op_UpdateWorkteam.go @@ -5,7 +5,6 @@ package sagemaker import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateWorkteam(ctx context.Context, params *UpdateWorkteamInput addawsAwsjson11_serdeOpUpdateWorkteamMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemaker/endpoints.go b/service/sagemaker/endpoints.go index 384625197a3..75cfc1751cc 100644 --- a/service/sagemaker/endpoints.go +++ b/service/sagemaker/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/sagemakera2iruntime/api_client.go b/service/sagemakera2iruntime/api_client.go index d336002abe8..2f30018d767 100644 --- a/service/sagemakera2iruntime/api_client.go +++ b/service/sagemakera2iruntime/api_client.go @@ -112,30 +112,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -201,6 +177,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/sagemakera2iruntime/api_op_DeleteHumanLoop.go b/service/sagemakera2iruntime/api_op_DeleteHumanLoop.go index 26caede32ec..e97effe0885 100644 --- a/service/sagemakera2iruntime/api_op_DeleteHumanLoop.go +++ b/service/sagemakera2iruntime/api_op_DeleteHumanLoop.go @@ -5,7 +5,6 @@ package sagemakera2iruntime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteHumanLoop(ctx context.Context, params *DeleteHumanLoopInp addawsRestjson1_serdeOpDeleteHumanLoopMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemakera2iruntime/api_op_DescribeHumanLoop.go b/service/sagemakera2iruntime/api_op_DescribeHumanLoop.go index ba1048f5618..05ac7d7e946 100644 --- a/service/sagemakera2iruntime/api_op_DescribeHumanLoop.go +++ b/service/sagemakera2iruntime/api_op_DescribeHumanLoop.go @@ -5,7 +5,6 @@ package sagemakera2iruntime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemakera2iruntime/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeHumanLoop(ctx context.Context, params *DescribeHumanLoo addawsRestjson1_serdeOpDescribeHumanLoopMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemakera2iruntime/api_op_ListHumanLoops.go b/service/sagemakera2iruntime/api_op_ListHumanLoops.go index 862528fbfe2..0665073e13c 100644 --- a/service/sagemakera2iruntime/api_op_ListHumanLoops.go +++ b/service/sagemakera2iruntime/api_op_ListHumanLoops.go @@ -5,7 +5,6 @@ package sagemakera2iruntime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemakera2iruntime/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListHumanLoops(ctx context.Context, params *ListHumanLoopsInput addawsRestjson1_serdeOpListHumanLoopsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemakera2iruntime/api_op_StartHumanLoop.go b/service/sagemakera2iruntime/api_op_StartHumanLoop.go index 5f6e46fab5b..72682153264 100644 --- a/service/sagemakera2iruntime/api_op_StartHumanLoop.go +++ b/service/sagemakera2iruntime/api_op_StartHumanLoop.go @@ -5,7 +5,6 @@ package sagemakera2iruntime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sagemakera2iruntime/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StartHumanLoop(ctx context.Context, params *StartHumanLoopInput addawsRestjson1_serdeOpStartHumanLoopMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemakera2iruntime/api_op_StopHumanLoop.go b/service/sagemakera2iruntime/api_op_StopHumanLoop.go index 418e270cc0c..e84be02cbe9 100644 --- a/service/sagemakera2iruntime/api_op_StopHumanLoop.go +++ b/service/sagemakera2iruntime/api_op_StopHumanLoop.go @@ -5,7 +5,6 @@ package sagemakera2iruntime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StopHumanLoop(ctx context.Context, params *StopHumanLoopInput, addawsRestjson1_serdeOpStopHumanLoopMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemakera2iruntime/endpoints.go b/service/sagemakera2iruntime/endpoints.go index 810fda20af1..e00d097498a 100644 --- a/service/sagemakera2iruntime/endpoints.go +++ b/service/sagemakera2iruntime/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/sagemakerruntime/api_client.go b/service/sagemakerruntime/api_client.go index 084aeaea5e0..ca826fb478b 100644 --- a/service/sagemakerruntime/api_client.go +++ b/service/sagemakerruntime/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/sagemakerruntime/api_op_InvokeEndpoint.go b/service/sagemakerruntime/api_op_InvokeEndpoint.go index c48643c02e0..e16ad8affb2 100644 --- a/service/sagemakerruntime/api_op_InvokeEndpoint.go +++ b/service/sagemakerruntime/api_op_InvokeEndpoint.go @@ -5,7 +5,6 @@ package sagemakerruntime import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) InvokeEndpoint(ctx context.Context, params *InvokeEndpointInput addawsRestjson1_serdeOpInvokeEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sagemakerruntime/endpoints.go b/service/sagemakerruntime/endpoints.go index 80748c217dd..8e0775b2c39 100644 --- a/service/sagemakerruntime/endpoints.go +++ b/service/sagemakerruntime/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/savingsplans/api_client.go b/service/savingsplans/api_client.go index 5d167542648..50fe3e03807 100644 --- a/service/savingsplans/api_client.go +++ b/service/savingsplans/api_client.go @@ -89,34 +89,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -189,6 +161,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/savingsplans/api_op_CreateSavingsPlan.go b/service/savingsplans/api_op_CreateSavingsPlan.go index 2036127c06b..855b6664843 100644 --- a/service/savingsplans/api_op_CreateSavingsPlan.go +++ b/service/savingsplans/api_op_CreateSavingsPlan.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateSavingsPlan(ctx context.Context, params *CreateSavingsPla addawsRestjson1_serdeOpCreateSavingsPlanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/savingsplans/api_op_DescribeSavingsPlanRates.go b/service/savingsplans/api_op_DescribeSavingsPlanRates.go index d71388a270a..d961af74d28 100644 --- a/service/savingsplans/api_op_DescribeSavingsPlanRates.go +++ b/service/savingsplans/api_op_DescribeSavingsPlanRates.go @@ -5,7 +5,6 @@ package savingsplans import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/savingsplans/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeSavingsPlanRates(ctx context.Context, params *DescribeS addawsRestjson1_serdeOpDescribeSavingsPlanRatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/savingsplans/api_op_DescribeSavingsPlans.go b/service/savingsplans/api_op_DescribeSavingsPlans.go index cefec4601cf..a436250bf14 100644 --- a/service/savingsplans/api_op_DescribeSavingsPlans.go +++ b/service/savingsplans/api_op_DescribeSavingsPlans.go @@ -5,7 +5,6 @@ package savingsplans import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/savingsplans/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeSavingsPlans(ctx context.Context, params *DescribeSavin addawsRestjson1_serdeOpDescribeSavingsPlansMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/savingsplans/api_op_DescribeSavingsPlansOfferingRates.go b/service/savingsplans/api_op_DescribeSavingsPlansOfferingRates.go index 85fbb47359b..795234abf22 100644 --- a/service/savingsplans/api_op_DescribeSavingsPlansOfferingRates.go +++ b/service/savingsplans/api_op_DescribeSavingsPlansOfferingRates.go @@ -5,7 +5,6 @@ package savingsplans import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/savingsplans/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeSavingsPlansOfferingRates(ctx context.Context, params * addawsRestjson1_serdeOpDescribeSavingsPlansOfferingRatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/savingsplans/api_op_DescribeSavingsPlansOfferings.go b/service/savingsplans/api_op_DescribeSavingsPlansOfferings.go index 8b4a3b00ab6..d45474253f6 100644 --- a/service/savingsplans/api_op_DescribeSavingsPlansOfferings.go +++ b/service/savingsplans/api_op_DescribeSavingsPlansOfferings.go @@ -5,7 +5,6 @@ package savingsplans import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/savingsplans/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeSavingsPlansOfferings(ctx context.Context, params *Desc addawsRestjson1_serdeOpDescribeSavingsPlansOfferingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/savingsplans/api_op_ListTagsForResource.go b/service/savingsplans/api_op_ListTagsForResource.go index e0dc5e7aa53..8a36f304d40 100644 --- a/service/savingsplans/api_op_ListTagsForResource.go +++ b/service/savingsplans/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package savingsplans import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/savingsplans/api_op_TagResource.go b/service/savingsplans/api_op_TagResource.go index 67d57cf4411..f07733f4324 100644 --- a/service/savingsplans/api_op_TagResource.go +++ b/service/savingsplans/api_op_TagResource.go @@ -5,7 +5,6 @@ package savingsplans import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/savingsplans/api_op_UntagResource.go b/service/savingsplans/api_op_UntagResource.go index ceea2ee2faf..5e0af81aab6 100644 --- a/service/savingsplans/api_op_UntagResource.go +++ b/service/savingsplans/api_op_UntagResource.go @@ -5,7 +5,6 @@ package savingsplans import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/savingsplans/endpoints.go b/service/savingsplans/endpoints.go index 30297356304..674edddbb94 100644 --- a/service/savingsplans/endpoints.go +++ b/service/savingsplans/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/schemas/api_client.go b/service/schemas/api_client.go index 35a7ab09565..983d481760b 100644 --- a/service/schemas/api_client.go +++ b/service/schemas/api_client.go @@ -85,34 +85,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -185,6 +157,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/schemas/api_op_CreateDiscoverer.go b/service/schemas/api_op_CreateDiscoverer.go index fa49f38f2bc..005fc365b2c 100644 --- a/service/schemas/api_op_CreateDiscoverer.go +++ b/service/schemas/api_op_CreateDiscoverer.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/schemas/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateDiscoverer(ctx context.Context, params *CreateDiscovererI addawsRestjson1_serdeOpCreateDiscovererMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_CreateRegistry.go b/service/schemas/api_op_CreateRegistry.go index fd96632ea66..bb7e15a7018 100644 --- a/service/schemas/api_op_CreateRegistry.go +++ b/service/schemas/api_op_CreateRegistry.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateRegistry(ctx context.Context, params *CreateRegistryInput addawsRestjson1_serdeOpCreateRegistryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_CreateSchema.go b/service/schemas/api_op_CreateSchema.go index 90deb9fd9e4..92bb4913b44 100644 --- a/service/schemas/api_op_CreateSchema.go +++ b/service/schemas/api_op_CreateSchema.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/schemas/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateSchema(ctx context.Context, params *CreateSchemaInput, op addawsRestjson1_serdeOpCreateSchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_DeleteDiscoverer.go b/service/schemas/api_op_DeleteDiscoverer.go index 8e353e8d130..742c9c3713e 100644 --- a/service/schemas/api_op_DeleteDiscoverer.go +++ b/service/schemas/api_op_DeleteDiscoverer.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDiscoverer(ctx context.Context, params *DeleteDiscovererI addawsRestjson1_serdeOpDeleteDiscovererMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_DeleteRegistry.go b/service/schemas/api_op_DeleteRegistry.go index 455249a26fa..9bac9b56140 100644 --- a/service/schemas/api_op_DeleteRegistry.go +++ b/service/schemas/api_op_DeleteRegistry.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteRegistry(ctx context.Context, params *DeleteRegistryInput addawsRestjson1_serdeOpDeleteRegistryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_DeleteResourcePolicy.go b/service/schemas/api_op_DeleteResourcePolicy.go index aa1d7626409..8c503528ad8 100644 --- a/service/schemas/api_op_DeleteResourcePolicy.go +++ b/service/schemas/api_op_DeleteResourcePolicy.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteResourcePolicy(ctx context.Context, params *DeleteResourc addawsRestjson1_serdeOpDeleteResourcePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_DeleteSchema.go b/service/schemas/api_op_DeleteSchema.go index 774d18ed87a..f80287ce7dc 100644 --- a/service/schemas/api_op_DeleteSchema.go +++ b/service/schemas/api_op_DeleteSchema.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSchema(ctx context.Context, params *DeleteSchemaInput, op addawsRestjson1_serdeOpDeleteSchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_DeleteSchemaVersion.go b/service/schemas/api_op_DeleteSchemaVersion.go index 954ae96cc63..febc3235969 100644 --- a/service/schemas/api_op_DeleteSchemaVersion.go +++ b/service/schemas/api_op_DeleteSchemaVersion.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSchemaVersion(ctx context.Context, params *DeleteSchemaVe addawsRestjson1_serdeOpDeleteSchemaVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_DescribeCodeBinding.go b/service/schemas/api_op_DescribeCodeBinding.go index b9f9b0a0253..72d4b36dce0 100644 --- a/service/schemas/api_op_DescribeCodeBinding.go +++ b/service/schemas/api_op_DescribeCodeBinding.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/schemas/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeCodeBinding(ctx context.Context, params *DescribeCodeBi addawsRestjson1_serdeOpDescribeCodeBindingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_DescribeDiscoverer.go b/service/schemas/api_op_DescribeDiscoverer.go index 817ae8e409e..762b0844872 100644 --- a/service/schemas/api_op_DescribeDiscoverer.go +++ b/service/schemas/api_op_DescribeDiscoverer.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/schemas/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDiscoverer(ctx context.Context, params *DescribeDiscove addawsRestjson1_serdeOpDescribeDiscovererMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_DescribeRegistry.go b/service/schemas/api_op_DescribeRegistry.go index c64fa468cf3..5f1137117cc 100644 --- a/service/schemas/api_op_DescribeRegistry.go +++ b/service/schemas/api_op_DescribeRegistry.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DescribeRegistry(ctx context.Context, params *DescribeRegistryI addawsRestjson1_serdeOpDescribeRegistryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_DescribeSchema.go b/service/schemas/api_op_DescribeSchema.go index 4731f0e5f11..66b2e4c9b6f 100644 --- a/service/schemas/api_op_DescribeSchema.go +++ b/service/schemas/api_op_DescribeSchema.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DescribeSchema(ctx context.Context, params *DescribeSchemaInput addawsRestjson1_serdeOpDescribeSchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_GetCodeBindingSource.go b/service/schemas/api_op_GetCodeBindingSource.go index 6cd24a879b7..bfdd273f324 100644 --- a/service/schemas/api_op_GetCodeBindingSource.go +++ b/service/schemas/api_op_GetCodeBindingSource.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetCodeBindingSource(ctx context.Context, params *GetCodeBindin addawsRestjson1_serdeOpGetCodeBindingSourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_GetDiscoveredSchema.go b/service/schemas/api_op_GetDiscoveredSchema.go index 180c93ed985..5bf72fe9c4b 100644 --- a/service/schemas/api_op_GetDiscoveredSchema.go +++ b/service/schemas/api_op_GetDiscoveredSchema.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/schemas/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDiscoveredSchema(ctx context.Context, params *GetDiscoveredS addawsRestjson1_serdeOpGetDiscoveredSchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_GetResourcePolicy.go b/service/schemas/api_op_GetResourcePolicy.go index 81fe9aac13b..7e79a7970d9 100644 --- a/service/schemas/api_op_GetResourcePolicy.go +++ b/service/schemas/api_op_GetResourcePolicy.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetResourcePolicy(ctx context.Context, params *GetResourcePolic addawsRestjson1_serdeOpGetResourcePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_ListDiscoverers.go b/service/schemas/api_op_ListDiscoverers.go index 27a937fd2fe..0b4472f3f73 100644 --- a/service/schemas/api_op_ListDiscoverers.go +++ b/service/schemas/api_op_ListDiscoverers.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/schemas/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDiscoverers(ctx context.Context, params *ListDiscoverersInp addawsRestjson1_serdeOpListDiscoverersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_ListRegistries.go b/service/schemas/api_op_ListRegistries.go index 47f578fd8e1..331d372869d 100644 --- a/service/schemas/api_op_ListRegistries.go +++ b/service/schemas/api_op_ListRegistries.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/schemas/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListRegistries(ctx context.Context, params *ListRegistriesInput addawsRestjson1_serdeOpListRegistriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_ListSchemaVersions.go b/service/schemas/api_op_ListSchemaVersions.go index 3eadf2a2ac1..9e51909d6c4 100644 --- a/service/schemas/api_op_ListSchemaVersions.go +++ b/service/schemas/api_op_ListSchemaVersions.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/schemas/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListSchemaVersions(ctx context.Context, params *ListSchemaVersi addawsRestjson1_serdeOpListSchemaVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_ListSchemas.go b/service/schemas/api_op_ListSchemas.go index d2be2755234..24227c6d163 100644 --- a/service/schemas/api_op_ListSchemas.go +++ b/service/schemas/api_op_ListSchemas.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/schemas/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListSchemas(ctx context.Context, params *ListSchemasInput, optF addawsRestjson1_serdeOpListSchemasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_ListTagsForResource.go b/service/schemas/api_op_ListTagsForResource.go index 9c2271090ff..79d546fa85e 100644 --- a/service/schemas/api_op_ListTagsForResource.go +++ b/service/schemas/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_PutCodeBinding.go b/service/schemas/api_op_PutCodeBinding.go index 815325f156b..e794c45baf5 100644 --- a/service/schemas/api_op_PutCodeBinding.go +++ b/service/schemas/api_op_PutCodeBinding.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/schemas/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutCodeBinding(ctx context.Context, params *PutCodeBindingInput addawsRestjson1_serdeOpPutCodeBindingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_PutResourcePolicy.go b/service/schemas/api_op_PutResourcePolicy.go index 7ba1437a67c..d16778b191a 100644 --- a/service/schemas/api_op_PutResourcePolicy.go +++ b/service/schemas/api_op_PutResourcePolicy.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) PutResourcePolicy(ctx context.Context, params *PutResourcePolic addawsRestjson1_serdeOpPutResourcePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_SearchSchemas.go b/service/schemas/api_op_SearchSchemas.go index c80f0b5e2df..54e6756cdcb 100644 --- a/service/schemas/api_op_SearchSchemas.go +++ b/service/schemas/api_op_SearchSchemas.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/schemas/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SearchSchemas(ctx context.Context, params *SearchSchemasInput, addawsRestjson1_serdeOpSearchSchemasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_StartDiscoverer.go b/service/schemas/api_op_StartDiscoverer.go index 38eae673b02..f34a775319f 100644 --- a/service/schemas/api_op_StartDiscoverer.go +++ b/service/schemas/api_op_StartDiscoverer.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/schemas/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StartDiscoverer(ctx context.Context, params *StartDiscovererInp addawsRestjson1_serdeOpStartDiscovererMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_StopDiscoverer.go b/service/schemas/api_op_StopDiscoverer.go index dafbdb87a8e..1c049cf1440 100644 --- a/service/schemas/api_op_StopDiscoverer.go +++ b/service/schemas/api_op_StopDiscoverer.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/schemas/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StopDiscoverer(ctx context.Context, params *StopDiscovererInput addawsRestjson1_serdeOpStopDiscovererMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_TagResource.go b/service/schemas/api_op_TagResource.go index 80011c0d4ea..0c3b071ba66 100644 --- a/service/schemas/api_op_TagResource.go +++ b/service/schemas/api_op_TagResource.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_UntagResource.go b/service/schemas/api_op_UntagResource.go index 8cf810eb4a8..5d2d118997d 100644 --- a/service/schemas/api_op_UntagResource.go +++ b/service/schemas/api_op_UntagResource.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_UpdateDiscoverer.go b/service/schemas/api_op_UpdateDiscoverer.go index fa60bbb817f..33fbd50b5ca 100644 --- a/service/schemas/api_op_UpdateDiscoverer.go +++ b/service/schemas/api_op_UpdateDiscoverer.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/schemas/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDiscoverer(ctx context.Context, params *UpdateDiscovererI addawsRestjson1_serdeOpUpdateDiscovererMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_UpdateRegistry.go b/service/schemas/api_op_UpdateRegistry.go index 130c2d19222..c1a7ee85c89 100644 --- a/service/schemas/api_op_UpdateRegistry.go +++ b/service/schemas/api_op_UpdateRegistry.go @@ -5,7 +5,6 @@ package schemas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateRegistry(ctx context.Context, params *UpdateRegistryInput addawsRestjson1_serdeOpUpdateRegistryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/api_op_UpdateSchema.go b/service/schemas/api_op_UpdateSchema.go index 71b601c9385..1bfb2b7826b 100644 --- a/service/schemas/api_op_UpdateSchema.go +++ b/service/schemas/api_op_UpdateSchema.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/schemas/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateSchema(ctx context.Context, params *UpdateSchemaInput, op addawsRestjson1_serdeOpUpdateSchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/schemas/endpoints.go b/service/schemas/endpoints.go index 5838e4201d1..08495836c1d 100644 --- a/service/schemas/endpoints.go +++ b/service/schemas/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/secretsmanager/api_client.go b/service/secretsmanager/api_client.go index e97e0f58604..7a21dd11efe 100644 --- a/service/secretsmanager/api_client.go +++ b/service/secretsmanager/api_client.go @@ -135,34 +135,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -235,6 +207,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/secretsmanager/api_op_CancelRotateSecret.go b/service/secretsmanager/api_op_CancelRotateSecret.go index 91678ef6cb7..f3b40ea96fd 100644 --- a/service/secretsmanager/api_op_CancelRotateSecret.go +++ b/service/secretsmanager/api_op_CancelRotateSecret.go @@ -5,7 +5,6 @@ package secretsmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -50,9 +49,9 @@ func (c *Client) CancelRotateSecret(ctx context.Context, params *CancelRotateSec addawsAwsjson11_serdeOpCancelRotateSecretMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/api_op_CreateSecret.go b/service/secretsmanager/api_op_CreateSecret.go index 76217292033..9004f9392a1 100644 --- a/service/secretsmanager/api_op_CreateSecret.go +++ b/service/secretsmanager/api_op_CreateSecret.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/secretsmanager/types" smithy "github.com/awslabs/smithy-go" @@ -97,9 +96,9 @@ func (c *Client) CreateSecret(ctx context.Context, params *CreateSecretInput, op addawsAwsjson11_serdeOpCreateSecretMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/api_op_DeleteResourcePolicy.go b/service/secretsmanager/api_op_DeleteResourcePolicy.go index 9043ccc060b..c5a146ad90f 100644 --- a/service/secretsmanager/api_op_DeleteResourcePolicy.go +++ b/service/secretsmanager/api_op_DeleteResourcePolicy.go @@ -5,7 +5,6 @@ package secretsmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -37,9 +36,9 @@ func (c *Client) DeleteResourcePolicy(ctx context.Context, params *DeleteResourc addawsAwsjson11_serdeOpDeleteResourcePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/api_op_DeleteSecret.go b/service/secretsmanager/api_op_DeleteSecret.go index fadb772d4d0..e45d04940ef 100644 --- a/service/secretsmanager/api_op_DeleteSecret.go +++ b/service/secretsmanager/api_op_DeleteSecret.go @@ -5,7 +5,6 @@ package secretsmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -58,9 +57,9 @@ func (c *Client) DeleteSecret(ctx context.Context, params *DeleteSecretInput, op addawsAwsjson11_serdeOpDeleteSecretMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/api_op_DescribeSecret.go b/service/secretsmanager/api_op_DescribeSecret.go index 7e2e60cef0e..a1b2a6a7e1d 100644 --- a/service/secretsmanager/api_op_DescribeSecret.go +++ b/service/secretsmanager/api_op_DescribeSecret.go @@ -5,7 +5,6 @@ package secretsmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/secretsmanager/types" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) DescribeSecret(ctx context.Context, params *DescribeSecretInput addawsAwsjson11_serdeOpDescribeSecretMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/api_op_GetRandomPassword.go b/service/secretsmanager/api_op_GetRandomPassword.go index 693aeb6dfdb..24e4c6fad6c 100644 --- a/service/secretsmanager/api_op_GetRandomPassword.go +++ b/service/secretsmanager/api_op_GetRandomPassword.go @@ -5,7 +5,6 @@ package secretsmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) GetRandomPassword(ctx context.Context, params *GetRandomPasswor addawsAwsjson11_serdeOpGetRandomPasswordMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/api_op_GetResourcePolicy.go b/service/secretsmanager/api_op_GetResourcePolicy.go index c7c1d0e1455..36648d6d3f2 100644 --- a/service/secretsmanager/api_op_GetResourcePolicy.go +++ b/service/secretsmanager/api_op_GetResourcePolicy.go @@ -5,7 +5,6 @@ package secretsmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -40,9 +39,9 @@ func (c *Client) GetResourcePolicy(ctx context.Context, params *GetResourcePolic addawsAwsjson11_serdeOpGetResourcePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/api_op_GetSecretValue.go b/service/secretsmanager/api_op_GetSecretValue.go index 2e3566d7307..c3ffbfdb98b 100644 --- a/service/secretsmanager/api_op_GetSecretValue.go +++ b/service/secretsmanager/api_op_GetSecretValue.go @@ -5,7 +5,6 @@ package secretsmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) GetSecretValue(ctx context.Context, params *GetSecretValueInput addawsAwsjson11_serdeOpGetSecretValueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/api_op_ListSecretVersionIds.go b/service/secretsmanager/api_op_ListSecretVersionIds.go index 56763d96fda..330af6c68e0 100644 --- a/service/secretsmanager/api_op_ListSecretVersionIds.go +++ b/service/secretsmanager/api_op_ListSecretVersionIds.go @@ -5,7 +5,6 @@ package secretsmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/secretsmanager/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) ListSecretVersionIds(ctx context.Context, params *ListSecretVer addawsAwsjson11_serdeOpListSecretVersionIdsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/api_op_ListSecrets.go b/service/secretsmanager/api_op_ListSecrets.go index cb346eb4163..4d71d320b52 100644 --- a/service/secretsmanager/api_op_ListSecrets.go +++ b/service/secretsmanager/api_op_ListSecrets.go @@ -5,7 +5,6 @@ package secretsmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/secretsmanager/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) ListSecrets(ctx context.Context, params *ListSecretsInput, optF addawsAwsjson11_serdeOpListSecretsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/api_op_PutResourcePolicy.go b/service/secretsmanager/api_op_PutResourcePolicy.go index fbd01e0bc07..a1f920c00bb 100644 --- a/service/secretsmanager/api_op_PutResourcePolicy.go +++ b/service/secretsmanager/api_op_PutResourcePolicy.go @@ -5,7 +5,6 @@ package secretsmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -48,9 +47,9 @@ func (c *Client) PutResourcePolicy(ctx context.Context, params *PutResourcePolic addawsAwsjson11_serdeOpPutResourcePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/api_op_PutSecretValue.go b/service/secretsmanager/api_op_PutSecretValue.go index 5f98c1bd591..ddf86d37da8 100644 --- a/service/secretsmanager/api_op_PutSecretValue.go +++ b/service/secretsmanager/api_op_PutSecretValue.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -96,9 +95,9 @@ func (c *Client) PutSecretValue(ctx context.Context, params *PutSecretValueInput addawsAwsjson11_serdeOpPutSecretValueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/api_op_RestoreSecret.go b/service/secretsmanager/api_op_RestoreSecret.go index a0a0d9f52f1..aa9b9589ba1 100644 --- a/service/secretsmanager/api_op_RestoreSecret.go +++ b/service/secretsmanager/api_op_RestoreSecret.go @@ -5,7 +5,6 @@ package secretsmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) RestoreSecret(ctx context.Context, params *RestoreSecretInput, addawsAwsjson11_serdeOpRestoreSecretMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/api_op_RotateSecret.go b/service/secretsmanager/api_op_RotateSecret.go index dd52e44dafe..d674033b5ff 100644 --- a/service/secretsmanager/api_op_RotateSecret.go +++ b/service/secretsmanager/api_op_RotateSecret.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/secretsmanager/types" smithy "github.com/awslabs/smithy-go" @@ -78,9 +77,9 @@ func (c *Client) RotateSecret(ctx context.Context, params *RotateSecretInput, op addawsAwsjson11_serdeOpRotateSecretMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/api_op_TagResource.go b/service/secretsmanager/api_op_TagResource.go index 7b6063e6ad4..cc58df65502 100644 --- a/service/secretsmanager/api_op_TagResource.go +++ b/service/secretsmanager/api_op_TagResource.go @@ -5,7 +5,6 @@ package secretsmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/secretsmanager/types" smithy "github.com/awslabs/smithy-go" @@ -66,9 +65,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/api_op_UntagResource.go b/service/secretsmanager/api_op_UntagResource.go index 6ebe49e56da..ffc4cba03bd 100644 --- a/service/secretsmanager/api_op_UntagResource.go +++ b/service/secretsmanager/api_op_UntagResource.go @@ -5,7 +5,6 @@ package secretsmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -39,9 +38,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/api_op_UpdateSecret.go b/service/secretsmanager/api_op_UpdateSecret.go index f5217ba2642..1585be49857 100644 --- a/service/secretsmanager/api_op_UpdateSecret.go +++ b/service/secretsmanager/api_op_UpdateSecret.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -88,9 +87,9 @@ func (c *Client) UpdateSecret(ctx context.Context, params *UpdateSecretInput, op addawsAwsjson11_serdeOpUpdateSecretMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/api_op_UpdateSecretVersionStage.go b/service/secretsmanager/api_op_UpdateSecretVersionStage.go index 99908b075ff..694fc3c6590 100644 --- a/service/secretsmanager/api_op_UpdateSecretVersionStage.go +++ b/service/secretsmanager/api_op_UpdateSecretVersionStage.go @@ -5,7 +5,6 @@ package secretsmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -46,9 +45,9 @@ func (c *Client) UpdateSecretVersionStage(ctx context.Context, params *UpdateSec addawsAwsjson11_serdeOpUpdateSecretVersionStageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/api_op_ValidateResourcePolicy.go b/service/secretsmanager/api_op_ValidateResourcePolicy.go index 5b1495fd4e3..0a02054d147 100644 --- a/service/secretsmanager/api_op_ValidateResourcePolicy.go +++ b/service/secretsmanager/api_op_ValidateResourcePolicy.go @@ -5,7 +5,6 @@ package secretsmanager import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/secretsmanager/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ValidateResourcePolicy(ctx context.Context, params *ValidateRes addawsAwsjson11_serdeOpValidateResourcePolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/secretsmanager/endpoints.go b/service/secretsmanager/endpoints.go index 373a6c73354..d58cea7045e 100644 --- a/service/secretsmanager/endpoints.go +++ b/service/secretsmanager/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/securityhub/api_client.go b/service/securityhub/api_client.go index 82143843c3b..7c1a0867e47 100644 --- a/service/securityhub/api_client.go +++ b/service/securityhub/api_client.go @@ -105,30 +105,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -194,6 +170,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/securityhub/api_op_AcceptInvitation.go b/service/securityhub/api_op_AcceptInvitation.go index 0d1be23919e..e0402d2e608 100644 --- a/service/securityhub/api_op_AcceptInvitation.go +++ b/service/securityhub/api_op_AcceptInvitation.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) AcceptInvitation(ctx context.Context, params *AcceptInvitationI addawsRestjson1_serdeOpAcceptInvitationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_BatchDisableStandards.go b/service/securityhub/api_op_BatchDisableStandards.go index 4a2cf717fbe..a50f2088649 100644 --- a/service/securityhub/api_op_BatchDisableStandards.go +++ b/service/securityhub/api_op_BatchDisableStandards.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) BatchDisableStandards(ctx context.Context, params *BatchDisable addawsRestjson1_serdeOpBatchDisableStandardsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_BatchEnableStandards.go b/service/securityhub/api_op_BatchEnableStandards.go index b4899393d4e..1f4174d0f55 100644 --- a/service/securityhub/api_op_BatchEnableStandards.go +++ b/service/securityhub/api_op_BatchEnableStandards.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) BatchEnableStandards(ctx context.Context, params *BatchEnableSt addawsRestjson1_serdeOpBatchEnableStandardsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_BatchImportFindings.go b/service/securityhub/api_op_BatchImportFindings.go index 7186106083c..7d6aed1d7ef 100644 --- a/service/securityhub/api_op_BatchImportFindings.go +++ b/service/securityhub/api_op_BatchImportFindings.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -49,9 +48,9 @@ func (c *Client) BatchImportFindings(ctx context.Context, params *BatchImportFin addawsRestjson1_serdeOpBatchImportFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_BatchUpdateFindings.go b/service/securityhub/api_op_BatchUpdateFindings.go index 54c4e0d0b6b..455c2f24155 100644 --- a/service/securityhub/api_op_BatchUpdateFindings.go +++ b/service/securityhub/api_op_BatchUpdateFindings.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -52,9 +51,9 @@ func (c *Client) BatchUpdateFindings(ctx context.Context, params *BatchUpdateFin addawsRestjson1_serdeOpBatchUpdateFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_CreateActionTarget.go b/service/securityhub/api_op_CreateActionTarget.go index c902e85e373..60acd5fda1f 100644 --- a/service/securityhub/api_op_CreateActionTarget.go +++ b/service/securityhub/api_op_CreateActionTarget.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CreateActionTarget(ctx context.Context, params *CreateActionTar addawsRestjson1_serdeOpCreateActionTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_CreateInsight.go b/service/securityhub/api_op_CreateInsight.go index cbb305c6eaa..cd91a440f60 100644 --- a/service/securityhub/api_op_CreateInsight.go +++ b/service/securityhub/api_op_CreateInsight.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateInsight(ctx context.Context, params *CreateInsightInput, addawsRestjson1_serdeOpCreateInsightMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_CreateMembers.go b/service/securityhub/api_op_CreateMembers.go index f716867fefa..9f87ae3275e 100644 --- a/service/securityhub/api_op_CreateMembers.go +++ b/service/securityhub/api_op_CreateMembers.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) CreateMembers(ctx context.Context, params *CreateMembersInput, addawsRestjson1_serdeOpCreateMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_DeclineInvitations.go b/service/securityhub/api_op_DeclineInvitations.go index 0dfae3bdb8a..06cf2da953c 100644 --- a/service/securityhub/api_op_DeclineInvitations.go +++ b/service/securityhub/api_op_DeclineInvitations.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeclineInvitations(ctx context.Context, params *DeclineInvitati addawsRestjson1_serdeOpDeclineInvitationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_DeleteActionTarget.go b/service/securityhub/api_op_DeleteActionTarget.go index 52cd49f9b7f..9c91809c50d 100644 --- a/service/securityhub/api_op_DeleteActionTarget.go +++ b/service/securityhub/api_op_DeleteActionTarget.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteActionTarget(ctx context.Context, params *DeleteActionTar addawsRestjson1_serdeOpDeleteActionTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_DeleteInsight.go b/service/securityhub/api_op_DeleteInsight.go index 1fd12c9a06d..e729f9fb842 100644 --- a/service/securityhub/api_op_DeleteInsight.go +++ b/service/securityhub/api_op_DeleteInsight.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteInsight(ctx context.Context, params *DeleteInsightInput, addawsRestjson1_serdeOpDeleteInsightMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_DeleteInvitations.go b/service/securityhub/api_op_DeleteInvitations.go index 81a02cac3e6..2ef2d0042e1 100644 --- a/service/securityhub/api_op_DeleteInvitations.go +++ b/service/securityhub/api_op_DeleteInvitations.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteInvitations(ctx context.Context, params *DeleteInvitation addawsRestjson1_serdeOpDeleteInvitationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_DeleteMembers.go b/service/securityhub/api_op_DeleteMembers.go index 7ab832071a2..925a6e4d5c3 100644 --- a/service/securityhub/api_op_DeleteMembers.go +++ b/service/securityhub/api_op_DeleteMembers.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteMembers(ctx context.Context, params *DeleteMembersInput, addawsRestjson1_serdeOpDeleteMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_DescribeActionTargets.go b/service/securityhub/api_op_DescribeActionTargets.go index 2f2ccd842b5..1abbe49258e 100644 --- a/service/securityhub/api_op_DescribeActionTargets.go +++ b/service/securityhub/api_op_DescribeActionTargets.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeActionTargets(ctx context.Context, params *DescribeActi addawsRestjson1_serdeOpDescribeActionTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_DescribeHub.go b/service/securityhub/api_op_DescribeHub.go index 995e94ac4f3..496fb806367 100644 --- a/service/securityhub/api_op_DescribeHub.go +++ b/service/securityhub/api_op_DescribeHub.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DescribeHub(ctx context.Context, params *DescribeHubInput, optF addawsRestjson1_serdeOpDescribeHubMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_DescribeProducts.go b/service/securityhub/api_op_DescribeProducts.go index 434ffd2b23c..103ecba7efc 100644 --- a/service/securityhub/api_op_DescribeProducts.go +++ b/service/securityhub/api_op_DescribeProducts.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeProducts(ctx context.Context, params *DescribeProductsI addawsRestjson1_serdeOpDescribeProductsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_DescribeStandards.go b/service/securityhub/api_op_DescribeStandards.go index c7294acec84..5416344f917 100644 --- a/service/securityhub/api_op_DescribeStandards.go +++ b/service/securityhub/api_op_DescribeStandards.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeStandards(ctx context.Context, params *DescribeStandard addawsRestjson1_serdeOpDescribeStandardsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_DescribeStandardsControls.go b/service/securityhub/api_op_DescribeStandardsControls.go index 960182b29b4..26ae8f09de3 100644 --- a/service/securityhub/api_op_DescribeStandardsControls.go +++ b/service/securityhub/api_op_DescribeStandardsControls.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeStandardsControls(ctx context.Context, params *Describe addawsRestjson1_serdeOpDescribeStandardsControlsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_DisableImportFindingsForProduct.go b/service/securityhub/api_op_DisableImportFindingsForProduct.go index 28157062417..3145227a2d8 100644 --- a/service/securityhub/api_op_DisableImportFindingsForProduct.go +++ b/service/securityhub/api_op_DisableImportFindingsForProduct.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DisableImportFindingsForProduct(ctx context.Context, params *Di addawsRestjson1_serdeOpDisableImportFindingsForProductMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_DisableSecurityHub.go b/service/securityhub/api_op_DisableSecurityHub.go index 88c5923cc38..0d1a068b1f9 100644 --- a/service/securityhub/api_op_DisableSecurityHub.go +++ b/service/securityhub/api_op_DisableSecurityHub.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) DisableSecurityHub(ctx context.Context, params *DisableSecurity addawsRestjson1_serdeOpDisableSecurityHubMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_DisassociateFromMasterAccount.go b/service/securityhub/api_op_DisassociateFromMasterAccount.go index 0a29df784f6..19ab2bdb50c 100644 --- a/service/securityhub/api_op_DisassociateFromMasterAccount.go +++ b/service/securityhub/api_op_DisassociateFromMasterAccount.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisassociateFromMasterAccount(ctx context.Context, params *Disa addawsRestjson1_serdeOpDisassociateFromMasterAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_DisassociateMembers.go b/service/securityhub/api_op_DisassociateMembers.go index a4744be5313..d20fadc2ef8 100644 --- a/service/securityhub/api_op_DisassociateMembers.go +++ b/service/securityhub/api_op_DisassociateMembers.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisassociateMembers(ctx context.Context, params *DisassociateMe addawsRestjson1_serdeOpDisassociateMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_EnableImportFindingsForProduct.go b/service/securityhub/api_op_EnableImportFindingsForProduct.go index e50f0117df1..8a5ff535075 100644 --- a/service/securityhub/api_op_EnableImportFindingsForProduct.go +++ b/service/securityhub/api_op_EnableImportFindingsForProduct.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) EnableImportFindingsForProduct(ctx context.Context, params *Ena addawsRestjson1_serdeOpEnableImportFindingsForProductMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_EnableSecurityHub.go b/service/securityhub/api_op_EnableSecurityHub.go index 6eeb800119c..a8ce05c5478 100644 --- a/service/securityhub/api_op_EnableSecurityHub.go +++ b/service/securityhub/api_op_EnableSecurityHub.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) EnableSecurityHub(ctx context.Context, params *EnableSecurityHu addawsRestjson1_serdeOpEnableSecurityHubMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_GetEnabledStandards.go b/service/securityhub/api_op_GetEnabledStandards.go index 29ba64ca208..41dcc1f02cd 100644 --- a/service/securityhub/api_op_GetEnabledStandards.go +++ b/service/securityhub/api_op_GetEnabledStandards.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetEnabledStandards(ctx context.Context, params *GetEnabledStan addawsRestjson1_serdeOpGetEnabledStandardsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_GetFindings.go b/service/securityhub/api_op_GetFindings.go index 64e9a6137c1..bf80a213fe1 100644 --- a/service/securityhub/api_op_GetFindings.go +++ b/service/securityhub/api_op_GetFindings.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetFindings(ctx context.Context, params *GetFindingsInput, optF addawsRestjson1_serdeOpGetFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_GetInsightResults.go b/service/securityhub/api_op_GetInsightResults.go index e7e337e1d19..0acfcc0f983 100644 --- a/service/securityhub/api_op_GetInsightResults.go +++ b/service/securityhub/api_op_GetInsightResults.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetInsightResults(ctx context.Context, params *GetInsightResult addawsRestjson1_serdeOpGetInsightResultsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_GetInsights.go b/service/securityhub/api_op_GetInsights.go index c2b699d3046..b4b19266481 100644 --- a/service/securityhub/api_op_GetInsights.go +++ b/service/securityhub/api_op_GetInsights.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetInsights(ctx context.Context, params *GetInsightsInput, optF addawsRestjson1_serdeOpGetInsightsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_GetInvitationsCount.go b/service/securityhub/api_op_GetInvitationsCount.go index 63bea8ff5bb..35ed239e03e 100644 --- a/service/securityhub/api_op_GetInvitationsCount.go +++ b/service/securityhub/api_op_GetInvitationsCount.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetInvitationsCount(ctx context.Context, params *GetInvitations addawsRestjson1_serdeOpGetInvitationsCountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_GetMasterAccount.go b/service/securityhub/api_op_GetMasterAccount.go index 3c76e2055f9..53a1fdf494d 100644 --- a/service/securityhub/api_op_GetMasterAccount.go +++ b/service/securityhub/api_op_GetMasterAccount.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetMasterAccount(ctx context.Context, params *GetMasterAccountI addawsRestjson1_serdeOpGetMasterAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_GetMembers.go b/service/securityhub/api_op_GetMembers.go index 0cb8a78c71b..86e0696df1a 100644 --- a/service/securityhub/api_op_GetMembers.go +++ b/service/securityhub/api_op_GetMembers.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetMembers(ctx context.Context, params *GetMembersInput, optFns addawsRestjson1_serdeOpGetMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_InviteMembers.go b/service/securityhub/api_op_InviteMembers.go index 8aa205ee41e..26a15d69951 100644 --- a/service/securityhub/api_op_InviteMembers.go +++ b/service/securityhub/api_op_InviteMembers.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) InviteMembers(ctx context.Context, params *InviteMembersInput, addawsRestjson1_serdeOpInviteMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_ListEnabledProductsForImport.go b/service/securityhub/api_op_ListEnabledProductsForImport.go index 42d84061778..d58a56b5a66 100644 --- a/service/securityhub/api_op_ListEnabledProductsForImport.go +++ b/service/securityhub/api_op_ListEnabledProductsForImport.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ListEnabledProductsForImport(ctx context.Context, params *ListE addawsRestjson1_serdeOpListEnabledProductsForImportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_ListInvitations.go b/service/securityhub/api_op_ListInvitations.go index 7be88e0ff30..6918456fac1 100644 --- a/service/securityhub/api_op_ListInvitations.go +++ b/service/securityhub/api_op_ListInvitations.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListInvitations(ctx context.Context, params *ListInvitationsInp addawsRestjson1_serdeOpListInvitationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_ListMembers.go b/service/securityhub/api_op_ListMembers.go index b27087adc04..c4efaf4ee33 100644 --- a/service/securityhub/api_op_ListMembers.go +++ b/service/securityhub/api_op_ListMembers.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListMembers(ctx context.Context, params *ListMembersInput, optF addawsRestjson1_serdeOpListMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_ListTagsForResource.go b/service/securityhub/api_op_ListTagsForResource.go index 2ab3532ed7a..9eb41b966e1 100644 --- a/service/securityhub/api_op_ListTagsForResource.go +++ b/service/securityhub/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_TagResource.go b/service/securityhub/api_op_TagResource.go index 11949a6ad69..28bf6f233ed 100644 --- a/service/securityhub/api_op_TagResource.go +++ b/service/securityhub/api_op_TagResource.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_UntagResource.go b/service/securityhub/api_op_UntagResource.go index edaae9a07b9..35bd237c1d6 100644 --- a/service/securityhub/api_op_UntagResource.go +++ b/service/securityhub/api_op_UntagResource.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_UpdateActionTarget.go b/service/securityhub/api_op_UpdateActionTarget.go index a5895185468..b307e46335e 100644 --- a/service/securityhub/api_op_UpdateActionTarget.go +++ b/service/securityhub/api_op_UpdateActionTarget.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateActionTarget(ctx context.Context, params *UpdateActionTar addawsRestjson1_serdeOpUpdateActionTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_UpdateFindings.go b/service/securityhub/api_op_UpdateFindings.go index 0465434d863..6b161c39236 100644 --- a/service/securityhub/api_op_UpdateFindings.go +++ b/service/securityhub/api_op_UpdateFindings.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateFindings(ctx context.Context, params *UpdateFindingsInput addawsRestjson1_serdeOpUpdateFindingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_UpdateInsight.go b/service/securityhub/api_op_UpdateInsight.go index 3941d142235..2715b015120 100644 --- a/service/securityhub/api_op_UpdateInsight.go +++ b/service/securityhub/api_op_UpdateInsight.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateInsight(ctx context.Context, params *UpdateInsightInput, addawsRestjson1_serdeOpUpdateInsightMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_UpdateSecurityHubConfiguration.go b/service/securityhub/api_op_UpdateSecurityHubConfiguration.go index ddb87792caa..eaab7a5567a 100644 --- a/service/securityhub/api_op_UpdateSecurityHubConfiguration.go +++ b/service/securityhub/api_op_UpdateSecurityHubConfiguration.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateSecurityHubConfiguration(ctx context.Context, params *Upd addawsRestjson1_serdeOpUpdateSecurityHubConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/api_op_UpdateStandardsControl.go b/service/securityhub/api_op_UpdateStandardsControl.go index c4a1f045393..ba4830c4f07 100644 --- a/service/securityhub/api_op_UpdateStandardsControl.go +++ b/service/securityhub/api_op_UpdateStandardsControl.go @@ -5,7 +5,6 @@ package securityhub import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/securityhub/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateStandardsControl(ctx context.Context, params *UpdateStand addawsRestjson1_serdeOpUpdateStandardsControlMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/securityhub/endpoints.go b/service/securityhub/endpoints.go index b0f73958d24..566e78d7f8c 100644 --- a/service/securityhub/endpoints.go +++ b/service/securityhub/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/serverlessapplicationrepository/api_client.go b/service/serverlessapplicationrepository/api_client.go index bebed452240..3e96d721ada 100644 --- a/service/serverlessapplicationrepository/api_client.go +++ b/service/serverlessapplicationrepository/api_client.go @@ -102,30 +102,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -191,6 +167,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/serverlessapplicationrepository/api_op_CreateApplication.go b/service/serverlessapplicationrepository/api_op_CreateApplication.go index 460f50812b2..1b88c15192a 100644 --- a/service/serverlessapplicationrepository/api_op_CreateApplication.go +++ b/service/serverlessapplicationrepository/api_op_CreateApplication.go @@ -5,7 +5,6 @@ package serverlessapplicationrepository import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateApplication(ctx context.Context, params *CreateApplicatio addawsRestjson1_serdeOpCreateApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/serverlessapplicationrepository/api_op_CreateApplicationVersion.go b/service/serverlessapplicationrepository/api_op_CreateApplicationVersion.go index bac70abdf3d..1ed5b94b75e 100644 --- a/service/serverlessapplicationrepository/api_op_CreateApplicationVersion.go +++ b/service/serverlessapplicationrepository/api_op_CreateApplicationVersion.go @@ -5,7 +5,6 @@ package serverlessapplicationrepository import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateApplicationVersion(ctx context.Context, params *CreateApp addawsRestjson1_serdeOpCreateApplicationVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/serverlessapplicationrepository/api_op_CreateCloudFormationChangeSet.go b/service/serverlessapplicationrepository/api_op_CreateCloudFormationChangeSet.go index cd34f4da2e9..8a693cbdf4e 100644 --- a/service/serverlessapplicationrepository/api_op_CreateCloudFormationChangeSet.go +++ b/service/serverlessapplicationrepository/api_op_CreateCloudFormationChangeSet.go @@ -5,7 +5,6 @@ package serverlessapplicationrepository import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateCloudFormationChangeSet(ctx context.Context, params *Crea addawsRestjson1_serdeOpCreateCloudFormationChangeSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/serverlessapplicationrepository/api_op_CreateCloudFormationTemplate.go b/service/serverlessapplicationrepository/api_op_CreateCloudFormationTemplate.go index 3d2339eb6a1..576187c0cb8 100644 --- a/service/serverlessapplicationrepository/api_op_CreateCloudFormationTemplate.go +++ b/service/serverlessapplicationrepository/api_op_CreateCloudFormationTemplate.go @@ -5,7 +5,6 @@ package serverlessapplicationrepository import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateCloudFormationTemplate(ctx context.Context, params *Creat addawsRestjson1_serdeOpCreateCloudFormationTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/serverlessapplicationrepository/api_op_DeleteApplication.go b/service/serverlessapplicationrepository/api_op_DeleteApplication.go index 2dca2dd0588..ad0091c4137 100644 --- a/service/serverlessapplicationrepository/api_op_DeleteApplication.go +++ b/service/serverlessapplicationrepository/api_op_DeleteApplication.go @@ -5,7 +5,6 @@ package serverlessapplicationrepository import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteApplication(ctx context.Context, params *DeleteApplicatio addawsRestjson1_serdeOpDeleteApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/serverlessapplicationrepository/api_op_GetApplication.go b/service/serverlessapplicationrepository/api_op_GetApplication.go index d3853f41ab6..d91df95e0b5 100644 --- a/service/serverlessapplicationrepository/api_op_GetApplication.go +++ b/service/serverlessapplicationrepository/api_op_GetApplication.go @@ -5,7 +5,6 @@ package serverlessapplicationrepository import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetApplication(ctx context.Context, params *GetApplicationInput addawsRestjson1_serdeOpGetApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/serverlessapplicationrepository/api_op_GetApplicationPolicy.go b/service/serverlessapplicationrepository/api_op_GetApplicationPolicy.go index 39688a14fc7..4ec0bb5892f 100644 --- a/service/serverlessapplicationrepository/api_op_GetApplicationPolicy.go +++ b/service/serverlessapplicationrepository/api_op_GetApplicationPolicy.go @@ -5,7 +5,6 @@ package serverlessapplicationrepository import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetApplicationPolicy(ctx context.Context, params *GetApplicatio addawsRestjson1_serdeOpGetApplicationPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/serverlessapplicationrepository/api_op_GetCloudFormationTemplate.go b/service/serverlessapplicationrepository/api_op_GetCloudFormationTemplate.go index e4297569857..70e1b1b315d 100644 --- a/service/serverlessapplicationrepository/api_op_GetCloudFormationTemplate.go +++ b/service/serverlessapplicationrepository/api_op_GetCloudFormationTemplate.go @@ -5,7 +5,6 @@ package serverlessapplicationrepository import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetCloudFormationTemplate(ctx context.Context, params *GetCloud addawsRestjson1_serdeOpGetCloudFormationTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/serverlessapplicationrepository/api_op_ListApplicationDependencies.go b/service/serverlessapplicationrepository/api_op_ListApplicationDependencies.go index 9212e6f82b6..cb154e3213f 100644 --- a/service/serverlessapplicationrepository/api_op_ListApplicationDependencies.go +++ b/service/serverlessapplicationrepository/api_op_ListApplicationDependencies.go @@ -5,7 +5,6 @@ package serverlessapplicationrepository import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListApplicationDependencies(ctx context.Context, params *ListAp addawsRestjson1_serdeOpListApplicationDependenciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/serverlessapplicationrepository/api_op_ListApplicationVersions.go b/service/serverlessapplicationrepository/api_op_ListApplicationVersions.go index 77d18999640..9c7214e4f9f 100644 --- a/service/serverlessapplicationrepository/api_op_ListApplicationVersions.go +++ b/service/serverlessapplicationrepository/api_op_ListApplicationVersions.go @@ -5,7 +5,6 @@ package serverlessapplicationrepository import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListApplicationVersions(ctx context.Context, params *ListApplic addawsRestjson1_serdeOpListApplicationVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/serverlessapplicationrepository/api_op_ListApplications.go b/service/serverlessapplicationrepository/api_op_ListApplications.go index 42064924218..f32d355b4d5 100644 --- a/service/serverlessapplicationrepository/api_op_ListApplications.go +++ b/service/serverlessapplicationrepository/api_op_ListApplications.go @@ -5,7 +5,6 @@ package serverlessapplicationrepository import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListApplications(ctx context.Context, params *ListApplicationsI addawsRestjson1_serdeOpListApplicationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/serverlessapplicationrepository/api_op_PutApplicationPolicy.go b/service/serverlessapplicationrepository/api_op_PutApplicationPolicy.go index 3d66668212c..e5774ac8022 100644 --- a/service/serverlessapplicationrepository/api_op_PutApplicationPolicy.go +++ b/service/serverlessapplicationrepository/api_op_PutApplicationPolicy.go @@ -5,7 +5,6 @@ package serverlessapplicationrepository import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) PutApplicationPolicy(ctx context.Context, params *PutApplicatio addawsRestjson1_serdeOpPutApplicationPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/serverlessapplicationrepository/api_op_UnshareApplication.go b/service/serverlessapplicationrepository/api_op_UnshareApplication.go index a5dbeea513a..8c482916f2b 100644 --- a/service/serverlessapplicationrepository/api_op_UnshareApplication.go +++ b/service/serverlessapplicationrepository/api_op_UnshareApplication.go @@ -5,7 +5,6 @@ package serverlessapplicationrepository import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UnshareApplication(ctx context.Context, params *UnshareApplicat addawsRestjson1_serdeOpUnshareApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/serverlessapplicationrepository/api_op_UpdateApplication.go b/service/serverlessapplicationrepository/api_op_UpdateApplication.go index ec423a9a531..7842c9620a1 100644 --- a/service/serverlessapplicationrepository/api_op_UpdateApplication.go +++ b/service/serverlessapplicationrepository/api_op_UpdateApplication.go @@ -5,7 +5,6 @@ package serverlessapplicationrepository import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateApplication(ctx context.Context, params *UpdateApplicatio addawsRestjson1_serdeOpUpdateApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/serverlessapplicationrepository/endpoints.go b/service/serverlessapplicationrepository/endpoints.go index 6977eed7e76..e5697ba783b 100644 --- a/service/serverlessapplicationrepository/endpoints.go +++ b/service/serverlessapplicationrepository/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/servicecatalog/api_client.go b/service/servicecatalog/api_client.go index 1edb30f1887..933ff91eddc 100644 --- a/service/servicecatalog/api_client.go +++ b/service/servicecatalog/api_client.go @@ -89,34 +89,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -189,6 +161,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/servicecatalog/api_op_AcceptPortfolioShare.go b/service/servicecatalog/api_op_AcceptPortfolioShare.go index 98cccc6db45..55f40521ba0 100644 --- a/service/servicecatalog/api_op_AcceptPortfolioShare.go +++ b/service/servicecatalog/api_op_AcceptPortfolioShare.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) AcceptPortfolioShare(ctx context.Context, params *AcceptPortfol addawsAwsjson11_serdeOpAcceptPortfolioShareMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_AssociateBudgetWithResource.go b/service/servicecatalog/api_op_AssociateBudgetWithResource.go index 078a0ffc75f..a925310bc20 100644 --- a/service/servicecatalog/api_op_AssociateBudgetWithResource.go +++ b/service/servicecatalog/api_op_AssociateBudgetWithResource.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AssociateBudgetWithResource(ctx context.Context, params *Associ addawsAwsjson11_serdeOpAssociateBudgetWithResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_AssociatePrincipalWithPortfolio.go b/service/servicecatalog/api_op_AssociatePrincipalWithPortfolio.go index 8fc3f501ab5..74f75a3797f 100644 --- a/service/servicecatalog/api_op_AssociatePrincipalWithPortfolio.go +++ b/service/servicecatalog/api_op_AssociatePrincipalWithPortfolio.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) AssociatePrincipalWithPortfolio(ctx context.Context, params *As addawsAwsjson11_serdeOpAssociatePrincipalWithPortfolioMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_AssociateProductWithPortfolio.go b/service/servicecatalog/api_op_AssociateProductWithPortfolio.go index 395bc00c29a..0c43597417e 100644 --- a/service/servicecatalog/api_op_AssociateProductWithPortfolio.go +++ b/service/servicecatalog/api_op_AssociateProductWithPortfolio.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AssociateProductWithPortfolio(ctx context.Context, params *Asso addawsAwsjson11_serdeOpAssociateProductWithPortfolioMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_AssociateServiceActionWithProvisioningArtifact.go b/service/servicecatalog/api_op_AssociateServiceActionWithProvisioningArtifact.go index 4abe849e04b..2fa5e7da713 100644 --- a/service/servicecatalog/api_op_AssociateServiceActionWithProvisioningArtifact.go +++ b/service/servicecatalog/api_op_AssociateServiceActionWithProvisioningArtifact.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AssociateServiceActionWithProvisioningArtifact(ctx context.Cont addawsAwsjson11_serdeOpAssociateServiceActionWithProvisioningArtifactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_AssociateTagOptionWithResource.go b/service/servicecatalog/api_op_AssociateTagOptionWithResource.go index 95fce261fe8..ccc1a1a31ce 100644 --- a/service/servicecatalog/api_op_AssociateTagOptionWithResource.go +++ b/service/servicecatalog/api_op_AssociateTagOptionWithResource.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AssociateTagOptionWithResource(ctx context.Context, params *Ass addawsAwsjson11_serdeOpAssociateTagOptionWithResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_BatchAssociateServiceActionWithProvisioningArtifact.go b/service/servicecatalog/api_op_BatchAssociateServiceActionWithProvisioningArtifact.go index 38dea67dade..1292df3b71f 100644 --- a/service/servicecatalog/api_op_BatchAssociateServiceActionWithProvisioningArtifact.go +++ b/service/servicecatalog/api_op_BatchAssociateServiceActionWithProvisioningArtifact.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) BatchAssociateServiceActionWithProvisioningArtifact(ctx context addawsAwsjson11_serdeOpBatchAssociateServiceActionWithProvisioningArtifactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_BatchDisassociateServiceActionFromProvisioningArtifact.go b/service/servicecatalog/api_op_BatchDisassociateServiceActionFromProvisioningArtifact.go index a81cbd5aa9c..91f17f95dc9 100644 --- a/service/servicecatalog/api_op_BatchDisassociateServiceActionFromProvisioningArtifact.go +++ b/service/servicecatalog/api_op_BatchDisassociateServiceActionFromProvisioningArtifact.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) BatchDisassociateServiceActionFromProvisioningArtifact(ctx cont addawsAwsjson11_serdeOpBatchDisassociateServiceActionFromProvisioningArtifactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_CopyProduct.go b/service/servicecatalog/api_op_CopyProduct.go index ab121f478ac..befbfce338c 100644 --- a/service/servicecatalog/api_op_CopyProduct.go +++ b/service/servicecatalog/api_op_CopyProduct.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CopyProduct(ctx context.Context, params *CopyProductInput, optF addawsAwsjson11_serdeOpCopyProductMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_CreateConstraint.go b/service/servicecatalog/api_op_CreateConstraint.go index fc40ae7fc1d..26e5580a5ea 100644 --- a/service/servicecatalog/api_op_CreateConstraint.go +++ b/service/servicecatalog/api_op_CreateConstraint.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateConstraint(ctx context.Context, params *CreateConstraintI addawsAwsjson11_serdeOpCreateConstraintMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_CreatePortfolio.go b/service/servicecatalog/api_op_CreatePortfolio.go index 0a1cb14a58b..fc7e7bb6be7 100644 --- a/service/servicecatalog/api_op_CreatePortfolio.go +++ b/service/servicecatalog/api_op_CreatePortfolio.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreatePortfolio(ctx context.Context, params *CreatePortfolioInp addawsAwsjson11_serdeOpCreatePortfolioMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_CreatePortfolioShare.go b/service/servicecatalog/api_op_CreatePortfolioShare.go index befc3e6b1f1..07f63695929 100644 --- a/service/servicecatalog/api_op_CreatePortfolioShare.go +++ b/service/servicecatalog/api_op_CreatePortfolioShare.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreatePortfolioShare(ctx context.Context, params *CreatePortfol addawsAwsjson11_serdeOpCreatePortfolioShareMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_CreateProduct.go b/service/servicecatalog/api_op_CreateProduct.go index 4a6ddab55be..0be9253bca9 100644 --- a/service/servicecatalog/api_op_CreateProduct.go +++ b/service/servicecatalog/api_op_CreateProduct.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateProduct(ctx context.Context, params *CreateProductInput, addawsAwsjson11_serdeOpCreateProductMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_CreateProvisionedProductPlan.go b/service/servicecatalog/api_op_CreateProvisionedProductPlan.go index c4a31861548..23f3fe2c0e2 100644 --- a/service/servicecatalog/api_op_CreateProvisionedProductPlan.go +++ b/service/servicecatalog/api_op_CreateProvisionedProductPlan.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateProvisionedProductPlan(ctx context.Context, params *Creat addawsAwsjson11_serdeOpCreateProvisionedProductPlanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_CreateProvisioningArtifact.go b/service/servicecatalog/api_op_CreateProvisioningArtifact.go index 6648d0d88e3..b874b12c2dc 100644 --- a/service/servicecatalog/api_op_CreateProvisioningArtifact.go +++ b/service/servicecatalog/api_op_CreateProvisioningArtifact.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateProvisioningArtifact(ctx context.Context, params *CreateP addawsAwsjson11_serdeOpCreateProvisioningArtifactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_CreateServiceAction.go b/service/servicecatalog/api_op_CreateServiceAction.go index 66d8e964a04..1c92c8f2557 100644 --- a/service/servicecatalog/api_op_CreateServiceAction.go +++ b/service/servicecatalog/api_op_CreateServiceAction.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateServiceAction(ctx context.Context, params *CreateServiceA addawsAwsjson11_serdeOpCreateServiceActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_CreateTagOption.go b/service/servicecatalog/api_op_CreateTagOption.go index 3c1fa1dadcb..c1181449e42 100644 --- a/service/servicecatalog/api_op_CreateTagOption.go +++ b/service/servicecatalog/api_op_CreateTagOption.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateTagOption(ctx context.Context, params *CreateTagOptionInp addawsAwsjson11_serdeOpCreateTagOptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DeleteConstraint.go b/service/servicecatalog/api_op_DeleteConstraint.go index c37b255d004..c5edf41d753 100644 --- a/service/servicecatalog/api_op_DeleteConstraint.go +++ b/service/servicecatalog/api_op_DeleteConstraint.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteConstraint(ctx context.Context, params *DeleteConstraintI addawsAwsjson11_serdeOpDeleteConstraintMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DeletePortfolio.go b/service/servicecatalog/api_op_DeletePortfolio.go index ba18b9299d8..fbd93767e1e 100644 --- a/service/servicecatalog/api_op_DeletePortfolio.go +++ b/service/servicecatalog/api_op_DeletePortfolio.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeletePortfolio(ctx context.Context, params *DeletePortfolioInp addawsAwsjson11_serdeOpDeletePortfolioMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DeletePortfolioShare.go b/service/servicecatalog/api_op_DeletePortfolioShare.go index c57068a2ee8..c349a29d520 100644 --- a/service/servicecatalog/api_op_DeletePortfolioShare.go +++ b/service/servicecatalog/api_op_DeletePortfolioShare.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeletePortfolioShare(ctx context.Context, params *DeletePortfol addawsAwsjson11_serdeOpDeletePortfolioShareMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DeleteProduct.go b/service/servicecatalog/api_op_DeleteProduct.go index 8831cf4bfcc..e1bb05b8980 100644 --- a/service/servicecatalog/api_op_DeleteProduct.go +++ b/service/servicecatalog/api_op_DeleteProduct.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteProduct(ctx context.Context, params *DeleteProductInput, addawsAwsjson11_serdeOpDeleteProductMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DeleteProvisionedProductPlan.go b/service/servicecatalog/api_op_DeleteProvisionedProductPlan.go index 5e03069f1c3..fa6d5dc2b93 100644 --- a/service/servicecatalog/api_op_DeleteProvisionedProductPlan.go +++ b/service/servicecatalog/api_op_DeleteProvisionedProductPlan.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteProvisionedProductPlan(ctx context.Context, params *Delet addawsAwsjson11_serdeOpDeleteProvisionedProductPlanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DeleteProvisioningArtifact.go b/service/servicecatalog/api_op_DeleteProvisioningArtifact.go index 776e8e02d94..3e2c6c04e81 100644 --- a/service/servicecatalog/api_op_DeleteProvisioningArtifact.go +++ b/service/servicecatalog/api_op_DeleteProvisioningArtifact.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteProvisioningArtifact(ctx context.Context, params *DeleteP addawsAwsjson11_serdeOpDeleteProvisioningArtifactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DeleteServiceAction.go b/service/servicecatalog/api_op_DeleteServiceAction.go index 32c6e3031fe..6c19d35a2cf 100644 --- a/service/servicecatalog/api_op_DeleteServiceAction.go +++ b/service/servicecatalog/api_op_DeleteServiceAction.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteServiceAction(ctx context.Context, params *DeleteServiceA addawsAwsjson11_serdeOpDeleteServiceActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DeleteTagOption.go b/service/servicecatalog/api_op_DeleteTagOption.go index 5f09ad3feef..00c67761275 100644 --- a/service/servicecatalog/api_op_DeleteTagOption.go +++ b/service/servicecatalog/api_op_DeleteTagOption.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteTagOption(ctx context.Context, params *DeleteTagOptionInp addawsAwsjson11_serdeOpDeleteTagOptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DescribeConstraint.go b/service/servicecatalog/api_op_DescribeConstraint.go index 916940ce0a7..627b7e0ae95 100644 --- a/service/servicecatalog/api_op_DescribeConstraint.go +++ b/service/servicecatalog/api_op_DescribeConstraint.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeConstraint(ctx context.Context, params *DescribeConstra addawsAwsjson11_serdeOpDescribeConstraintMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DescribeCopyProductStatus.go b/service/servicecatalog/api_op_DescribeCopyProductStatus.go index 8c2361580fa..347bd6fb2ba 100644 --- a/service/servicecatalog/api_op_DescribeCopyProductStatus.go +++ b/service/servicecatalog/api_op_DescribeCopyProductStatus.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeCopyProductStatus(ctx context.Context, params *Describe addawsAwsjson11_serdeOpDescribeCopyProductStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DescribePortfolio.go b/service/servicecatalog/api_op_DescribePortfolio.go index 2334d0a5d79..31c17966adf 100644 --- a/service/servicecatalog/api_op_DescribePortfolio.go +++ b/service/servicecatalog/api_op_DescribePortfolio.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribePortfolio(ctx context.Context, params *DescribePortfoli addawsAwsjson11_serdeOpDescribePortfolioMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DescribePortfolioShareStatus.go b/service/servicecatalog/api_op_DescribePortfolioShareStatus.go index f535b0a8ef0..45eeb61a0a1 100644 --- a/service/servicecatalog/api_op_DescribePortfolioShareStatus.go +++ b/service/servicecatalog/api_op_DescribePortfolioShareStatus.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribePortfolioShareStatus(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribePortfolioShareStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DescribeProduct.go b/service/servicecatalog/api_op_DescribeProduct.go index 43074d15711..1a98ce23c97 100644 --- a/service/servicecatalog/api_op_DescribeProduct.go +++ b/service/servicecatalog/api_op_DescribeProduct.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeProduct(ctx context.Context, params *DescribeProductInp addawsAwsjson11_serdeOpDescribeProductMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DescribeProductAsAdmin.go b/service/servicecatalog/api_op_DescribeProductAsAdmin.go index 48ed528bfe5..789f2b71480 100644 --- a/service/servicecatalog/api_op_DescribeProductAsAdmin.go +++ b/service/servicecatalog/api_op_DescribeProductAsAdmin.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeProductAsAdmin(ctx context.Context, params *DescribePro addawsAwsjson11_serdeOpDescribeProductAsAdminMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DescribeProductView.go b/service/servicecatalog/api_op_DescribeProductView.go index 8ecbe24e0d0..dbd850ea342 100644 --- a/service/servicecatalog/api_op_DescribeProductView.go +++ b/service/servicecatalog/api_op_DescribeProductView.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeProductView(ctx context.Context, params *DescribeProduc addawsAwsjson11_serdeOpDescribeProductViewMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DescribeProvisionedProduct.go b/service/servicecatalog/api_op_DescribeProvisionedProduct.go index 19174983750..84bc47d5be8 100644 --- a/service/servicecatalog/api_op_DescribeProvisionedProduct.go +++ b/service/servicecatalog/api_op_DescribeProvisionedProduct.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeProvisionedProduct(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeProvisionedProductMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DescribeProvisionedProductPlan.go b/service/servicecatalog/api_op_DescribeProvisionedProductPlan.go index 45b656103a3..697d463041f 100644 --- a/service/servicecatalog/api_op_DescribeProvisionedProductPlan.go +++ b/service/servicecatalog/api_op_DescribeProvisionedProductPlan.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeProvisionedProductPlan(ctx context.Context, params *Des addawsAwsjson11_serdeOpDescribeProvisionedProductPlanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DescribeProvisioningArtifact.go b/service/servicecatalog/api_op_DescribeProvisioningArtifact.go index 023ff01ef14..78b12212a2f 100644 --- a/service/servicecatalog/api_op_DescribeProvisioningArtifact.go +++ b/service/servicecatalog/api_op_DescribeProvisioningArtifact.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeProvisioningArtifact(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribeProvisioningArtifactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DescribeProvisioningParameters.go b/service/servicecatalog/api_op_DescribeProvisioningParameters.go index 9d249deb58e..34204c4cc43 100644 --- a/service/servicecatalog/api_op_DescribeProvisioningParameters.go +++ b/service/servicecatalog/api_op_DescribeProvisioningParameters.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DescribeProvisioningParameters(ctx context.Context, params *Des addawsAwsjson11_serdeOpDescribeProvisioningParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DescribeRecord.go b/service/servicecatalog/api_op_DescribeRecord.go index de38f1f43d1..06514d8eb90 100644 --- a/service/servicecatalog/api_op_DescribeRecord.go +++ b/service/servicecatalog/api_op_DescribeRecord.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DescribeRecord(ctx context.Context, params *DescribeRecordInput addawsAwsjson11_serdeOpDescribeRecordMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DescribeServiceAction.go b/service/servicecatalog/api_op_DescribeServiceAction.go index e0d83df78fe..46a46558605 100644 --- a/service/servicecatalog/api_op_DescribeServiceAction.go +++ b/service/servicecatalog/api_op_DescribeServiceAction.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeServiceAction(ctx context.Context, params *DescribeServ addawsAwsjson11_serdeOpDescribeServiceActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DescribeServiceActionExecutionParameters.go b/service/servicecatalog/api_op_DescribeServiceActionExecutionParameters.go index 9a1c4a06772..203f20788d9 100644 --- a/service/servicecatalog/api_op_DescribeServiceActionExecutionParameters.go +++ b/service/servicecatalog/api_op_DescribeServiceActionExecutionParameters.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeServiceActionExecutionParameters(ctx context.Context, p addawsAwsjson11_serdeOpDescribeServiceActionExecutionParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DescribeTagOption.go b/service/servicecatalog/api_op_DescribeTagOption.go index 6f7a08f9953..427f006eb69 100644 --- a/service/servicecatalog/api_op_DescribeTagOption.go +++ b/service/servicecatalog/api_op_DescribeTagOption.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeTagOption(ctx context.Context, params *DescribeTagOptio addawsAwsjson11_serdeOpDescribeTagOptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DisableAWSOrganizationsAccess.go b/service/servicecatalog/api_op_DisableAWSOrganizationsAccess.go index 65c20f94660..70eb864997f 100644 --- a/service/servicecatalog/api_op_DisableAWSOrganizationsAccess.go +++ b/service/servicecatalog/api_op_DisableAWSOrganizationsAccess.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DisableAWSOrganizationsAccess(ctx context.Context, params *Disa addawsAwsjson11_serdeOpDisableAWSOrganizationsAccessMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DisassociateBudgetFromResource.go b/service/servicecatalog/api_op_DisassociateBudgetFromResource.go index 11a79b16224..04db4a2a0e4 100644 --- a/service/servicecatalog/api_op_DisassociateBudgetFromResource.go +++ b/service/servicecatalog/api_op_DisassociateBudgetFromResource.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisassociateBudgetFromResource(ctx context.Context, params *Dis addawsAwsjson11_serdeOpDisassociateBudgetFromResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DisassociatePrincipalFromPortfolio.go b/service/servicecatalog/api_op_DisassociatePrincipalFromPortfolio.go index ae8e77f9259..68c3d694dbd 100644 --- a/service/servicecatalog/api_op_DisassociatePrincipalFromPortfolio.go +++ b/service/servicecatalog/api_op_DisassociatePrincipalFromPortfolio.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisassociatePrincipalFromPortfolio(ctx context.Context, params addawsAwsjson11_serdeOpDisassociatePrincipalFromPortfolioMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DisassociateProductFromPortfolio.go b/service/servicecatalog/api_op_DisassociateProductFromPortfolio.go index e05dd1fdad6..b152ec470ed 100644 --- a/service/servicecatalog/api_op_DisassociateProductFromPortfolio.go +++ b/service/servicecatalog/api_op_DisassociateProductFromPortfolio.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisassociateProductFromPortfolio(ctx context.Context, params *D addawsAwsjson11_serdeOpDisassociateProductFromPortfolioMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DisassociateServiceActionFromProvisioningArtifact.go b/service/servicecatalog/api_op_DisassociateServiceActionFromProvisioningArtifact.go index 564f3360def..c8ee6d142f7 100644 --- a/service/servicecatalog/api_op_DisassociateServiceActionFromProvisioningArtifact.go +++ b/service/servicecatalog/api_op_DisassociateServiceActionFromProvisioningArtifact.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisassociateServiceActionFromProvisioningArtifact(ctx context.C addawsAwsjson11_serdeOpDisassociateServiceActionFromProvisioningArtifactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_DisassociateTagOptionFromResource.go b/service/servicecatalog/api_op_DisassociateTagOptionFromResource.go index 60a9c760c18..2265297f71b 100644 --- a/service/servicecatalog/api_op_DisassociateTagOptionFromResource.go +++ b/service/servicecatalog/api_op_DisassociateTagOptionFromResource.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisassociateTagOptionFromResource(ctx context.Context, params * addawsAwsjson11_serdeOpDisassociateTagOptionFromResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_EnableAWSOrganizationsAccess.go b/service/servicecatalog/api_op_EnableAWSOrganizationsAccess.go index e937fe39b70..05268d41ad5 100644 --- a/service/servicecatalog/api_op_EnableAWSOrganizationsAccess.go +++ b/service/servicecatalog/api_op_EnableAWSOrganizationsAccess.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) EnableAWSOrganizationsAccess(ctx context.Context, params *Enabl addawsAwsjson11_serdeOpEnableAWSOrganizationsAccessMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ExecuteProvisionedProductPlan.go b/service/servicecatalog/api_op_ExecuteProvisionedProductPlan.go index e2ca7a30742..deb99f8f15d 100644 --- a/service/servicecatalog/api_op_ExecuteProvisionedProductPlan.go +++ b/service/servicecatalog/api_op_ExecuteProvisionedProductPlan.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ExecuteProvisionedProductPlan(ctx context.Context, params *Exec addawsAwsjson11_serdeOpExecuteProvisionedProductPlanMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ExecuteProvisionedProductServiceAction.go b/service/servicecatalog/api_op_ExecuteProvisionedProductServiceAction.go index c5ecdc3d00a..9a932f2d1c2 100644 --- a/service/servicecatalog/api_op_ExecuteProvisionedProductServiceAction.go +++ b/service/servicecatalog/api_op_ExecuteProvisionedProductServiceAction.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ExecuteProvisionedProductServiceAction(ctx context.Context, par addawsAwsjson11_serdeOpExecuteProvisionedProductServiceActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_GetAWSOrganizationsAccessStatus.go b/service/servicecatalog/api_op_GetAWSOrganizationsAccessStatus.go index b863c1764d2..0295b844156 100644 --- a/service/servicecatalog/api_op_GetAWSOrganizationsAccessStatus.go +++ b/service/servicecatalog/api_op_GetAWSOrganizationsAccessStatus.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetAWSOrganizationsAccessStatus(ctx context.Context, params *Ge addawsAwsjson11_serdeOpGetAWSOrganizationsAccessStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ListAcceptedPortfolioShares.go b/service/servicecatalog/api_op_ListAcceptedPortfolioShares.go index 5d306afd27f..55494d7c452 100644 --- a/service/servicecatalog/api_op_ListAcceptedPortfolioShares.go +++ b/service/servicecatalog/api_op_ListAcceptedPortfolioShares.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListAcceptedPortfolioShares(ctx context.Context, params *ListAc addawsAwsjson11_serdeOpListAcceptedPortfolioSharesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ListBudgetsForResource.go b/service/servicecatalog/api_op_ListBudgetsForResource.go index 317e2fb72e7..82a745a1037 100644 --- a/service/servicecatalog/api_op_ListBudgetsForResource.go +++ b/service/servicecatalog/api_op_ListBudgetsForResource.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListBudgetsForResource(ctx context.Context, params *ListBudgets addawsAwsjson11_serdeOpListBudgetsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ListConstraintsForPortfolio.go b/service/servicecatalog/api_op_ListConstraintsForPortfolio.go index 578999a372d..37e0ad4ade1 100644 --- a/service/servicecatalog/api_op_ListConstraintsForPortfolio.go +++ b/service/servicecatalog/api_op_ListConstraintsForPortfolio.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListConstraintsForPortfolio(ctx context.Context, params *ListCo addawsAwsjson11_serdeOpListConstraintsForPortfolioMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ListLaunchPaths.go b/service/servicecatalog/api_op_ListLaunchPaths.go index 68ad07fc576..a319e729f46 100644 --- a/service/servicecatalog/api_op_ListLaunchPaths.go +++ b/service/servicecatalog/api_op_ListLaunchPaths.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListLaunchPaths(ctx context.Context, params *ListLaunchPathsInp addawsAwsjson11_serdeOpListLaunchPathsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ListOrganizationPortfolioAccess.go b/service/servicecatalog/api_op_ListOrganizationPortfolioAccess.go index bcfb563d822..f9c524fa758 100644 --- a/service/servicecatalog/api_op_ListOrganizationPortfolioAccess.go +++ b/service/servicecatalog/api_op_ListOrganizationPortfolioAccess.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListOrganizationPortfolioAccess(ctx context.Context, params *Li addawsAwsjson11_serdeOpListOrganizationPortfolioAccessMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ListPortfolioAccess.go b/service/servicecatalog/api_op_ListPortfolioAccess.go index e4bebe5ed6c..1acc16820b9 100644 --- a/service/servicecatalog/api_op_ListPortfolioAccess.go +++ b/service/servicecatalog/api_op_ListPortfolioAccess.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) ListPortfolioAccess(ctx context.Context, params *ListPortfolioA addawsAwsjson11_serdeOpListPortfolioAccessMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ListPortfolios.go b/service/servicecatalog/api_op_ListPortfolios.go index 269aefa3d39..26ff5f05d86 100644 --- a/service/servicecatalog/api_op_ListPortfolios.go +++ b/service/servicecatalog/api_op_ListPortfolios.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListPortfolios(ctx context.Context, params *ListPortfoliosInput addawsAwsjson11_serdeOpListPortfoliosMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ListPortfoliosForProduct.go b/service/servicecatalog/api_op_ListPortfoliosForProduct.go index 089e040e127..e5c1694160c 100644 --- a/service/servicecatalog/api_op_ListPortfoliosForProduct.go +++ b/service/servicecatalog/api_op_ListPortfoliosForProduct.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListPortfoliosForProduct(ctx context.Context, params *ListPortf addawsAwsjson11_serdeOpListPortfoliosForProductMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ListPrincipalsForPortfolio.go b/service/servicecatalog/api_op_ListPrincipalsForPortfolio.go index 05c1d8e3862..ee87f20c939 100644 --- a/service/servicecatalog/api_op_ListPrincipalsForPortfolio.go +++ b/service/servicecatalog/api_op_ListPrincipalsForPortfolio.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListPrincipalsForPortfolio(ctx context.Context, params *ListPri addawsAwsjson11_serdeOpListPrincipalsForPortfolioMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ListProvisionedProductPlans.go b/service/servicecatalog/api_op_ListProvisionedProductPlans.go index 06923c03854..8fe0999a260 100644 --- a/service/servicecatalog/api_op_ListProvisionedProductPlans.go +++ b/service/servicecatalog/api_op_ListProvisionedProductPlans.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListProvisionedProductPlans(ctx context.Context, params *ListPr addawsAwsjson11_serdeOpListProvisionedProductPlansMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ListProvisioningArtifacts.go b/service/servicecatalog/api_op_ListProvisioningArtifacts.go index 17f401704ba..66f00d04409 100644 --- a/service/servicecatalog/api_op_ListProvisioningArtifacts.go +++ b/service/servicecatalog/api_op_ListProvisioningArtifacts.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListProvisioningArtifacts(ctx context.Context, params *ListProv addawsAwsjson11_serdeOpListProvisioningArtifactsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ListProvisioningArtifactsForServiceAction.go b/service/servicecatalog/api_op_ListProvisioningArtifactsForServiceAction.go index 15cf836421d..085bedda96b 100644 --- a/service/servicecatalog/api_op_ListProvisioningArtifactsForServiceAction.go +++ b/service/servicecatalog/api_op_ListProvisioningArtifactsForServiceAction.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListProvisioningArtifactsForServiceAction(ctx context.Context, addawsAwsjson11_serdeOpListProvisioningArtifactsForServiceActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ListRecordHistory.go b/service/servicecatalog/api_op_ListRecordHistory.go index 3c868ddfa30..5c1f9a21c7c 100644 --- a/service/servicecatalog/api_op_ListRecordHistory.go +++ b/service/servicecatalog/api_op_ListRecordHistory.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListRecordHistory(ctx context.Context, params *ListRecordHistor addawsAwsjson11_serdeOpListRecordHistoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ListResourcesForTagOption.go b/service/servicecatalog/api_op_ListResourcesForTagOption.go index e956c1df9cb..f7230ccb0ea 100644 --- a/service/servicecatalog/api_op_ListResourcesForTagOption.go +++ b/service/servicecatalog/api_op_ListResourcesForTagOption.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListResourcesForTagOption(ctx context.Context, params *ListReso addawsAwsjson11_serdeOpListResourcesForTagOptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ListServiceActions.go b/service/servicecatalog/api_op_ListServiceActions.go index 908adffab53..820a74abf84 100644 --- a/service/servicecatalog/api_op_ListServiceActions.go +++ b/service/servicecatalog/api_op_ListServiceActions.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListServiceActions(ctx context.Context, params *ListServiceActi addawsAwsjson11_serdeOpListServiceActionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ListServiceActionsForProvisioningArtifact.go b/service/servicecatalog/api_op_ListServiceActionsForProvisioningArtifact.go index 91741c2d571..effab7f4909 100644 --- a/service/servicecatalog/api_op_ListServiceActionsForProvisioningArtifact.go +++ b/service/servicecatalog/api_op_ListServiceActionsForProvisioningArtifact.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListServiceActionsForProvisioningArtifact(ctx context.Context, addawsAwsjson11_serdeOpListServiceActionsForProvisioningArtifactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ListStackInstancesForProvisionedProduct.go b/service/servicecatalog/api_op_ListStackInstancesForProvisionedProduct.go index 27fe17f2bc7..54fd3d1fc84 100644 --- a/service/servicecatalog/api_op_ListStackInstancesForProvisionedProduct.go +++ b/service/servicecatalog/api_op_ListStackInstancesForProvisionedProduct.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListStackInstancesForProvisionedProduct(ctx context.Context, pa addawsAwsjson11_serdeOpListStackInstancesForProvisionedProductMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ListTagOptions.go b/service/servicecatalog/api_op_ListTagOptions.go index d0eddae68aa..c32a3d37ddb 100644 --- a/service/servicecatalog/api_op_ListTagOptions.go +++ b/service/servicecatalog/api_op_ListTagOptions.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagOptions(ctx context.Context, params *ListTagOptionsInput addawsAwsjson11_serdeOpListTagOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ProvisionProduct.go b/service/servicecatalog/api_op_ProvisionProduct.go index ce2c52a7d7a..0a5d180c766 100644 --- a/service/servicecatalog/api_op_ProvisionProduct.go +++ b/service/servicecatalog/api_op_ProvisionProduct.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ProvisionProduct(ctx context.Context, params *ProvisionProductI addawsAwsjson11_serdeOpProvisionProductMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_RejectPortfolioShare.go b/service/servicecatalog/api_op_RejectPortfolioShare.go index 1f48784d1a3..2438a1968ac 100644 --- a/service/servicecatalog/api_op_RejectPortfolioShare.go +++ b/service/servicecatalog/api_op_RejectPortfolioShare.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RejectPortfolioShare(ctx context.Context, params *RejectPortfol addawsAwsjson11_serdeOpRejectPortfolioShareMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_ScanProvisionedProducts.go b/service/servicecatalog/api_op_ScanProvisionedProducts.go index a9379112563..64b21ebad4f 100644 --- a/service/servicecatalog/api_op_ScanProvisionedProducts.go +++ b/service/servicecatalog/api_op_ScanProvisionedProducts.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ScanProvisionedProducts(ctx context.Context, params *ScanProvis addawsAwsjson11_serdeOpScanProvisionedProductsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_SearchProducts.go b/service/servicecatalog/api_op_SearchProducts.go index 96b722d74c0..e2ca2ce87ac 100644 --- a/service/servicecatalog/api_op_SearchProducts.go +++ b/service/servicecatalog/api_op_SearchProducts.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SearchProducts(ctx context.Context, params *SearchProductsInput addawsAwsjson11_serdeOpSearchProductsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_SearchProductsAsAdmin.go b/service/servicecatalog/api_op_SearchProductsAsAdmin.go index 838be34b110..362f725d17c 100644 --- a/service/servicecatalog/api_op_SearchProductsAsAdmin.go +++ b/service/servicecatalog/api_op_SearchProductsAsAdmin.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SearchProductsAsAdmin(ctx context.Context, params *SearchProduc addawsAwsjson11_serdeOpSearchProductsAsAdminMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_SearchProvisionedProducts.go b/service/servicecatalog/api_op_SearchProvisionedProducts.go index 7e480ac790d..9ede53fda59 100644 --- a/service/servicecatalog/api_op_SearchProvisionedProducts.go +++ b/service/servicecatalog/api_op_SearchProvisionedProducts.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) SearchProvisionedProducts(ctx context.Context, params *SearchPr addawsAwsjson11_serdeOpSearchProvisionedProductsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_TerminateProvisionedProduct.go b/service/servicecatalog/api_op_TerminateProvisionedProduct.go index 0f4fb4258df..ddd5321432c 100644 --- a/service/servicecatalog/api_op_TerminateProvisionedProduct.go +++ b/service/servicecatalog/api_op_TerminateProvisionedProduct.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) TerminateProvisionedProduct(ctx context.Context, params *Termin addawsAwsjson11_serdeOpTerminateProvisionedProductMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_UpdateConstraint.go b/service/servicecatalog/api_op_UpdateConstraint.go index e51bce1c802..0cea3914b58 100644 --- a/service/servicecatalog/api_op_UpdateConstraint.go +++ b/service/servicecatalog/api_op_UpdateConstraint.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateConstraint(ctx context.Context, params *UpdateConstraintI addawsAwsjson11_serdeOpUpdateConstraintMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_UpdatePortfolio.go b/service/servicecatalog/api_op_UpdatePortfolio.go index 6d12ef723d5..5486f97e04b 100644 --- a/service/servicecatalog/api_op_UpdatePortfolio.go +++ b/service/servicecatalog/api_op_UpdatePortfolio.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdatePortfolio(ctx context.Context, params *UpdatePortfolioInp addawsAwsjson11_serdeOpUpdatePortfolioMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_UpdateProduct.go b/service/servicecatalog/api_op_UpdateProduct.go index 29bfcb52a2c..01e28e74fdc 100644 --- a/service/servicecatalog/api_op_UpdateProduct.go +++ b/service/servicecatalog/api_op_UpdateProduct.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateProduct(ctx context.Context, params *UpdateProductInput, addawsAwsjson11_serdeOpUpdateProductMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_UpdateProvisionedProduct.go b/service/servicecatalog/api_op_UpdateProvisionedProduct.go index 24b636ecec8..0e3d2a0010d 100644 --- a/service/servicecatalog/api_op_UpdateProvisionedProduct.go +++ b/service/servicecatalog/api_op_UpdateProvisionedProduct.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) UpdateProvisionedProduct(ctx context.Context, params *UpdatePro addawsAwsjson11_serdeOpUpdateProvisionedProductMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_UpdateProvisionedProductProperties.go b/service/servicecatalog/api_op_UpdateProvisionedProductProperties.go index b64409b86de..17febb75e2b 100644 --- a/service/servicecatalog/api_op_UpdateProvisionedProductProperties.go +++ b/service/servicecatalog/api_op_UpdateProvisionedProductProperties.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateProvisionedProductProperties(ctx context.Context, params addawsAwsjson11_serdeOpUpdateProvisionedProductPropertiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_UpdateProvisioningArtifact.go b/service/servicecatalog/api_op_UpdateProvisioningArtifact.go index e4343f940da..ded1577fc9e 100644 --- a/service/servicecatalog/api_op_UpdateProvisioningArtifact.go +++ b/service/servicecatalog/api_op_UpdateProvisioningArtifact.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateProvisioningArtifact(ctx context.Context, params *UpdateP addawsAwsjson11_serdeOpUpdateProvisioningArtifactMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_UpdateServiceAction.go b/service/servicecatalog/api_op_UpdateServiceAction.go index 804379d3662..9bf09030cf6 100644 --- a/service/servicecatalog/api_op_UpdateServiceAction.go +++ b/service/servicecatalog/api_op_UpdateServiceAction.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateServiceAction(ctx context.Context, params *UpdateServiceA addawsAwsjson11_serdeOpUpdateServiceActionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/api_op_UpdateTagOption.go b/service/servicecatalog/api_op_UpdateTagOption.go index ad74c754ab2..b33655407f0 100644 --- a/service/servicecatalog/api_op_UpdateTagOption.go +++ b/service/servicecatalog/api_op_UpdateTagOption.go @@ -5,7 +5,6 @@ package servicecatalog import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateTagOption(ctx context.Context, params *UpdateTagOptionInp addawsAwsjson11_serdeOpUpdateTagOptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicecatalog/endpoints.go b/service/servicecatalog/endpoints.go index c3910a9da10..3ace01f1573 100644 --- a/service/servicecatalog/endpoints.go +++ b/service/servicecatalog/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/servicediscovery/api_client.go b/service/servicediscovery/api_client.go index bad80b82b7e..ca72d685d7e 100644 --- a/service/servicediscovery/api_client.go +++ b/service/servicediscovery/api_client.go @@ -91,34 +91,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -191,6 +163,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/servicediscovery/api_op_CreateHttpNamespace.go b/service/servicediscovery/api_op_CreateHttpNamespace.go index 29ccd003ba3..77918523b2f 100644 --- a/service/servicediscovery/api_op_CreateHttpNamespace.go +++ b/service/servicediscovery/api_op_CreateHttpNamespace.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateHttpNamespace(ctx context.Context, params *CreateHttpName addawsAwsjson11_serdeOpCreateHttpNamespaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_CreatePrivateDnsNamespace.go b/service/servicediscovery/api_op_CreatePrivateDnsNamespace.go index 5305d7dedba..f73d5e7f57a 100644 --- a/service/servicediscovery/api_op_CreatePrivateDnsNamespace.go +++ b/service/servicediscovery/api_op_CreatePrivateDnsNamespace.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreatePrivateDnsNamespace(ctx context.Context, params *CreatePr addawsAwsjson11_serdeOpCreatePrivateDnsNamespaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_CreatePublicDnsNamespace.go b/service/servicediscovery/api_op_CreatePublicDnsNamespace.go index 5f6d0cf36e9..ec1add9f421 100644 --- a/service/servicediscovery/api_op_CreatePublicDnsNamespace.go +++ b/service/servicediscovery/api_op_CreatePublicDnsNamespace.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreatePublicDnsNamespace(ctx context.Context, params *CreatePub addawsAwsjson11_serdeOpCreatePublicDnsNamespaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_CreateService.go b/service/servicediscovery/api_op_CreateService.go index c1f57d07324..4cef8b9950d 100644 --- a/service/servicediscovery/api_op_CreateService.go +++ b/service/servicediscovery/api_op_CreateService.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" smithy "github.com/awslabs/smithy-go" @@ -51,9 +50,9 @@ func (c *Client) CreateService(ctx context.Context, params *CreateServiceInput, addawsAwsjson11_serdeOpCreateServiceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_DeleteNamespace.go b/service/servicediscovery/api_op_DeleteNamespace.go index b74d702b984..e3c35697034 100644 --- a/service/servicediscovery/api_op_DeleteNamespace.go +++ b/service/servicediscovery/api_op_DeleteNamespace.go @@ -5,7 +5,6 @@ package servicediscovery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteNamespace(ctx context.Context, params *DeleteNamespaceInp addawsAwsjson11_serdeOpDeleteNamespaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_DeleteService.go b/service/servicediscovery/api_op_DeleteService.go index b170e150114..ed63b394a15 100644 --- a/service/servicediscovery/api_op_DeleteService.go +++ b/service/servicediscovery/api_op_DeleteService.go @@ -5,7 +5,6 @@ package servicediscovery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteService(ctx context.Context, params *DeleteServiceInput, addawsAwsjson11_serdeOpDeleteServiceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_DeregisterInstance.go b/service/servicediscovery/api_op_DeregisterInstance.go index 4679a93927b..c39bf2e6cac 100644 --- a/service/servicediscovery/api_op_DeregisterInstance.go +++ b/service/servicediscovery/api_op_DeregisterInstance.go @@ -5,7 +5,6 @@ package servicediscovery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeregisterInstance(ctx context.Context, params *DeregisterInsta addawsAwsjson11_serdeOpDeregisterInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_DiscoverInstances.go b/service/servicediscovery/api_op_DiscoverInstances.go index f76e532e423..624a2023287 100644 --- a/service/servicediscovery/api_op_DiscoverInstances.go +++ b/service/servicediscovery/api_op_DiscoverInstances.go @@ -5,7 +5,6 @@ package servicediscovery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DiscoverInstances(ctx context.Context, params *DiscoverInstance addawsAwsjson11_serdeOpDiscoverInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_GetInstance.go b/service/servicediscovery/api_op_GetInstance.go index 76af4c31105..ba31eacc1ca 100644 --- a/service/servicediscovery/api_op_GetInstance.go +++ b/service/servicediscovery/api_op_GetInstance.go @@ -5,7 +5,6 @@ package servicediscovery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetInstance(ctx context.Context, params *GetInstanceInput, optF addawsAwsjson11_serdeOpGetInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_GetInstancesHealthStatus.go b/service/servicediscovery/api_op_GetInstancesHealthStatus.go index a3d7bee0bc7..82e56338c01 100644 --- a/service/servicediscovery/api_op_GetInstancesHealthStatus.go +++ b/service/servicediscovery/api_op_GetInstancesHealthStatus.go @@ -5,7 +5,6 @@ package servicediscovery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetInstancesHealthStatus(ctx context.Context, params *GetInstan addawsAwsjson11_serdeOpGetInstancesHealthStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_GetNamespace.go b/service/servicediscovery/api_op_GetNamespace.go index eb31f40ab13..fb77c3757d5 100644 --- a/service/servicediscovery/api_op_GetNamespace.go +++ b/service/servicediscovery/api_op_GetNamespace.go @@ -5,7 +5,6 @@ package servicediscovery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetNamespace(ctx context.Context, params *GetNamespaceInput, op addawsAwsjson11_serdeOpGetNamespaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_GetOperation.go b/service/servicediscovery/api_op_GetOperation.go index 89e36df47c3..7161064a2a4 100644 --- a/service/servicediscovery/api_op_GetOperation.go +++ b/service/servicediscovery/api_op_GetOperation.go @@ -5,7 +5,6 @@ package servicediscovery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetOperation(ctx context.Context, params *GetOperationInput, op addawsAwsjson11_serdeOpGetOperationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_GetService.go b/service/servicediscovery/api_op_GetService.go index 5fa6f92a41b..bdf4bbe9abf 100644 --- a/service/servicediscovery/api_op_GetService.go +++ b/service/servicediscovery/api_op_GetService.go @@ -5,7 +5,6 @@ package servicediscovery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetService(ctx context.Context, params *GetServiceInput, optFns addawsAwsjson11_serdeOpGetServiceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_ListInstances.go b/service/servicediscovery/api_op_ListInstances.go index f11971482bc..2402425c715 100644 --- a/service/servicediscovery/api_op_ListInstances.go +++ b/service/servicediscovery/api_op_ListInstances.go @@ -5,7 +5,6 @@ package servicediscovery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListInstances(ctx context.Context, params *ListInstancesInput, addawsAwsjson11_serdeOpListInstancesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_ListNamespaces.go b/service/servicediscovery/api_op_ListNamespaces.go index e510ff6f50a..efa4d976dc2 100644 --- a/service/servicediscovery/api_op_ListNamespaces.go +++ b/service/servicediscovery/api_op_ListNamespaces.go @@ -5,7 +5,6 @@ package servicediscovery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListNamespaces(ctx context.Context, params *ListNamespacesInput addawsAwsjson11_serdeOpListNamespacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_ListOperations.go b/service/servicediscovery/api_op_ListOperations.go index cd5dcd59e23..0c3ba759bb8 100644 --- a/service/servicediscovery/api_op_ListOperations.go +++ b/service/servicediscovery/api_op_ListOperations.go @@ -5,7 +5,6 @@ package servicediscovery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListOperations(ctx context.Context, params *ListOperationsInput addawsAwsjson11_serdeOpListOperationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_ListServices.go b/service/servicediscovery/api_op_ListServices.go index 7c896e11410..80cfdb72121 100644 --- a/service/servicediscovery/api_op_ListServices.go +++ b/service/servicediscovery/api_op_ListServices.go @@ -5,7 +5,6 @@ package servicediscovery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListServices(ctx context.Context, params *ListServicesInput, op addawsAwsjson11_serdeOpListServicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_ListTagsForResource.go b/service/servicediscovery/api_op_ListTagsForResource.go index 609ebcdf8e6..b761dfa9e1b 100644 --- a/service/servicediscovery/api_op_ListTagsForResource.go +++ b/service/servicediscovery/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package servicediscovery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_RegisterInstance.go b/service/servicediscovery/api_op_RegisterInstance.go index 6d32cd3e943..f476cca0c10 100644 --- a/service/servicediscovery/api_op_RegisterInstance.go +++ b/service/servicediscovery/api_op_RegisterInstance.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -58,9 +57,9 @@ func (c *Client) RegisterInstance(ctx context.Context, params *RegisterInstanceI addawsAwsjson11_serdeOpRegisterInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_TagResource.go b/service/servicediscovery/api_op_TagResource.go index 51ca8dce64e..4e48122469b 100644 --- a/service/servicediscovery/api_op_TagResource.go +++ b/service/servicediscovery/api_op_TagResource.go @@ -5,7 +5,6 @@ package servicediscovery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_UntagResource.go b/service/servicediscovery/api_op_UntagResource.go index ba08ea9bd65..ec1a88dbf40 100644 --- a/service/servicediscovery/api_op_UntagResource.go +++ b/service/servicediscovery/api_op_UntagResource.go @@ -5,7 +5,6 @@ package servicediscovery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_UpdateInstanceCustomHealthStatus.go b/service/servicediscovery/api_op_UpdateInstanceCustomHealthStatus.go index 759f9c94686..6483930a157 100644 --- a/service/servicediscovery/api_op_UpdateInstanceCustomHealthStatus.go +++ b/service/servicediscovery/api_op_UpdateInstanceCustomHealthStatus.go @@ -5,7 +5,6 @@ package servicediscovery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) UpdateInstanceCustomHealthStatus(ctx context.Context, params *U addawsAwsjson11_serdeOpUpdateInstanceCustomHealthStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/api_op_UpdateService.go b/service/servicediscovery/api_op_UpdateService.go index f731d49bc18..8d36ad118d3 100644 --- a/service/servicediscovery/api_op_UpdateService.go +++ b/service/servicediscovery/api_op_UpdateService.go @@ -5,7 +5,6 @@ package servicediscovery import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicediscovery/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) UpdateService(ctx context.Context, params *UpdateServiceInput, addawsAwsjson11_serdeOpUpdateServiceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicediscovery/endpoints.go b/service/servicediscovery/endpoints.go index d05f9b9f434..a95c290f17e 100644 --- a/service/servicediscovery/endpoints.go +++ b/service/servicediscovery/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/servicequotas/api_client.go b/service/servicequotas/api_client.go index 5f9b31b1346..f6cd70996fd 100644 --- a/service/servicequotas/api_client.go +++ b/service/servicequotas/api_client.go @@ -89,30 +89,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -178,6 +154,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/servicequotas/api_op_AssociateServiceQuotaTemplate.go b/service/servicequotas/api_op_AssociateServiceQuotaTemplate.go index 238e8a0381d..cea33445da4 100644 --- a/service/servicequotas/api_op_AssociateServiceQuotaTemplate.go +++ b/service/servicequotas/api_op_AssociateServiceQuotaTemplate.go @@ -5,7 +5,6 @@ package servicequotas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) AssociateServiceQuotaTemplate(ctx context.Context, params *Asso addawsAwsjson11_serdeOpAssociateServiceQuotaTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicequotas/api_op_DeleteServiceQuotaIncreaseRequestFromTemplate.go b/service/servicequotas/api_op_DeleteServiceQuotaIncreaseRequestFromTemplate.go index c681896f26f..6a48e0e1458 100644 --- a/service/servicequotas/api_op_DeleteServiceQuotaIncreaseRequestFromTemplate.go +++ b/service/servicequotas/api_op_DeleteServiceQuotaIncreaseRequestFromTemplate.go @@ -5,7 +5,6 @@ package servicequotas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteServiceQuotaIncreaseRequestFromTemplate(ctx context.Conte addawsAwsjson11_serdeOpDeleteServiceQuotaIncreaseRequestFromTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicequotas/api_op_DisassociateServiceQuotaTemplate.go b/service/servicequotas/api_op_DisassociateServiceQuotaTemplate.go index 7eb8d360d37..2ec61e1a333 100644 --- a/service/servicequotas/api_op_DisassociateServiceQuotaTemplate.go +++ b/service/servicequotas/api_op_DisassociateServiceQuotaTemplate.go @@ -5,7 +5,6 @@ package servicequotas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DisassociateServiceQuotaTemplate(ctx context.Context, params *D addawsAwsjson11_serdeOpDisassociateServiceQuotaTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicequotas/api_op_GetAWSDefaultServiceQuota.go b/service/servicequotas/api_op_GetAWSDefaultServiceQuota.go index 49b06f56809..1dd0bba2ec0 100644 --- a/service/servicequotas/api_op_GetAWSDefaultServiceQuota.go +++ b/service/servicequotas/api_op_GetAWSDefaultServiceQuota.go @@ -5,7 +5,6 @@ package servicequotas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicequotas/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetAWSDefaultServiceQuota(ctx context.Context, params *GetAWSDe addawsAwsjson11_serdeOpGetAWSDefaultServiceQuotaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicequotas/api_op_GetAssociationForServiceQuotaTemplate.go b/service/servicequotas/api_op_GetAssociationForServiceQuotaTemplate.go index 1199c641a39..41f9bedb419 100644 --- a/service/servicequotas/api_op_GetAssociationForServiceQuotaTemplate.go +++ b/service/servicequotas/api_op_GetAssociationForServiceQuotaTemplate.go @@ -5,7 +5,6 @@ package servicequotas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicequotas/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetAssociationForServiceQuotaTemplate(ctx context.Context, para addawsAwsjson11_serdeOpGetAssociationForServiceQuotaTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicequotas/api_op_GetRequestedServiceQuotaChange.go b/service/servicequotas/api_op_GetRequestedServiceQuotaChange.go index 64ef6636d0d..9446aa27a00 100644 --- a/service/servicequotas/api_op_GetRequestedServiceQuotaChange.go +++ b/service/servicequotas/api_op_GetRequestedServiceQuotaChange.go @@ -5,7 +5,6 @@ package servicequotas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicequotas/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetRequestedServiceQuotaChange(ctx context.Context, params *Get addawsAwsjson11_serdeOpGetRequestedServiceQuotaChangeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicequotas/api_op_GetServiceQuota.go b/service/servicequotas/api_op_GetServiceQuota.go index a84e0391c61..b16e5949bab 100644 --- a/service/servicequotas/api_op_GetServiceQuota.go +++ b/service/servicequotas/api_op_GetServiceQuota.go @@ -5,7 +5,6 @@ package servicequotas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicequotas/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetServiceQuota(ctx context.Context, params *GetServiceQuotaInp addawsAwsjson11_serdeOpGetServiceQuotaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicequotas/api_op_GetServiceQuotaIncreaseRequestFromTemplate.go b/service/servicequotas/api_op_GetServiceQuotaIncreaseRequestFromTemplate.go index 1ccd5ade87a..ae8266dff32 100644 --- a/service/servicequotas/api_op_GetServiceQuotaIncreaseRequestFromTemplate.go +++ b/service/servicequotas/api_op_GetServiceQuotaIncreaseRequestFromTemplate.go @@ -5,7 +5,6 @@ package servicequotas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicequotas/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetServiceQuotaIncreaseRequestFromTemplate(ctx context.Context, addawsAwsjson11_serdeOpGetServiceQuotaIncreaseRequestFromTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicequotas/api_op_ListAWSDefaultServiceQuotas.go b/service/servicequotas/api_op_ListAWSDefaultServiceQuotas.go index dcbe4755a28..fcb7169fdcd 100644 --- a/service/servicequotas/api_op_ListAWSDefaultServiceQuotas.go +++ b/service/servicequotas/api_op_ListAWSDefaultServiceQuotas.go @@ -5,7 +5,6 @@ package servicequotas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicequotas/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) ListAWSDefaultServiceQuotas(ctx context.Context, params *ListAW addawsAwsjson11_serdeOpListAWSDefaultServiceQuotasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicequotas/api_op_ListRequestedServiceQuotaChangeHistory.go b/service/servicequotas/api_op_ListRequestedServiceQuotaChangeHistory.go index 18325011456..ad2710a91d6 100644 --- a/service/servicequotas/api_op_ListRequestedServiceQuotaChangeHistory.go +++ b/service/servicequotas/api_op_ListRequestedServiceQuotaChangeHistory.go @@ -5,7 +5,6 @@ package servicequotas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicequotas/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListRequestedServiceQuotaChangeHistory(ctx context.Context, par addawsAwsjson11_serdeOpListRequestedServiceQuotaChangeHistoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicequotas/api_op_ListRequestedServiceQuotaChangeHistoryByQuota.go b/service/servicequotas/api_op_ListRequestedServiceQuotaChangeHistoryByQuota.go index c91ed95daa2..64752e2262a 100644 --- a/service/servicequotas/api_op_ListRequestedServiceQuotaChangeHistoryByQuota.go +++ b/service/servicequotas/api_op_ListRequestedServiceQuotaChangeHistoryByQuota.go @@ -5,7 +5,6 @@ package servicequotas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicequotas/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListRequestedServiceQuotaChangeHistoryByQuota(ctx context.Conte addawsAwsjson11_serdeOpListRequestedServiceQuotaChangeHistoryByQuotaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicequotas/api_op_ListServiceQuotaIncreaseRequestsInTemplate.go b/service/servicequotas/api_op_ListServiceQuotaIncreaseRequestsInTemplate.go index 005a0795826..6f5610daec5 100644 --- a/service/servicequotas/api_op_ListServiceQuotaIncreaseRequestsInTemplate.go +++ b/service/servicequotas/api_op_ListServiceQuotaIncreaseRequestsInTemplate.go @@ -5,7 +5,6 @@ package servicequotas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicequotas/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListServiceQuotaIncreaseRequestsInTemplate(ctx context.Context, addawsAwsjson11_serdeOpListServiceQuotaIncreaseRequestsInTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicequotas/api_op_ListServiceQuotas.go b/service/servicequotas/api_op_ListServiceQuotas.go index f43d0f63690..6979df21b02 100644 --- a/service/servicequotas/api_op_ListServiceQuotas.go +++ b/service/servicequotas/api_op_ListServiceQuotas.go @@ -5,7 +5,6 @@ package servicequotas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicequotas/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListServiceQuotas(ctx context.Context, params *ListServiceQuota addawsAwsjson11_serdeOpListServiceQuotasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicequotas/api_op_ListServices.go b/service/servicequotas/api_op_ListServices.go index 9fbb59fb488..3eb52a245ef 100644 --- a/service/servicequotas/api_op_ListServices.go +++ b/service/servicequotas/api_op_ListServices.go @@ -5,7 +5,6 @@ package servicequotas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicequotas/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListServices(ctx context.Context, params *ListServicesInput, op addawsAwsjson11_serdeOpListServicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicequotas/api_op_PutServiceQuotaIncreaseRequestIntoTemplate.go b/service/servicequotas/api_op_PutServiceQuotaIncreaseRequestIntoTemplate.go index f0889695b38..54bd6ce9f6c 100644 --- a/service/servicequotas/api_op_PutServiceQuotaIncreaseRequestIntoTemplate.go +++ b/service/servicequotas/api_op_PutServiceQuotaIncreaseRequestIntoTemplate.go @@ -5,7 +5,6 @@ package servicequotas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicequotas/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) PutServiceQuotaIncreaseRequestIntoTemplate(ctx context.Context, addawsAwsjson11_serdeOpPutServiceQuotaIncreaseRequestIntoTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicequotas/api_op_RequestServiceQuotaIncrease.go b/service/servicequotas/api_op_RequestServiceQuotaIncrease.go index 430572fb024..fdf41f3c95c 100644 --- a/service/servicequotas/api_op_RequestServiceQuotaIncrease.go +++ b/service/servicequotas/api_op_RequestServiceQuotaIncrease.go @@ -5,7 +5,6 @@ package servicequotas import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/servicequotas/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) RequestServiceQuotaIncrease(ctx context.Context, params *Reques addawsAwsjson11_serdeOpRequestServiceQuotaIncreaseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/servicequotas/endpoints.go b/service/servicequotas/endpoints.go index ef271a5b21a..faf14f4e16a 100644 --- a/service/servicequotas/endpoints.go +++ b/service/servicequotas/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/ses/api_client.go b/service/ses/api_client.go index 5be26a2f5f0..958a3dc5537 100644 --- a/service/ses/api_client.go +++ b/service/ses/api_client.go @@ -85,30 +85,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -174,6 +150,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/ses/api_op_CloneReceiptRuleSet.go b/service/ses/api_op_CloneReceiptRuleSet.go index b3956959193..30223524ee9 100644 --- a/service/ses/api_op_CloneReceiptRuleSet.go +++ b/service/ses/api_op_CloneReceiptRuleSet.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) CloneReceiptRuleSet(ctx context.Context, params *CloneReceiptRu addawsAwsquery_serdeOpCloneReceiptRuleSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_CreateConfigurationSet.go b/service/ses/api_op_CreateConfigurationSet.go index 8d20e3625a6..407223065f8 100644 --- a/service/ses/api_op_CreateConfigurationSet.go +++ b/service/ses/api_op_CreateConfigurationSet.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateConfigurationSet(ctx context.Context, params *CreateConfi addawsAwsquery_serdeOpCreateConfigurationSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_CreateConfigurationSetEventDestination.go b/service/ses/api_op_CreateConfigurationSetEventDestination.go index 403846f9755..ff1c0e7ecfc 100644 --- a/service/ses/api_op_CreateConfigurationSetEventDestination.go +++ b/service/ses/api_op_CreateConfigurationSetEventDestination.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateConfigurationSetEventDestination(ctx context.Context, par addawsAwsquery_serdeOpCreateConfigurationSetEventDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_CreateConfigurationSetTrackingOptions.go b/service/ses/api_op_CreateConfigurationSetTrackingOptions.go index e47572fdd78..7799ea2cea8 100644 --- a/service/ses/api_op_CreateConfigurationSetTrackingOptions.go +++ b/service/ses/api_op_CreateConfigurationSetTrackingOptions.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateConfigurationSetTrackingOptions(ctx context.Context, para addawsAwsquery_serdeOpCreateConfigurationSetTrackingOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_CreateCustomVerificationEmailTemplate.go b/service/ses/api_op_CreateCustomVerificationEmailTemplate.go index 94e5b39804e..db5be277b99 100644 --- a/service/ses/api_op_CreateCustomVerificationEmailTemplate.go +++ b/service/ses/api_op_CreateCustomVerificationEmailTemplate.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) CreateCustomVerificationEmailTemplate(ctx context.Context, para addawsAwsquery_serdeOpCreateCustomVerificationEmailTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_CreateReceiptFilter.go b/service/ses/api_op_CreateReceiptFilter.go index c461dd20b70..bcc04875428 100644 --- a/service/ses/api_op_CreateReceiptFilter.go +++ b/service/ses/api_op_CreateReceiptFilter.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateReceiptFilter(ctx context.Context, params *CreateReceiptF addawsAwsquery_serdeOpCreateReceiptFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_CreateReceiptRule.go b/service/ses/api_op_CreateReceiptRule.go index bad1be06c0a..247698dad1e 100644 --- a/service/ses/api_op_CreateReceiptRule.go +++ b/service/ses/api_op_CreateReceiptRule.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateReceiptRule(ctx context.Context, params *CreateReceiptRul addawsAwsquery_serdeOpCreateReceiptRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_CreateReceiptRuleSet.go b/service/ses/api_op_CreateReceiptRuleSet.go index 9a3cbf8ee6f..939413c2feb 100644 --- a/service/ses/api_op_CreateReceiptRuleSet.go +++ b/service/ses/api_op_CreateReceiptRuleSet.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) CreateReceiptRuleSet(ctx context.Context, params *CreateReceipt addawsAwsquery_serdeOpCreateReceiptRuleSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_CreateTemplate.go b/service/ses/api_op_CreateTemplate.go index 0cef0db3a41..0c1b408a28f 100644 --- a/service/ses/api_op_CreateTemplate.go +++ b/service/ses/api_op_CreateTemplate.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateTemplate(ctx context.Context, params *CreateTemplateInput addawsAwsquery_serdeOpCreateTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_DeleteConfigurationSet.go b/service/ses/api_op_DeleteConfigurationSet.go index a8305d95f14..c192020b727 100644 --- a/service/ses/api_op_DeleteConfigurationSet.go +++ b/service/ses/api_op_DeleteConfigurationSet.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteConfigurationSet(ctx context.Context, params *DeleteConfi addawsAwsquery_serdeOpDeleteConfigurationSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_DeleteConfigurationSetEventDestination.go b/service/ses/api_op_DeleteConfigurationSetEventDestination.go index 00b216d4218..14465af54cf 100644 --- a/service/ses/api_op_DeleteConfigurationSetEventDestination.go +++ b/service/ses/api_op_DeleteConfigurationSetEventDestination.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteConfigurationSetEventDestination(ctx context.Context, par addawsAwsquery_serdeOpDeleteConfigurationSetEventDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_DeleteConfigurationSetTrackingOptions.go b/service/ses/api_op_DeleteConfigurationSetTrackingOptions.go index 0f4f4a40489..dfb771d1af5 100644 --- a/service/ses/api_op_DeleteConfigurationSetTrackingOptions.go +++ b/service/ses/api_op_DeleteConfigurationSetTrackingOptions.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) DeleteConfigurationSetTrackingOptions(ctx context.Context, para addawsAwsquery_serdeOpDeleteConfigurationSetTrackingOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_DeleteCustomVerificationEmailTemplate.go b/service/ses/api_op_DeleteCustomVerificationEmailTemplate.go index a8168ef1ac6..16dd72cbe15 100644 --- a/service/ses/api_op_DeleteCustomVerificationEmailTemplate.go +++ b/service/ses/api_op_DeleteCustomVerificationEmailTemplate.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteCustomVerificationEmailTemplate(ctx context.Context, para addawsAwsquery_serdeOpDeleteCustomVerificationEmailTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_DeleteIdentity.go b/service/ses/api_op_DeleteIdentity.go index 05d753a560c..a5ee745c444 100644 --- a/service/ses/api_op_DeleteIdentity.go +++ b/service/ses/api_op_DeleteIdentity.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteIdentity(ctx context.Context, params *DeleteIdentityInput addawsAwsquery_serdeOpDeleteIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_DeleteIdentityPolicy.go b/service/ses/api_op_DeleteIdentityPolicy.go index afb8b4ac6ba..74b6e6b4211 100644 --- a/service/ses/api_op_DeleteIdentityPolicy.go +++ b/service/ses/api_op_DeleteIdentityPolicy.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) DeleteIdentityPolicy(ctx context.Context, params *DeleteIdentit addawsAwsquery_serdeOpDeleteIdentityPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_DeleteReceiptFilter.go b/service/ses/api_op_DeleteReceiptFilter.go index 04e3be87e4b..4650b418e64 100644 --- a/service/ses/api_op_DeleteReceiptFilter.go +++ b/service/ses/api_op_DeleteReceiptFilter.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteReceiptFilter(ctx context.Context, params *DeleteReceiptF addawsAwsquery_serdeOpDeleteReceiptFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_DeleteReceiptRule.go b/service/ses/api_op_DeleteReceiptRule.go index 3aed2849aef..f662a7c9b27 100644 --- a/service/ses/api_op_DeleteReceiptRule.go +++ b/service/ses/api_op_DeleteReceiptRule.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteReceiptRule(ctx context.Context, params *DeleteReceiptRul addawsAwsquery_serdeOpDeleteReceiptRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_DeleteReceiptRuleSet.go b/service/ses/api_op_DeleteReceiptRuleSet.go index 90e5ec972fd..9aa068452d1 100644 --- a/service/ses/api_op_DeleteReceiptRuleSet.go +++ b/service/ses/api_op_DeleteReceiptRuleSet.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteReceiptRuleSet(ctx context.Context, params *DeleteReceipt addawsAwsquery_serdeOpDeleteReceiptRuleSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_DeleteTemplate.go b/service/ses/api_op_DeleteTemplate.go index d6a0a5375a8..1e24301d220 100644 --- a/service/ses/api_op_DeleteTemplate.go +++ b/service/ses/api_op_DeleteTemplate.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteTemplate(ctx context.Context, params *DeleteTemplateInput addawsAwsquery_serdeOpDeleteTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_DeleteVerifiedEmailAddress.go b/service/ses/api_op_DeleteVerifiedEmailAddress.go index d2950981769..e9b6034e820 100644 --- a/service/ses/api_op_DeleteVerifiedEmailAddress.go +++ b/service/ses/api_op_DeleteVerifiedEmailAddress.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteVerifiedEmailAddress(ctx context.Context, params *DeleteV addawsAwsquery_serdeOpDeleteVerifiedEmailAddressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_DescribeActiveReceiptRuleSet.go b/service/ses/api_op_DescribeActiveReceiptRuleSet.go index ec72a9c371d..e6ba517f1df 100644 --- a/service/ses/api_op_DescribeActiveReceiptRuleSet.go +++ b/service/ses/api_op_DescribeActiveReceiptRuleSet.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeActiveReceiptRuleSet(ctx context.Context, params *Descr addawsAwsquery_serdeOpDescribeActiveReceiptRuleSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_DescribeConfigurationSet.go b/service/ses/api_op_DescribeConfigurationSet.go index 4b8f2e70530..5beef6b761e 100644 --- a/service/ses/api_op_DescribeConfigurationSet.go +++ b/service/ses/api_op_DescribeConfigurationSet.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeConfigurationSet(ctx context.Context, params *DescribeC addawsAwsquery_serdeOpDescribeConfigurationSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_DescribeReceiptRule.go b/service/ses/api_op_DescribeReceiptRule.go index acf3bb1808b..2ba643d4e0d 100644 --- a/service/ses/api_op_DescribeReceiptRule.go +++ b/service/ses/api_op_DescribeReceiptRule.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeReceiptRule(ctx context.Context, params *DescribeReceip addawsAwsquery_serdeOpDescribeReceiptRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_DescribeReceiptRuleSet.go b/service/ses/api_op_DescribeReceiptRuleSet.go index ac14a1e81ae..4c68ed8e85d 100644 --- a/service/ses/api_op_DescribeReceiptRuleSet.go +++ b/service/ses/api_op_DescribeReceiptRuleSet.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeReceiptRuleSet(ctx context.Context, params *DescribeRec addawsAwsquery_serdeOpDescribeReceiptRuleSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_GetAccountSendingEnabled.go b/service/ses/api_op_GetAccountSendingEnabled.go index 09b6d4902f8..47da6fdd0d2 100644 --- a/service/ses/api_op_GetAccountSendingEnabled.go +++ b/service/ses/api_op_GetAccountSendingEnabled.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetAccountSendingEnabled(ctx context.Context, params *GetAccoun addawsAwsquery_serdeOpGetAccountSendingEnabledMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_GetCustomVerificationEmailTemplate.go b/service/ses/api_op_GetCustomVerificationEmailTemplate.go index 0ef4df1bbbd..f60b63c53ad 100644 --- a/service/ses/api_op_GetCustomVerificationEmailTemplate.go +++ b/service/ses/api_op_GetCustomVerificationEmailTemplate.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) GetCustomVerificationEmailTemplate(ctx context.Context, params addawsAwsquery_serdeOpGetCustomVerificationEmailTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_GetIdentityDkimAttributes.go b/service/ses/api_op_GetIdentityDkimAttributes.go index 45571092380..65968005bc7 100644 --- a/service/ses/api_op_GetIdentityDkimAttributes.go +++ b/service/ses/api_op_GetIdentityDkimAttributes.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) GetIdentityDkimAttributes(ctx context.Context, params *GetIdent addawsAwsquery_serdeOpGetIdentityDkimAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_GetIdentityMailFromDomainAttributes.go b/service/ses/api_op_GetIdentityMailFromDomainAttributes.go index 7cf476ee665..c276e3f76de 100644 --- a/service/ses/api_op_GetIdentityMailFromDomainAttributes.go +++ b/service/ses/api_op_GetIdentityMailFromDomainAttributes.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetIdentityMailFromDomainAttributes(ctx context.Context, params addawsAwsquery_serdeOpGetIdentityMailFromDomainAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_GetIdentityNotificationAttributes.go b/service/ses/api_op_GetIdentityNotificationAttributes.go index e08322f9fe4..58674280e17 100644 --- a/service/ses/api_op_GetIdentityNotificationAttributes.go +++ b/service/ses/api_op_GetIdentityNotificationAttributes.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetIdentityNotificationAttributes(ctx context.Context, params * addawsAwsquery_serdeOpGetIdentityNotificationAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_GetIdentityPolicies.go b/service/ses/api_op_GetIdentityPolicies.go index 9eaf271789e..f056829a002 100644 --- a/service/ses/api_op_GetIdentityPolicies.go +++ b/service/ses/api_op_GetIdentityPolicies.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) GetIdentityPolicies(ctx context.Context, params *GetIdentityPol addawsAwsquery_serdeOpGetIdentityPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_GetIdentityVerificationAttributes.go b/service/ses/api_op_GetIdentityVerificationAttributes.go index 999f43c5ab9..b9dd4f6021f 100644 --- a/service/ses/api_op_GetIdentityVerificationAttributes.go +++ b/service/ses/api_op_GetIdentityVerificationAttributes.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) GetIdentityVerificationAttributes(ctx context.Context, params * addawsAwsquery_serdeOpGetIdentityVerificationAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_GetSendQuota.go b/service/ses/api_op_GetSendQuota.go index d764174554e..8538a526ba8 100644 --- a/service/ses/api_op_GetSendQuota.go +++ b/service/ses/api_op_GetSendQuota.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetSendQuota(ctx context.Context, params *GetSendQuotaInput, op addawsAwsquery_serdeOpGetSendQuotaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_GetSendStatistics.go b/service/ses/api_op_GetSendStatistics.go index 822fb546bdf..e5e80168a3b 100644 --- a/service/ses/api_op_GetSendStatistics.go +++ b/service/ses/api_op_GetSendStatistics.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetSendStatistics(ctx context.Context, params *GetSendStatistic addawsAwsquery_serdeOpGetSendStatisticsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_GetTemplate.go b/service/ses/api_op_GetTemplate.go index b13d6638293..42a1e3b5085 100644 --- a/service/ses/api_op_GetTemplate.go +++ b/service/ses/api_op_GetTemplate.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetTemplate(ctx context.Context, params *GetTemplateInput, optF addawsAwsquery_serdeOpGetTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_ListConfigurationSets.go b/service/ses/api_op_ListConfigurationSets.go index 299020a2f5c..0a4924bd521 100644 --- a/service/ses/api_op_ListConfigurationSets.go +++ b/service/ses/api_op_ListConfigurationSets.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) ListConfigurationSets(ctx context.Context, params *ListConfigur addawsAwsquery_serdeOpListConfigurationSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_ListCustomVerificationEmailTemplates.go b/service/ses/api_op_ListCustomVerificationEmailTemplates.go index 089c085fa07..3b94ea4f50f 100644 --- a/service/ses/api_op_ListCustomVerificationEmailTemplates.go +++ b/service/ses/api_op_ListCustomVerificationEmailTemplates.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListCustomVerificationEmailTemplates(ctx context.Context, param addawsAwsquery_serdeOpListCustomVerificationEmailTemplatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_ListIdentities.go b/service/ses/api_op_ListIdentities.go index 2235380cb7c..20a340d49e3 100644 --- a/service/ses/api_op_ListIdentities.go +++ b/service/ses/api_op_ListIdentities.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListIdentities(ctx context.Context, params *ListIdentitiesInput addawsAwsquery_serdeOpListIdentitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_ListIdentityPolicies.go b/service/ses/api_op_ListIdentityPolicies.go index c737e35e2b8..6e9e667a96a 100644 --- a/service/ses/api_op_ListIdentityPolicies.go +++ b/service/ses/api_op_ListIdentityPolicies.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) ListIdentityPolicies(ctx context.Context, params *ListIdentityP addawsAwsquery_serdeOpListIdentityPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_ListReceiptFilters.go b/service/ses/api_op_ListReceiptFilters.go index c28c5126bf7..5c9388942f4 100644 --- a/service/ses/api_op_ListReceiptFilters.go +++ b/service/ses/api_op_ListReceiptFilters.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListReceiptFilters(ctx context.Context, params *ListReceiptFilt addawsAwsquery_serdeOpListReceiptFiltersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_ListReceiptRuleSets.go b/service/ses/api_op_ListReceiptRuleSets.go index c071c7f2203..23c1a4ec380 100644 --- a/service/ses/api_op_ListReceiptRuleSets.go +++ b/service/ses/api_op_ListReceiptRuleSets.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListReceiptRuleSets(ctx context.Context, params *ListReceiptRul addawsAwsquery_serdeOpListReceiptRuleSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_ListTemplates.go b/service/ses/api_op_ListTemplates.go index 508f0223ace..cb9a266e574 100644 --- a/service/ses/api_op_ListTemplates.go +++ b/service/ses/api_op_ListTemplates.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTemplates(ctx context.Context, params *ListTemplatesInput, addawsAwsquery_serdeOpListTemplatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_ListVerifiedEmailAddresses.go b/service/ses/api_op_ListVerifiedEmailAddresses.go index 12839ba3822..cb248448fa6 100644 --- a/service/ses/api_op_ListVerifiedEmailAddresses.go +++ b/service/ses/api_op_ListVerifiedEmailAddresses.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ListVerifiedEmailAddresses(ctx context.Context, params *ListVer addawsAwsquery_serdeOpListVerifiedEmailAddressesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_PutConfigurationSetDeliveryOptions.go b/service/ses/api_op_PutConfigurationSetDeliveryOptions.go index d38256876d3..7a594e28f3f 100644 --- a/service/ses/api_op_PutConfigurationSetDeliveryOptions.go +++ b/service/ses/api_op_PutConfigurationSetDeliveryOptions.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutConfigurationSetDeliveryOptions(ctx context.Context, params addawsAwsquery_serdeOpPutConfigurationSetDeliveryOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_PutIdentityPolicy.go b/service/ses/api_op_PutIdentityPolicy.go index 5190d66fa43..81ef9949e10 100644 --- a/service/ses/api_op_PutIdentityPolicy.go +++ b/service/ses/api_op_PutIdentityPolicy.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) PutIdentityPolicy(ctx context.Context, params *PutIdentityPolic addawsAwsquery_serdeOpPutIdentityPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_ReorderReceiptRuleSet.go b/service/ses/api_op_ReorderReceiptRuleSet.go index 32774664bb1..1c8b7691d34 100644 --- a/service/ses/api_op_ReorderReceiptRuleSet.go +++ b/service/ses/api_op_ReorderReceiptRuleSet.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) ReorderReceiptRuleSet(ctx context.Context, params *ReorderRecei addawsAwsquery_serdeOpReorderReceiptRuleSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_SendBounce.go b/service/ses/api_op_SendBounce.go index e619c94a160..d2d6ef75437 100644 --- a/service/ses/api_op_SendBounce.go +++ b/service/ses/api_op_SendBounce.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) SendBounce(ctx context.Context, params *SendBounceInput, optFns addawsAwsquery_serdeOpSendBounceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_SendBulkTemplatedEmail.go b/service/ses/api_op_SendBulkTemplatedEmail.go index b627f37699c..703365b4fc7 100644 --- a/service/ses/api_op_SendBulkTemplatedEmail.go +++ b/service/ses/api_op_SendBulkTemplatedEmail.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -58,9 +57,9 @@ func (c *Client) SendBulkTemplatedEmail(ctx context.Context, params *SendBulkTem addawsAwsquery_serdeOpSendBulkTemplatedEmailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_SendCustomVerificationEmail.go b/service/ses/api_op_SendCustomVerificationEmail.go index e59083d355d..c72bfca6ae3 100644 --- a/service/ses/api_op_SendCustomVerificationEmail.go +++ b/service/ses/api_op_SendCustomVerificationEmail.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) SendCustomVerificationEmail(ctx context.Context, params *SendCu addawsAwsquery_serdeOpSendCustomVerificationEmailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_SendEmail.go b/service/ses/api_op_SendEmail.go index 9165661a2c4..796dbbfa8b6 100644 --- a/service/ses/api_op_SendEmail.go +++ b/service/ses/api_op_SendEmail.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -50,9 +49,9 @@ func (c *Client) SendEmail(ctx context.Context, params *SendEmailInput, optFns . addawsAwsquery_serdeOpSendEmailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_SendRawEmail.go b/service/ses/api_op_SendRawEmail.go index 21ecb1aaaf1..d40d27ec64a 100644 --- a/service/ses/api_op_SendRawEmail.go +++ b/service/ses/api_op_SendRawEmail.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -87,9 +86,9 @@ func (c *Client) SendRawEmail(ctx context.Context, params *SendRawEmailInput, op addawsAwsquery_serdeOpSendRawEmailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_SendTemplatedEmail.go b/service/ses/api_op_SendTemplatedEmail.go index f95033f167e..2b2c15ecb9d 100644 --- a/service/ses/api_op_SendTemplatedEmail.go +++ b/service/ses/api_op_SendTemplatedEmail.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -66,9 +65,9 @@ func (c *Client) SendTemplatedEmail(ctx context.Context, params *SendTemplatedEm addawsAwsquery_serdeOpSendTemplatedEmailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_SetActiveReceiptRuleSet.go b/service/ses/api_op_SetActiveReceiptRuleSet.go index 8b4f944782d..3dfd7e1ea45 100644 --- a/service/ses/api_op_SetActiveReceiptRuleSet.go +++ b/service/ses/api_op_SetActiveReceiptRuleSet.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) SetActiveReceiptRuleSet(ctx context.Context, params *SetActiveR addawsAwsquery_serdeOpSetActiveReceiptRuleSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_SetIdentityDkimEnabled.go b/service/ses/api_op_SetIdentityDkimEnabled.go index 5a2a57636c7..d282d43da48 100644 --- a/service/ses/api_op_SetIdentityDkimEnabled.go +++ b/service/ses/api_op_SetIdentityDkimEnabled.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) SetIdentityDkimEnabled(ctx context.Context, params *SetIdentity addawsAwsquery_serdeOpSetIdentityDkimEnabledMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_SetIdentityFeedbackForwardingEnabled.go b/service/ses/api_op_SetIdentityFeedbackForwardingEnabled.go index 40caab949b7..8dd2a01f3c9 100644 --- a/service/ses/api_op_SetIdentityFeedbackForwardingEnabled.go +++ b/service/ses/api_op_SetIdentityFeedbackForwardingEnabled.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) SetIdentityFeedbackForwardingEnabled(ctx context.Context, param addawsAwsquery_serdeOpSetIdentityFeedbackForwardingEnabledMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_SetIdentityHeadersInNotificationsEnabled.go b/service/ses/api_op_SetIdentityHeadersInNotificationsEnabled.go index cb2fd6c8f55..e0bbdb7c5a5 100644 --- a/service/ses/api_op_SetIdentityHeadersInNotificationsEnabled.go +++ b/service/ses/api_op_SetIdentityHeadersInNotificationsEnabled.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) SetIdentityHeadersInNotificationsEnabled(ctx context.Context, p addawsAwsquery_serdeOpSetIdentityHeadersInNotificationsEnabledMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_SetIdentityMailFromDomain.go b/service/ses/api_op_SetIdentityMailFromDomain.go index 23674a031b3..2126a0fe09a 100644 --- a/service/ses/api_op_SetIdentityMailFromDomain.go +++ b/service/ses/api_op_SetIdentityMailFromDomain.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) SetIdentityMailFromDomain(ctx context.Context, params *SetIdent addawsAwsquery_serdeOpSetIdentityMailFromDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_SetIdentityNotificationTopic.go b/service/ses/api_op_SetIdentityNotificationTopic.go index ed83c0fef99..ea2b30e7350 100644 --- a/service/ses/api_op_SetIdentityNotificationTopic.go +++ b/service/ses/api_op_SetIdentityNotificationTopic.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) SetIdentityNotificationTopic(ctx context.Context, params *SetId addawsAwsquery_serdeOpSetIdentityNotificationTopicMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_SetReceiptRulePosition.go b/service/ses/api_op_SetReceiptRulePosition.go index 49c4bc75833..afa2a65aef5 100644 --- a/service/ses/api_op_SetReceiptRulePosition.go +++ b/service/ses/api_op_SetReceiptRulePosition.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) SetReceiptRulePosition(ctx context.Context, params *SetReceiptR addawsAwsquery_serdeOpSetReceiptRulePositionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_TestRenderTemplate.go b/service/ses/api_op_TestRenderTemplate.go index 652dddee0b8..fa536fadc51 100644 --- a/service/ses/api_op_TestRenderTemplate.go +++ b/service/ses/api_op_TestRenderTemplate.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) TestRenderTemplate(ctx context.Context, params *TestRenderTempl addawsAwsquery_serdeOpTestRenderTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_UpdateAccountSendingEnabled.go b/service/ses/api_op_UpdateAccountSendingEnabled.go index a8c90b9b574..48d284fb7cb 100644 --- a/service/ses/api_op_UpdateAccountSendingEnabled.go +++ b/service/ses/api_op_UpdateAccountSendingEnabled.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) UpdateAccountSendingEnabled(ctx context.Context, params *Update addawsAwsquery_serdeOpUpdateAccountSendingEnabledMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_UpdateConfigurationSetEventDestination.go b/service/ses/api_op_UpdateConfigurationSetEventDestination.go index 0673eb2caf6..6fda86ea8ac 100644 --- a/service/ses/api_op_UpdateConfigurationSetEventDestination.go +++ b/service/ses/api_op_UpdateConfigurationSetEventDestination.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) UpdateConfigurationSetEventDestination(ctx context.Context, par addawsAwsquery_serdeOpUpdateConfigurationSetEventDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_UpdateConfigurationSetReputationMetricsEnabled.go b/service/ses/api_op_UpdateConfigurationSetReputationMetricsEnabled.go index 32c3650f1f4..63d7c6b6e36 100644 --- a/service/ses/api_op_UpdateConfigurationSetReputationMetricsEnabled.go +++ b/service/ses/api_op_UpdateConfigurationSetReputationMetricsEnabled.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) UpdateConfigurationSetReputationMetricsEnabled(ctx context.Cont addawsAwsquery_serdeOpUpdateConfigurationSetReputationMetricsEnabledMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_UpdateConfigurationSetSendingEnabled.go b/service/ses/api_op_UpdateConfigurationSetSendingEnabled.go index 30faddd3039..39a93cb235b 100644 --- a/service/ses/api_op_UpdateConfigurationSetSendingEnabled.go +++ b/service/ses/api_op_UpdateConfigurationSetSendingEnabled.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) UpdateConfigurationSetSendingEnabled(ctx context.Context, param addawsAwsquery_serdeOpUpdateConfigurationSetSendingEnabledMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_UpdateConfigurationSetTrackingOptions.go b/service/ses/api_op_UpdateConfigurationSetTrackingOptions.go index 4f879b4ea54..2a7b955ae69 100644 --- a/service/ses/api_op_UpdateConfigurationSetTrackingOptions.go +++ b/service/ses/api_op_UpdateConfigurationSetTrackingOptions.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) UpdateConfigurationSetTrackingOptions(ctx context.Context, para addawsAwsquery_serdeOpUpdateConfigurationSetTrackingOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_UpdateCustomVerificationEmailTemplate.go b/service/ses/api_op_UpdateCustomVerificationEmailTemplate.go index c9d28c83929..b55e9244a99 100644 --- a/service/ses/api_op_UpdateCustomVerificationEmailTemplate.go +++ b/service/ses/api_op_UpdateCustomVerificationEmailTemplate.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) UpdateCustomVerificationEmailTemplate(ctx context.Context, para addawsAwsquery_serdeOpUpdateCustomVerificationEmailTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_UpdateReceiptRule.go b/service/ses/api_op_UpdateReceiptRule.go index fd2b3744cc2..9621de87d86 100644 --- a/service/ses/api_op_UpdateReceiptRule.go +++ b/service/ses/api_op_UpdateReceiptRule.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateReceiptRule(ctx context.Context, params *UpdateReceiptRul addawsAwsquery_serdeOpUpdateReceiptRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_UpdateTemplate.go b/service/ses/api_op_UpdateTemplate.go index 4b69574febf..08e6cf5a63d 100644 --- a/service/ses/api_op_UpdateTemplate.go +++ b/service/ses/api_op_UpdateTemplate.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ses/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateTemplate(ctx context.Context, params *UpdateTemplateInput addawsAwsquery_serdeOpUpdateTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_VerifyDomainDkim.go b/service/ses/api_op_VerifyDomainDkim.go index 56ba242d2f7..a861045fba9 100644 --- a/service/ses/api_op_VerifyDomainDkim.go +++ b/service/ses/api_op_VerifyDomainDkim.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -51,9 +50,9 @@ func (c *Client) VerifyDomainDkim(ctx context.Context, params *VerifyDomainDkimI addawsAwsquery_serdeOpVerifyDomainDkimMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_VerifyDomainIdentity.go b/service/ses/api_op_VerifyDomainIdentity.go index eb66944f917..b5301b97dbd 100644 --- a/service/ses/api_op_VerifyDomainIdentity.go +++ b/service/ses/api_op_VerifyDomainIdentity.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) VerifyDomainIdentity(ctx context.Context, params *VerifyDomainI addawsAwsquery_serdeOpVerifyDomainIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_VerifyEmailAddress.go b/service/ses/api_op_VerifyEmailAddress.go index e19ea81b93e..b0776a7c1bd 100644 --- a/service/ses/api_op_VerifyEmailAddress.go +++ b/service/ses/api_op_VerifyEmailAddress.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) VerifyEmailAddress(ctx context.Context, params *VerifyEmailAddr addawsAwsquery_serdeOpVerifyEmailAddressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/api_op_VerifyEmailIdentity.go b/service/ses/api_op_VerifyEmailIdentity.go index 6b3c58ca05a..f0dea41aa17 100644 --- a/service/ses/api_op_VerifyEmailIdentity.go +++ b/service/ses/api_op_VerifyEmailIdentity.go @@ -5,7 +5,6 @@ package ses import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) VerifyEmailIdentity(ctx context.Context, params *VerifyEmailIde addawsAwsquery_serdeOpVerifyEmailIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ses/endpoints.go b/service/ses/endpoints.go index 2e0071b4f84..40325abf221 100644 --- a/service/ses/endpoints.go +++ b/service/ses/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/sesv2/api_client.go b/service/sesv2/api_client.go index 38920ced486..edacd622305 100644 --- a/service/sesv2/api_client.go +++ b/service/sesv2/api_client.go @@ -100,30 +100,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -189,6 +165,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/sesv2/api_op_CreateConfigurationSet.go b/service/sesv2/api_op_CreateConfigurationSet.go index 9d9908d1833..8bbddaa78aa 100644 --- a/service/sesv2/api_op_CreateConfigurationSet.go +++ b/service/sesv2/api_op_CreateConfigurationSet.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateConfigurationSet(ctx context.Context, params *CreateConfi addawsRestjson1_serdeOpCreateConfigurationSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_CreateConfigurationSetEventDestination.go b/service/sesv2/api_op_CreateConfigurationSetEventDestination.go index 88b2ac88c8f..02243bb7fb2 100644 --- a/service/sesv2/api_op_CreateConfigurationSetEventDestination.go +++ b/service/sesv2/api_op_CreateConfigurationSetEventDestination.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateConfigurationSetEventDestination(ctx context.Context, par addawsRestjson1_serdeOpCreateConfigurationSetEventDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_CreateCustomVerificationEmailTemplate.go b/service/sesv2/api_op_CreateCustomVerificationEmailTemplate.go index ac062ea8976..35259d05fe1 100644 --- a/service/sesv2/api_op_CreateCustomVerificationEmailTemplate.go +++ b/service/sesv2/api_op_CreateCustomVerificationEmailTemplate.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) CreateCustomVerificationEmailTemplate(ctx context.Context, para addawsRestjson1_serdeOpCreateCustomVerificationEmailTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_CreateDedicatedIpPool.go b/service/sesv2/api_op_CreateDedicatedIpPool.go index 4160017fd20..51567c133e6 100644 --- a/service/sesv2/api_op_CreateDedicatedIpPool.go +++ b/service/sesv2/api_op_CreateDedicatedIpPool.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateDedicatedIpPool(ctx context.Context, params *CreateDedica addawsRestjson1_serdeOpCreateDedicatedIpPoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_CreateDeliverabilityTestReport.go b/service/sesv2/api_op_CreateDeliverabilityTestReport.go index a3b951e7b2e..8060727d1f5 100644 --- a/service/sesv2/api_op_CreateDeliverabilityTestReport.go +++ b/service/sesv2/api_op_CreateDeliverabilityTestReport.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateDeliverabilityTestReport(ctx context.Context, params *Cre addawsRestjson1_serdeOpCreateDeliverabilityTestReportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_CreateEmailIdentity.go b/service/sesv2/api_op_CreateEmailIdentity.go index 5ad823a3669..40d7474f65c 100644 --- a/service/sesv2/api_op_CreateEmailIdentity.go +++ b/service/sesv2/api_op_CreateEmailIdentity.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) CreateEmailIdentity(ctx context.Context, params *CreateEmailIde addawsRestjson1_serdeOpCreateEmailIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_CreateEmailIdentityPolicy.go b/service/sesv2/api_op_CreateEmailIdentityPolicy.go index 7545b580900..367b129f5fd 100644 --- a/service/sesv2/api_op_CreateEmailIdentityPolicy.go +++ b/service/sesv2/api_op_CreateEmailIdentityPolicy.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) CreateEmailIdentityPolicy(ctx context.Context, params *CreateEm addawsRestjson1_serdeOpCreateEmailIdentityPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_CreateEmailTemplate.go b/service/sesv2/api_op_CreateEmailTemplate.go index 4a9041d7212..86973750f5c 100644 --- a/service/sesv2/api_op_CreateEmailTemplate.go +++ b/service/sesv2/api_op_CreateEmailTemplate.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateEmailTemplate(ctx context.Context, params *CreateEmailTem addawsRestjson1_serdeOpCreateEmailTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_DeleteConfigurationSet.go b/service/sesv2/api_op_DeleteConfigurationSet.go index 598b242f9f0..dfd1026c00e 100644 --- a/service/sesv2/api_op_DeleteConfigurationSet.go +++ b/service/sesv2/api_op_DeleteConfigurationSet.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteConfigurationSet(ctx context.Context, params *DeleteConfi addawsRestjson1_serdeOpDeleteConfigurationSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_DeleteConfigurationSetEventDestination.go b/service/sesv2/api_op_DeleteConfigurationSetEventDestination.go index 129a54a4721..cbd2644f3ac 100644 --- a/service/sesv2/api_op_DeleteConfigurationSetEventDestination.go +++ b/service/sesv2/api_op_DeleteConfigurationSetEventDestination.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteConfigurationSetEventDestination(ctx context.Context, par addawsRestjson1_serdeOpDeleteConfigurationSetEventDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_DeleteCustomVerificationEmailTemplate.go b/service/sesv2/api_op_DeleteCustomVerificationEmailTemplate.go index c9b9f4674a5..c6a30778a2a 100644 --- a/service/sesv2/api_op_DeleteCustomVerificationEmailTemplate.go +++ b/service/sesv2/api_op_DeleteCustomVerificationEmailTemplate.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteCustomVerificationEmailTemplate(ctx context.Context, para addawsRestjson1_serdeOpDeleteCustomVerificationEmailTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_DeleteDedicatedIpPool.go b/service/sesv2/api_op_DeleteDedicatedIpPool.go index 81095b8b7f3..c702c8a968c 100644 --- a/service/sesv2/api_op_DeleteDedicatedIpPool.go +++ b/service/sesv2/api_op_DeleteDedicatedIpPool.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDedicatedIpPool(ctx context.Context, params *DeleteDedica addawsRestjson1_serdeOpDeleteDedicatedIpPoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_DeleteEmailIdentity.go b/service/sesv2/api_op_DeleteEmailIdentity.go index 3ca4a257ab4..3a3876279bb 100644 --- a/service/sesv2/api_op_DeleteEmailIdentity.go +++ b/service/sesv2/api_op_DeleteEmailIdentity.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteEmailIdentity(ctx context.Context, params *DeleteEmailIde addawsRestjson1_serdeOpDeleteEmailIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_DeleteEmailIdentityPolicy.go b/service/sesv2/api_op_DeleteEmailIdentityPolicy.go index 164c9c5eb18..ab5d5a8f586 100644 --- a/service/sesv2/api_op_DeleteEmailIdentityPolicy.go +++ b/service/sesv2/api_op_DeleteEmailIdentityPolicy.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) DeleteEmailIdentityPolicy(ctx context.Context, params *DeleteEm addawsRestjson1_serdeOpDeleteEmailIdentityPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_DeleteEmailTemplate.go b/service/sesv2/api_op_DeleteEmailTemplate.go index fbd8eeddf3e..838e5a324a0 100644 --- a/service/sesv2/api_op_DeleteEmailTemplate.go +++ b/service/sesv2/api_op_DeleteEmailTemplate.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteEmailTemplate(ctx context.Context, params *DeleteEmailTem addawsRestjson1_serdeOpDeleteEmailTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_DeleteSuppressedDestination.go b/service/sesv2/api_op_DeleteSuppressedDestination.go index c1008680ce0..4457e66eca4 100644 --- a/service/sesv2/api_op_DeleteSuppressedDestination.go +++ b/service/sesv2/api_op_DeleteSuppressedDestination.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteSuppressedDestination(ctx context.Context, params *Delete addawsRestjson1_serdeOpDeleteSuppressedDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_GetAccount.go b/service/sesv2/api_op_GetAccount.go index e73af70cdf9..3f1d8d1ecaa 100644 --- a/service/sesv2/api_op_GetAccount.go +++ b/service/sesv2/api_op_GetAccount.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetAccount(ctx context.Context, params *GetAccountInput, optFns addawsRestjson1_serdeOpGetAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_GetBlacklistReports.go b/service/sesv2/api_op_GetBlacklistReports.go index cc2f1584ef6..a56243340c7 100644 --- a/service/sesv2/api_op_GetBlacklistReports.go +++ b/service/sesv2/api_op_GetBlacklistReports.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetBlacklistReports(ctx context.Context, params *GetBlacklistRe addawsRestjson1_serdeOpGetBlacklistReportsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_GetConfigurationSet.go b/service/sesv2/api_op_GetConfigurationSet.go index a16686b6e06..5db2fd5a92a 100644 --- a/service/sesv2/api_op_GetConfigurationSet.go +++ b/service/sesv2/api_op_GetConfigurationSet.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetConfigurationSet(ctx context.Context, params *GetConfigurati addawsRestjson1_serdeOpGetConfigurationSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_GetConfigurationSetEventDestinations.go b/service/sesv2/api_op_GetConfigurationSetEventDestinations.go index e2bde8a17b9..c5354145e83 100644 --- a/service/sesv2/api_op_GetConfigurationSetEventDestinations.go +++ b/service/sesv2/api_op_GetConfigurationSetEventDestinations.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) GetConfigurationSetEventDestinations(ctx context.Context, param addawsRestjson1_serdeOpGetConfigurationSetEventDestinationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_GetCustomVerificationEmailTemplate.go b/service/sesv2/api_op_GetCustomVerificationEmailTemplate.go index c6a8a9b45cb..2cb5f5af66f 100644 --- a/service/sesv2/api_op_GetCustomVerificationEmailTemplate.go +++ b/service/sesv2/api_op_GetCustomVerificationEmailTemplate.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) GetCustomVerificationEmailTemplate(ctx context.Context, params addawsRestjson1_serdeOpGetCustomVerificationEmailTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_GetDedicatedIp.go b/service/sesv2/api_op_GetDedicatedIp.go index edd1cd0b2cc..dc1fef0868b 100644 --- a/service/sesv2/api_op_GetDedicatedIp.go +++ b/service/sesv2/api_op_GetDedicatedIp.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetDedicatedIp(ctx context.Context, params *GetDedicatedIpInput addawsRestjson1_serdeOpGetDedicatedIpMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_GetDedicatedIps.go b/service/sesv2/api_op_GetDedicatedIps.go index fd260486937..95e6a2fd3d4 100644 --- a/service/sesv2/api_op_GetDedicatedIps.go +++ b/service/sesv2/api_op_GetDedicatedIps.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDedicatedIps(ctx context.Context, params *GetDedicatedIpsInp addawsRestjson1_serdeOpGetDedicatedIpsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_GetDeliverabilityDashboardOptions.go b/service/sesv2/api_op_GetDeliverabilityDashboardOptions.go index 726caf8fb0a..28cdcbe6013 100644 --- a/service/sesv2/api_op_GetDeliverabilityDashboardOptions.go +++ b/service/sesv2/api_op_GetDeliverabilityDashboardOptions.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) GetDeliverabilityDashboardOptions(ctx context.Context, params * addawsRestjson1_serdeOpGetDeliverabilityDashboardOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_GetDeliverabilityTestReport.go b/service/sesv2/api_op_GetDeliverabilityTestReport.go index 76dda29adff..81debe9ee29 100644 --- a/service/sesv2/api_op_GetDeliverabilityTestReport.go +++ b/service/sesv2/api_op_GetDeliverabilityTestReport.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDeliverabilityTestReport(ctx context.Context, params *GetDel addawsRestjson1_serdeOpGetDeliverabilityTestReportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_GetDomainDeliverabilityCampaign.go b/service/sesv2/api_op_GetDomainDeliverabilityCampaign.go index eadd9c22db3..50cdb2c6b57 100644 --- a/service/sesv2/api_op_GetDomainDeliverabilityCampaign.go +++ b/service/sesv2/api_op_GetDomainDeliverabilityCampaign.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetDomainDeliverabilityCampaign(ctx context.Context, params *Ge addawsRestjson1_serdeOpGetDomainDeliverabilityCampaignMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_GetDomainStatisticsReport.go b/service/sesv2/api_op_GetDomainStatisticsReport.go index ce0e8e4d4e0..e79a3719698 100644 --- a/service/sesv2/api_op_GetDomainStatisticsReport.go +++ b/service/sesv2/api_op_GetDomainStatisticsReport.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetDomainStatisticsReport(ctx context.Context, params *GetDomai addawsRestjson1_serdeOpGetDomainStatisticsReportMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_GetEmailIdentity.go b/service/sesv2/api_op_GetEmailIdentity.go index 52941d09fd3..801650eeb2e 100644 --- a/service/sesv2/api_op_GetEmailIdentity.go +++ b/service/sesv2/api_op_GetEmailIdentity.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetEmailIdentity(ctx context.Context, params *GetEmailIdentityI addawsRestjson1_serdeOpGetEmailIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_GetEmailIdentityPolicies.go b/service/sesv2/api_op_GetEmailIdentityPolicies.go index b748ff94922..8c482ce141a 100644 --- a/service/sesv2/api_op_GetEmailIdentityPolicies.go +++ b/service/sesv2/api_op_GetEmailIdentityPolicies.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) GetEmailIdentityPolicies(ctx context.Context, params *GetEmailI addawsRestjson1_serdeOpGetEmailIdentityPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_GetEmailTemplate.go b/service/sesv2/api_op_GetEmailTemplate.go index ca6dc4cd5c5..9a04321d7c5 100644 --- a/service/sesv2/api_op_GetEmailTemplate.go +++ b/service/sesv2/api_op_GetEmailTemplate.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetEmailTemplate(ctx context.Context, params *GetEmailTemplateI addawsRestjson1_serdeOpGetEmailTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_GetSuppressedDestination.go b/service/sesv2/api_op_GetSuppressedDestination.go index 4e8e7739730..e356d05eb0e 100644 --- a/service/sesv2/api_op_GetSuppressedDestination.go +++ b/service/sesv2/api_op_GetSuppressedDestination.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetSuppressedDestination(ctx context.Context, params *GetSuppre addawsRestjson1_serdeOpGetSuppressedDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_ListConfigurationSets.go b/service/sesv2/api_op_ListConfigurationSets.go index aff1d002210..27a1f41650a 100644 --- a/service/sesv2/api_op_ListConfigurationSets.go +++ b/service/sesv2/api_op_ListConfigurationSets.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) ListConfigurationSets(ctx context.Context, params *ListConfigur addawsRestjson1_serdeOpListConfigurationSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_ListCustomVerificationEmailTemplates.go b/service/sesv2/api_op_ListCustomVerificationEmailTemplates.go index b9b5fe7b3c3..0c189ca5675 100644 --- a/service/sesv2/api_op_ListCustomVerificationEmailTemplates.go +++ b/service/sesv2/api_op_ListCustomVerificationEmailTemplates.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListCustomVerificationEmailTemplates(ctx context.Context, param addawsRestjson1_serdeOpListCustomVerificationEmailTemplatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_ListDedicatedIpPools.go b/service/sesv2/api_op_ListDedicatedIpPools.go index fa202f97b9e..6caacdbacc9 100644 --- a/service/sesv2/api_op_ListDedicatedIpPools.go +++ b/service/sesv2/api_op_ListDedicatedIpPools.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) ListDedicatedIpPools(ctx context.Context, params *ListDedicated addawsRestjson1_serdeOpListDedicatedIpPoolsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_ListDeliverabilityTestReports.go b/service/sesv2/api_op_ListDeliverabilityTestReports.go index 6fef7485335..ac491593159 100644 --- a/service/sesv2/api_op_ListDeliverabilityTestReports.go +++ b/service/sesv2/api_op_ListDeliverabilityTestReports.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListDeliverabilityTestReports(ctx context.Context, params *List addawsRestjson1_serdeOpListDeliverabilityTestReportsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_ListDomainDeliverabilityCampaigns.go b/service/sesv2/api_op_ListDomainDeliverabilityCampaigns.go index cf161c6daa4..9ec8e0eb857 100644 --- a/service/sesv2/api_op_ListDomainDeliverabilityCampaigns.go +++ b/service/sesv2/api_op_ListDomainDeliverabilityCampaigns.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListDomainDeliverabilityCampaigns(ctx context.Context, params * addawsRestjson1_serdeOpListDomainDeliverabilityCampaignsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_ListEmailIdentities.go b/service/sesv2/api_op_ListEmailIdentities.go index eb2ef9b57ba..0cef2ee874e 100644 --- a/service/sesv2/api_op_ListEmailIdentities.go +++ b/service/sesv2/api_op_ListEmailIdentities.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListEmailIdentities(ctx context.Context, params *ListEmailIdent addawsRestjson1_serdeOpListEmailIdentitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_ListEmailTemplates.go b/service/sesv2/api_op_ListEmailTemplates.go index 372789f13fb..fd58c621725 100644 --- a/service/sesv2/api_op_ListEmailTemplates.go +++ b/service/sesv2/api_op_ListEmailTemplates.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListEmailTemplates(ctx context.Context, params *ListEmailTempla addawsRestjson1_serdeOpListEmailTemplatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_ListSuppressedDestinations.go b/service/sesv2/api_op_ListSuppressedDestinations.go index 3c0ce261124..229566dcdfe 100644 --- a/service/sesv2/api_op_ListSuppressedDestinations.go +++ b/service/sesv2/api_op_ListSuppressedDestinations.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListSuppressedDestinations(ctx context.Context, params *ListSup addawsRestjson1_serdeOpListSuppressedDestinationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_ListTagsForResource.go b/service/sesv2/api_op_ListTagsForResource.go index 2fb43ffe604..35d4668c277 100644 --- a/service/sesv2/api_op_ListTagsForResource.go +++ b/service/sesv2/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_PutAccountDedicatedIpWarmupAttributes.go b/service/sesv2/api_op_PutAccountDedicatedIpWarmupAttributes.go index ebf8830751a..d445b7b76f9 100644 --- a/service/sesv2/api_op_PutAccountDedicatedIpWarmupAttributes.go +++ b/service/sesv2/api_op_PutAccountDedicatedIpWarmupAttributes.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) PutAccountDedicatedIpWarmupAttributes(ctx context.Context, para addawsRestjson1_serdeOpPutAccountDedicatedIpWarmupAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_PutAccountDetails.go b/service/sesv2/api_op_PutAccountDetails.go index 59ea1d9f258..df84ca3019b 100644 --- a/service/sesv2/api_op_PutAccountDetails.go +++ b/service/sesv2/api_op_PutAccountDetails.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutAccountDetails(ctx context.Context, params *PutAccountDetail addawsRestjson1_serdeOpPutAccountDetailsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_PutAccountSendingAttributes.go b/service/sesv2/api_op_PutAccountSendingAttributes.go index 5948ff1d98e..4c1935d2e68 100644 --- a/service/sesv2/api_op_PutAccountSendingAttributes.go +++ b/service/sesv2/api_op_PutAccountSendingAttributes.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) PutAccountSendingAttributes(ctx context.Context, params *PutAcc addawsRestjson1_serdeOpPutAccountSendingAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_PutAccountSuppressionAttributes.go b/service/sesv2/api_op_PutAccountSuppressionAttributes.go index b23820d3944..ff66eb7a213 100644 --- a/service/sesv2/api_op_PutAccountSuppressionAttributes.go +++ b/service/sesv2/api_op_PutAccountSuppressionAttributes.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutAccountSuppressionAttributes(ctx context.Context, params *Pu addawsRestjson1_serdeOpPutAccountSuppressionAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_PutConfigurationSetDeliveryOptions.go b/service/sesv2/api_op_PutConfigurationSetDeliveryOptions.go index c5d427d15f8..5df3b2dce6f 100644 --- a/service/sesv2/api_op_PutConfigurationSetDeliveryOptions.go +++ b/service/sesv2/api_op_PutConfigurationSetDeliveryOptions.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) PutConfigurationSetDeliveryOptions(ctx context.Context, params addawsRestjson1_serdeOpPutConfigurationSetDeliveryOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_PutConfigurationSetReputationOptions.go b/service/sesv2/api_op_PutConfigurationSetReputationOptions.go index b97dffcd902..fe444427762 100644 --- a/service/sesv2/api_op_PutConfigurationSetReputationOptions.go +++ b/service/sesv2/api_op_PutConfigurationSetReputationOptions.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) PutConfigurationSetReputationOptions(ctx context.Context, param addawsRestjson1_serdeOpPutConfigurationSetReputationOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_PutConfigurationSetSendingOptions.go b/service/sesv2/api_op_PutConfigurationSetSendingOptions.go index 471f23d9c10..f50de895d7d 100644 --- a/service/sesv2/api_op_PutConfigurationSetSendingOptions.go +++ b/service/sesv2/api_op_PutConfigurationSetSendingOptions.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) PutConfigurationSetSendingOptions(ctx context.Context, params * addawsRestjson1_serdeOpPutConfigurationSetSendingOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_PutConfigurationSetSuppressionOptions.go b/service/sesv2/api_op_PutConfigurationSetSuppressionOptions.go index 6bea7e02d38..424d32b6162 100644 --- a/service/sesv2/api_op_PutConfigurationSetSuppressionOptions.go +++ b/service/sesv2/api_op_PutConfigurationSetSuppressionOptions.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutConfigurationSetSuppressionOptions(ctx context.Context, para addawsRestjson1_serdeOpPutConfigurationSetSuppressionOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_PutConfigurationSetTrackingOptions.go b/service/sesv2/api_op_PutConfigurationSetTrackingOptions.go index 4f17b6e9111..b1d89b4e541 100644 --- a/service/sesv2/api_op_PutConfigurationSetTrackingOptions.go +++ b/service/sesv2/api_op_PutConfigurationSetTrackingOptions.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) PutConfigurationSetTrackingOptions(ctx context.Context, params addawsRestjson1_serdeOpPutConfigurationSetTrackingOptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_PutDedicatedIpInPool.go b/service/sesv2/api_op_PutDedicatedIpInPool.go index c96c654e77c..1df6ca93d7e 100644 --- a/service/sesv2/api_op_PutDedicatedIpInPool.go +++ b/service/sesv2/api_op_PutDedicatedIpInPool.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) PutDedicatedIpInPool(ctx context.Context, params *PutDedicatedI addawsRestjson1_serdeOpPutDedicatedIpInPoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_PutDedicatedIpWarmupAttributes.go b/service/sesv2/api_op_PutDedicatedIpWarmupAttributes.go index d15f889dda5..086ad551d6b 100644 --- a/service/sesv2/api_op_PutDedicatedIpWarmupAttributes.go +++ b/service/sesv2/api_op_PutDedicatedIpWarmupAttributes.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) PutDedicatedIpWarmupAttributes(ctx context.Context, params *Put addawsRestjson1_serdeOpPutDedicatedIpWarmupAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_PutDeliverabilityDashboardOption.go b/service/sesv2/api_op_PutDeliverabilityDashboardOption.go index 3727205b32a..1d2e1a0f66a 100644 --- a/service/sesv2/api_op_PutDeliverabilityDashboardOption.go +++ b/service/sesv2/api_op_PutDeliverabilityDashboardOption.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) PutDeliverabilityDashboardOption(ctx context.Context, params *P addawsRestjson1_serdeOpPutDeliverabilityDashboardOptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_PutEmailIdentityDkimAttributes.go b/service/sesv2/api_op_PutEmailIdentityDkimAttributes.go index d2efa011c9f..469a565480c 100644 --- a/service/sesv2/api_op_PutEmailIdentityDkimAttributes.go +++ b/service/sesv2/api_op_PutEmailIdentityDkimAttributes.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) PutEmailIdentityDkimAttributes(ctx context.Context, params *Put addawsRestjson1_serdeOpPutEmailIdentityDkimAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_PutEmailIdentityDkimSigningAttributes.go b/service/sesv2/api_op_PutEmailIdentityDkimSigningAttributes.go index d492d1bb712..7ccd9e9b1eb 100644 --- a/service/sesv2/api_op_PutEmailIdentityDkimSigningAttributes.go +++ b/service/sesv2/api_op_PutEmailIdentityDkimSigningAttributes.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) PutEmailIdentityDkimSigningAttributes(ctx context.Context, para addawsRestjson1_serdeOpPutEmailIdentityDkimSigningAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_PutEmailIdentityFeedbackAttributes.go b/service/sesv2/api_op_PutEmailIdentityFeedbackAttributes.go index 4cac368e656..44cc7a6dd4b 100644 --- a/service/sesv2/api_op_PutEmailIdentityFeedbackAttributes.go +++ b/service/sesv2/api_op_PutEmailIdentityFeedbackAttributes.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) PutEmailIdentityFeedbackAttributes(ctx context.Context, params addawsRestjson1_serdeOpPutEmailIdentityFeedbackAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_PutEmailIdentityMailFromAttributes.go b/service/sesv2/api_op_PutEmailIdentityMailFromAttributes.go index 91294b72806..7533c9c6bbf 100644 --- a/service/sesv2/api_op_PutEmailIdentityMailFromAttributes.go +++ b/service/sesv2/api_op_PutEmailIdentityMailFromAttributes.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutEmailIdentityMailFromAttributes(ctx context.Context, params addawsRestjson1_serdeOpPutEmailIdentityMailFromAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_PutSuppressedDestination.go b/service/sesv2/api_op_PutSuppressedDestination.go index ecff9c579ca..e389aa55f8d 100644 --- a/service/sesv2/api_op_PutSuppressedDestination.go +++ b/service/sesv2/api_op_PutSuppressedDestination.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutSuppressedDestination(ctx context.Context, params *PutSuppre addawsRestjson1_serdeOpPutSuppressedDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_SendBulkEmail.go b/service/sesv2/api_op_SendBulkEmail.go index 8723f6e627e..1610264f97d 100644 --- a/service/sesv2/api_op_SendBulkEmail.go +++ b/service/sesv2/api_op_SendBulkEmail.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SendBulkEmail(ctx context.Context, params *SendBulkEmailInput, addawsRestjson1_serdeOpSendBulkEmailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_SendCustomVerificationEmail.go b/service/sesv2/api_op_SendCustomVerificationEmail.go index 9738a22eb24..d9605041ab7 100644 --- a/service/sesv2/api_op_SendCustomVerificationEmail.go +++ b/service/sesv2/api_op_SendCustomVerificationEmail.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) SendCustomVerificationEmail(ctx context.Context, params *SendCu addawsRestjson1_serdeOpSendCustomVerificationEmailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_SendEmail.go b/service/sesv2/api_op_SendEmail.go index 96f79edd8bc..c1dad7410c3 100644 --- a/service/sesv2/api_op_SendEmail.go +++ b/service/sesv2/api_op_SendEmail.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) SendEmail(ctx context.Context, params *SendEmailInput, optFns . addawsRestjson1_serdeOpSendEmailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_TagResource.go b/service/sesv2/api_op_TagResource.go index e295092a7e3..09837ca999f 100644 --- a/service/sesv2/api_op_TagResource.go +++ b/service/sesv2/api_op_TagResource.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_TestRenderEmailTemplate.go b/service/sesv2/api_op_TestRenderEmailTemplate.go index 1b3a41e01ae..bfa028ea7cb 100644 --- a/service/sesv2/api_op_TestRenderEmailTemplate.go +++ b/service/sesv2/api_op_TestRenderEmailTemplate.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) TestRenderEmailTemplate(ctx context.Context, params *TestRender addawsRestjson1_serdeOpTestRenderEmailTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_UntagResource.go b/service/sesv2/api_op_UntagResource.go index f274759801e..a80f9f72bcf 100644 --- a/service/sesv2/api_op_UntagResource.go +++ b/service/sesv2/api_op_UntagResource.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_UpdateConfigurationSetEventDestination.go b/service/sesv2/api_op_UpdateConfigurationSetEventDestination.go index 0c7452383b6..4618f6e6f21 100644 --- a/service/sesv2/api_op_UpdateConfigurationSetEventDestination.go +++ b/service/sesv2/api_op_UpdateConfigurationSetEventDestination.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) UpdateConfigurationSetEventDestination(ctx context.Context, par addawsRestjson1_serdeOpUpdateConfigurationSetEventDestinationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_UpdateCustomVerificationEmailTemplate.go b/service/sesv2/api_op_UpdateCustomVerificationEmailTemplate.go index ef1e4c76bd7..0b977152742 100644 --- a/service/sesv2/api_op_UpdateCustomVerificationEmailTemplate.go +++ b/service/sesv2/api_op_UpdateCustomVerificationEmailTemplate.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) UpdateCustomVerificationEmailTemplate(ctx context.Context, para addawsRestjson1_serdeOpUpdateCustomVerificationEmailTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_UpdateEmailIdentityPolicy.go b/service/sesv2/api_op_UpdateEmailIdentityPolicy.go index 6dfbcb909af..e3ec42a2668 100644 --- a/service/sesv2/api_op_UpdateEmailIdentityPolicy.go +++ b/service/sesv2/api_op_UpdateEmailIdentityPolicy.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) UpdateEmailIdentityPolicy(ctx context.Context, params *UpdateEm addawsRestjson1_serdeOpUpdateEmailIdentityPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/api_op_UpdateEmailTemplate.go b/service/sesv2/api_op_UpdateEmailTemplate.go index c39bf381f4b..386b596433c 100644 --- a/service/sesv2/api_op_UpdateEmailTemplate.go +++ b/service/sesv2/api_op_UpdateEmailTemplate.go @@ -5,7 +5,6 @@ package sesv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sesv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateEmailTemplate(ctx context.Context, params *UpdateEmailTem addawsRestjson1_serdeOpUpdateEmailTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sesv2/endpoints.go b/service/sesv2/endpoints.go index 6dbe4117056..4baaac0f5c1 100644 --- a/service/sesv2/endpoints.go +++ b/service/sesv2/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/sfn/api_client.go b/service/sfn/api_client.go index f9c8450a985..174b30c3c27 100644 --- a/service/sfn/api_client.go +++ b/service/sfn/api_client.go @@ -91,30 +91,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -180,6 +156,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/sfn/api_op_CreateActivity.go b/service/sfn/api_op_CreateActivity.go index f237412ba2b..8db59304399 100644 --- a/service/sfn/api_op_CreateActivity.go +++ b/service/sfn/api_op_CreateActivity.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sfn/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) CreateActivity(ctx context.Context, params *CreateActivityInput addawsAwsjson10_serdeOpCreateActivityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_CreateStateMachine.go b/service/sfn/api_op_CreateStateMachine.go index 458117f03c1..165324d6828 100644 --- a/service/sfn/api_op_CreateStateMachine.go +++ b/service/sfn/api_op_CreateStateMachine.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sfn/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) CreateStateMachine(ctx context.Context, params *CreateStateMach addawsAwsjson10_serdeOpCreateStateMachineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_DeleteActivity.go b/service/sfn/api_op_DeleteActivity.go index 1b64cb7d51f..2439aa5bced 100644 --- a/service/sfn/api_op_DeleteActivity.go +++ b/service/sfn/api_op_DeleteActivity.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteActivity(ctx context.Context, params *DeleteActivityInput addawsAwsjson10_serdeOpDeleteActivityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_DeleteStateMachine.go b/service/sfn/api_op_DeleteStateMachine.go index 71857eb0417..a3262feaa83 100644 --- a/service/sfn/api_op_DeleteStateMachine.go +++ b/service/sfn/api_op_DeleteStateMachine.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteStateMachine(ctx context.Context, params *DeleteStateMach addawsAwsjson10_serdeOpDeleteStateMachineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_DescribeActivity.go b/service/sfn/api_op_DescribeActivity.go index cd93d7dfa02..ae4c23c28f4 100644 --- a/service/sfn/api_op_DescribeActivity.go +++ b/service/sfn/api_op_DescribeActivity.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DescribeActivity(ctx context.Context, params *DescribeActivityI addawsAwsjson10_serdeOpDescribeActivityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_DescribeExecution.go b/service/sfn/api_op_DescribeExecution.go index 9aeacef454d..0250ec1185b 100644 --- a/service/sfn/api_op_DescribeExecution.go +++ b/service/sfn/api_op_DescribeExecution.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sfn/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeExecution(ctx context.Context, params *DescribeExecutio addawsAwsjson10_serdeOpDescribeExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_DescribeStateMachine.go b/service/sfn/api_op_DescribeStateMachine.go index d25882d7a96..b1e044589bd 100644 --- a/service/sfn/api_op_DescribeStateMachine.go +++ b/service/sfn/api_op_DescribeStateMachine.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sfn/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeStateMachine(ctx context.Context, params *DescribeState addawsAwsjson10_serdeOpDescribeStateMachineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_DescribeStateMachineForExecution.go b/service/sfn/api_op_DescribeStateMachineForExecution.go index 3b7449e5ed1..43cfa0b4bd9 100644 --- a/service/sfn/api_op_DescribeStateMachineForExecution.go +++ b/service/sfn/api_op_DescribeStateMachineForExecution.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sfn/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeStateMachineForExecution(ctx context.Context, params *D addawsAwsjson10_serdeOpDescribeStateMachineForExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_GetActivityTask.go b/service/sfn/api_op_GetActivityTask.go index bcee6fcdeb6..ffb9e9c1af9 100644 --- a/service/sfn/api_op_GetActivityTask.go +++ b/service/sfn/api_op_GetActivityTask.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) GetActivityTask(ctx context.Context, params *GetActivityTaskInp addawsAwsjson10_serdeOpGetActivityTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_GetExecutionHistory.go b/service/sfn/api_op_GetExecutionHistory.go index cb4aabf0c2d..b4b79a6d711 100644 --- a/service/sfn/api_op_GetExecutionHistory.go +++ b/service/sfn/api_op_GetExecutionHistory.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sfn/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) GetExecutionHistory(ctx context.Context, params *GetExecutionHi addawsAwsjson10_serdeOpGetExecutionHistoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_ListActivities.go b/service/sfn/api_op_ListActivities.go index 73df03de72c..695d5ed7670 100644 --- a/service/sfn/api_op_ListActivities.go +++ b/service/sfn/api_op_ListActivities.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sfn/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListActivities(ctx context.Context, params *ListActivitiesInput addawsAwsjson10_serdeOpListActivitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_ListExecutions.go b/service/sfn/api_op_ListExecutions.go index c0f5d0a0ba7..bb6bc6e2fd4 100644 --- a/service/sfn/api_op_ListExecutions.go +++ b/service/sfn/api_op_ListExecutions.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sfn/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) ListExecutions(ctx context.Context, params *ListExecutionsInput addawsAwsjson10_serdeOpListExecutionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_ListStateMachines.go b/service/sfn/api_op_ListStateMachines.go index fab94ca5359..8d0b533456a 100644 --- a/service/sfn/api_op_ListStateMachines.go +++ b/service/sfn/api_op_ListStateMachines.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sfn/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListStateMachines(ctx context.Context, params *ListStateMachine addawsAwsjson10_serdeOpListStateMachinesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_ListTagsForResource.go b/service/sfn/api_op_ListTagsForResource.go index f21c95f1ec3..23834331430 100644 --- a/service/sfn/api_op_ListTagsForResource.go +++ b/service/sfn/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sfn/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson10_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_SendTaskFailure.go b/service/sfn/api_op_SendTaskFailure.go index d36c2650671..c3babfaa01a 100644 --- a/service/sfn/api_op_SendTaskFailure.go +++ b/service/sfn/api_op_SendTaskFailure.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) SendTaskFailure(ctx context.Context, params *SendTaskFailureInp addawsAwsjson10_serdeOpSendTaskFailureMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_SendTaskHeartbeat.go b/service/sfn/api_op_SendTaskHeartbeat.go index e485bc8c461..6afdfa7bfec 100644 --- a/service/sfn/api_op_SendTaskHeartbeat.go +++ b/service/sfn/api_op_SendTaskHeartbeat.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -37,9 +36,9 @@ func (c *Client) SendTaskHeartbeat(ctx context.Context, params *SendTaskHeartbea addawsAwsjson10_serdeOpSendTaskHeartbeatMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_SendTaskSuccess.go b/service/sfn/api_op_SendTaskSuccess.go index c3d0bf597bc..489a1a99b50 100644 --- a/service/sfn/api_op_SendTaskSuccess.go +++ b/service/sfn/api_op_SendTaskSuccess.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) SendTaskSuccess(ctx context.Context, params *SendTaskSuccessInp addawsAwsjson10_serdeOpSendTaskSuccessMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_StartExecution.go b/service/sfn/api_op_StartExecution.go index 90b76b2789e..9a26fdbc862 100644 --- a/service/sfn/api_op_StartExecution.go +++ b/service/sfn/api_op_StartExecution.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) StartExecution(ctx context.Context, params *StartExecutionInput addawsAwsjson10_serdeOpStartExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_StopExecution.go b/service/sfn/api_op_StopExecution.go index b0d07cf38ca..f0d8437495b 100644 --- a/service/sfn/api_op_StopExecution.go +++ b/service/sfn/api_op_StopExecution.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) StopExecution(ctx context.Context, params *StopExecutionInput, addawsAwsjson10_serdeOpStopExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_TagResource.go b/service/sfn/api_op_TagResource.go index e52768697fa..5d9d627d3cf 100644 --- a/service/sfn/api_op_TagResource.go +++ b/service/sfn/api_op_TagResource.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sfn/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson10_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_UntagResource.go b/service/sfn/api_op_UntagResource.go index d2178382608..822bbfada82 100644 --- a/service/sfn/api_op_UntagResource.go +++ b/service/sfn/api_op_UntagResource.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson10_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/api_op_UpdateStateMachine.go b/service/sfn/api_op_UpdateStateMachine.go index 265880b0c16..0a9181ea87e 100644 --- a/service/sfn/api_op_UpdateStateMachine.go +++ b/service/sfn/api_op_UpdateStateMachine.go @@ -5,7 +5,6 @@ package sfn import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sfn/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) UpdateStateMachine(ctx context.Context, params *UpdateStateMach addawsAwsjson10_serdeOpUpdateStateMachineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sfn/endpoints.go b/service/sfn/endpoints.go index 969a1c4f390..b7b5da0d431 100644 --- a/service/sfn/endpoints.go +++ b/service/sfn/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/shield/api_client.go b/service/shield/api_client.go index e41528f3650..e0baf9d1faa 100644 --- a/service/shield/api_client.go +++ b/service/shield/api_client.go @@ -82,30 +82,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -171,6 +147,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/shield/api_op_AssociateDRTLogBucket.go b/service/shield/api_op_AssociateDRTLogBucket.go index 559e7587738..5d97774c9af 100644 --- a/service/shield/api_op_AssociateDRTLogBucket.go +++ b/service/shield/api_op_AssociateDRTLogBucket.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) AssociateDRTLogBucket(ctx context.Context, params *AssociateDRT addawsAwsjson11_serdeOpAssociateDRTLogBucketMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_AssociateDRTRole.go b/service/shield/api_op_AssociateDRTRole.go index e03a24a3ce9..e51600c7a3d 100644 --- a/service/shield/api_op_AssociateDRTRole.go +++ b/service/shield/api_op_AssociateDRTRole.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -50,9 +49,9 @@ func (c *Client) AssociateDRTRole(ctx context.Context, params *AssociateDRTRoleI addawsAwsjson11_serdeOpAssociateDRTRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_AssociateHealthCheck.go b/service/shield/api_op_AssociateHealthCheck.go index d8fe04443e2..8af31d91313 100644 --- a/service/shield/api_op_AssociateHealthCheck.go +++ b/service/shield/api_op_AssociateHealthCheck.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) AssociateHealthCheck(ctx context.Context, params *AssociateHeal addawsAwsjson11_serdeOpAssociateHealthCheckMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_AssociateProactiveEngagementDetails.go b/service/shield/api_op_AssociateProactiveEngagementDetails.go index 50faca30c32..546a1a1d470 100644 --- a/service/shield/api_op_AssociateProactiveEngagementDetails.go +++ b/service/shield/api_op_AssociateProactiveEngagementDetails.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/shield/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) AssociateProactiveEngagementDetails(ctx context.Context, params addawsAwsjson11_serdeOpAssociateProactiveEngagementDetailsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_CreateProtection.go b/service/shield/api_op_CreateProtection.go index 992163ded8f..672db54a2b5 100644 --- a/service/shield/api_op_CreateProtection.go +++ b/service/shield/api_op_CreateProtection.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) CreateProtection(ctx context.Context, params *CreateProtectionI addawsAwsjson11_serdeOpCreateProtectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_CreateSubscription.go b/service/shield/api_op_CreateSubscription.go index f0c8826aa41..d714d470b39 100644 --- a/service/shield/api_op_CreateSubscription.go +++ b/service/shield/api_op_CreateSubscription.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) CreateSubscription(ctx context.Context, params *CreateSubscript addawsAwsjson11_serdeOpCreateSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_DeleteProtection.go b/service/shield/api_op_DeleteProtection.go index bf53cd59075..fc6aa9b6628 100644 --- a/service/shield/api_op_DeleteProtection.go +++ b/service/shield/api_op_DeleteProtection.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteProtection(ctx context.Context, params *DeleteProtectionI addawsAwsjson11_serdeOpDeleteProtectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_DeleteSubscription.go b/service/shield/api_op_DeleteSubscription.go index 42d0da3e39c..db48dda802d 100644 --- a/service/shield/api_op_DeleteSubscription.go +++ b/service/shield/api_op_DeleteSubscription.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteSubscription(ctx context.Context, params *DeleteSubscript addawsAwsjson11_serdeOpDeleteSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_DescribeAttack.go b/service/shield/api_op_DescribeAttack.go index 40fc4f7156b..f8f601479b4 100644 --- a/service/shield/api_op_DescribeAttack.go +++ b/service/shield/api_op_DescribeAttack.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/shield/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeAttack(ctx context.Context, params *DescribeAttackInput addawsAwsjson11_serdeOpDescribeAttackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_DescribeDRTAccess.go b/service/shield/api_op_DescribeDRTAccess.go index 4c110ba028e..92e461689e5 100644 --- a/service/shield/api_op_DescribeDRTAccess.go +++ b/service/shield/api_op_DescribeDRTAccess.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DescribeDRTAccess(ctx context.Context, params *DescribeDRTAcces addawsAwsjson11_serdeOpDescribeDRTAccessMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_DescribeEmergencyContactSettings.go b/service/shield/api_op_DescribeEmergencyContactSettings.go index 11dba684482..a1c6d13d215 100644 --- a/service/shield/api_op_DescribeEmergencyContactSettings.go +++ b/service/shield/api_op_DescribeEmergencyContactSettings.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/shield/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeEmergencyContactSettings(ctx context.Context, params *D addawsAwsjson11_serdeOpDescribeEmergencyContactSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_DescribeProtection.go b/service/shield/api_op_DescribeProtection.go index a7e2b82fbcc..f819a7122e4 100644 --- a/service/shield/api_op_DescribeProtection.go +++ b/service/shield/api_op_DescribeProtection.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/shield/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeProtection(ctx context.Context, params *DescribeProtect addawsAwsjson11_serdeOpDescribeProtectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_DescribeSubscription.go b/service/shield/api_op_DescribeSubscription.go index 6b10fd59a15..c1254d8bd87 100644 --- a/service/shield/api_op_DescribeSubscription.go +++ b/service/shield/api_op_DescribeSubscription.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/shield/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeSubscription(ctx context.Context, params *DescribeSubsc addawsAwsjson11_serdeOpDescribeSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_DisableProactiveEngagement.go b/service/shield/api_op_DisableProactiveEngagement.go index 25ccfefaa51..6eb615f4834 100644 --- a/service/shield/api_op_DisableProactiveEngagement.go +++ b/service/shield/api_op_DisableProactiveEngagement.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisableProactiveEngagement(ctx context.Context, params *Disable addawsAwsjson11_serdeOpDisableProactiveEngagementMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_DisassociateDRTLogBucket.go b/service/shield/api_op_DisassociateDRTLogBucket.go index 74fb4382a81..8a4343a333b 100644 --- a/service/shield/api_op_DisassociateDRTLogBucket.go +++ b/service/shield/api_op_DisassociateDRTLogBucket.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DisassociateDRTLogBucket(ctx context.Context, params *Disassoci addawsAwsjson11_serdeOpDisassociateDRTLogBucketMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_DisassociateDRTRole.go b/service/shield/api_op_DisassociateDRTRole.go index 96515ac1f85..d9e33c25cbe 100644 --- a/service/shield/api_op_DisassociateDRTRole.go +++ b/service/shield/api_op_DisassociateDRTRole.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DisassociateDRTRole(ctx context.Context, params *DisassociateDR addawsAwsjson11_serdeOpDisassociateDRTRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_DisassociateHealthCheck.go b/service/shield/api_op_DisassociateHealthCheck.go index 372d21fcfa0..05e92f32637 100644 --- a/service/shield/api_op_DisassociateHealthCheck.go +++ b/service/shield/api_op_DisassociateHealthCheck.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) DisassociateHealthCheck(ctx context.Context, params *Disassocia addawsAwsjson11_serdeOpDisassociateHealthCheckMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_EnableProactiveEngagement.go b/service/shield/api_op_EnableProactiveEngagement.go index 31118dbd442..ebc62d4a199 100644 --- a/service/shield/api_op_EnableProactiveEngagement.go +++ b/service/shield/api_op_EnableProactiveEngagement.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) EnableProactiveEngagement(ctx context.Context, params *EnablePr addawsAwsjson11_serdeOpEnableProactiveEngagementMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_GetSubscriptionState.go b/service/shield/api_op_GetSubscriptionState.go index 4954cfb0ae2..ff8bfe8f2cd 100644 --- a/service/shield/api_op_GetSubscriptionState.go +++ b/service/shield/api_op_GetSubscriptionState.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/shield/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetSubscriptionState(ctx context.Context, params *GetSubscripti addawsAwsjson11_serdeOpGetSubscriptionStateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_ListAttacks.go b/service/shield/api_op_ListAttacks.go index a1f1dfef7b0..7cd20f557a6 100644 --- a/service/shield/api_op_ListAttacks.go +++ b/service/shield/api_op_ListAttacks.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/shield/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListAttacks(ctx context.Context, params *ListAttacksInput, optF addawsAwsjson11_serdeOpListAttacksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_ListProtections.go b/service/shield/api_op_ListProtections.go index b68d66d61d7..71e202f6a7f 100644 --- a/service/shield/api_op_ListProtections.go +++ b/service/shield/api_op_ListProtections.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/shield/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListProtections(ctx context.Context, params *ListProtectionsInp addawsAwsjson11_serdeOpListProtectionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_UpdateEmergencyContactSettings.go b/service/shield/api_op_UpdateEmergencyContactSettings.go index 6c27040e26d..4f51309bdc2 100644 --- a/service/shield/api_op_UpdateEmergencyContactSettings.go +++ b/service/shield/api_op_UpdateEmergencyContactSettings.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/shield/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateEmergencyContactSettings(ctx context.Context, params *Upd addawsAwsjson11_serdeOpUpdateEmergencyContactSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/api_op_UpdateSubscription.go b/service/shield/api_op_UpdateSubscription.go index fbbbf150a31..def68eccec8 100644 --- a/service/shield/api_op_UpdateSubscription.go +++ b/service/shield/api_op_UpdateSubscription.go @@ -5,7 +5,6 @@ package shield import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/shield/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateSubscription(ctx context.Context, params *UpdateSubscript addawsAwsjson11_serdeOpUpdateSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/shield/endpoints.go b/service/shield/endpoints.go index c5f7a935edf..9f70a8516d7 100644 --- a/service/shield/endpoints.go +++ b/service/shield/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/signer/api_client.go b/service/signer/api_client.go index fb281c3f208..92f7875b4a3 100644 --- a/service/signer/api_client.go +++ b/service/signer/api_client.go @@ -95,34 +95,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -195,6 +167,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/signer/api_op_CancelSigningProfile.go b/service/signer/api_op_CancelSigningProfile.go index 3bfdccfeafc..a34b1b5b824 100644 --- a/service/signer/api_op_CancelSigningProfile.go +++ b/service/signer/api_op_CancelSigningProfile.go @@ -5,7 +5,6 @@ package signer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CancelSigningProfile(ctx context.Context, params *CancelSigning addawsRestjson1_serdeOpCancelSigningProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/signer/api_op_DescribeSigningJob.go b/service/signer/api_op_DescribeSigningJob.go index 32ae89459af..350f6ec5186 100644 --- a/service/signer/api_op_DescribeSigningJob.go +++ b/service/signer/api_op_DescribeSigningJob.go @@ -5,7 +5,6 @@ package signer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/signer/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeSigningJob(ctx context.Context, params *DescribeSigning addawsRestjson1_serdeOpDescribeSigningJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/signer/api_op_GetSigningPlatform.go b/service/signer/api_op_GetSigningPlatform.go index 31c1a18b1f9..9f60a47c5f6 100644 --- a/service/signer/api_op_GetSigningPlatform.go +++ b/service/signer/api_op_GetSigningPlatform.go @@ -5,7 +5,6 @@ package signer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/signer/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetSigningPlatform(ctx context.Context, params *GetSigningPlatf addawsRestjson1_serdeOpGetSigningPlatformMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/signer/api_op_GetSigningProfile.go b/service/signer/api_op_GetSigningProfile.go index f79393171ac..fa2e5a6c31f 100644 --- a/service/signer/api_op_GetSigningProfile.go +++ b/service/signer/api_op_GetSigningProfile.go @@ -5,7 +5,6 @@ package signer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/signer/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetSigningProfile(ctx context.Context, params *GetSigningProfil addawsRestjson1_serdeOpGetSigningProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/signer/api_op_ListSigningJobs.go b/service/signer/api_op_ListSigningJobs.go index aa3a693746b..0a18d38c9c4 100644 --- a/service/signer/api_op_ListSigningJobs.go +++ b/service/signer/api_op_ListSigningJobs.go @@ -5,7 +5,6 @@ package signer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/signer/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListSigningJobs(ctx context.Context, params *ListSigningJobsInp addawsRestjson1_serdeOpListSigningJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/signer/api_op_ListSigningPlatforms.go b/service/signer/api_op_ListSigningPlatforms.go index 5c67416f3e2..1becbef7e97 100644 --- a/service/signer/api_op_ListSigningPlatforms.go +++ b/service/signer/api_op_ListSigningPlatforms.go @@ -5,7 +5,6 @@ package signer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/signer/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListSigningPlatforms(ctx context.Context, params *ListSigningPl addawsRestjson1_serdeOpListSigningPlatformsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/signer/api_op_ListSigningProfiles.go b/service/signer/api_op_ListSigningProfiles.go index 17124666ac3..137ac9e2cd8 100644 --- a/service/signer/api_op_ListSigningProfiles.go +++ b/service/signer/api_op_ListSigningProfiles.go @@ -5,7 +5,6 @@ package signer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/signer/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListSigningProfiles(ctx context.Context, params *ListSigningPro addawsRestjson1_serdeOpListSigningProfilesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/signer/api_op_ListTagsForResource.go b/service/signer/api_op_ListTagsForResource.go index 56971323cca..410321e8b9b 100644 --- a/service/signer/api_op_ListTagsForResource.go +++ b/service/signer/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package signer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/signer/api_op_PutSigningProfile.go b/service/signer/api_op_PutSigningProfile.go index 7a701725f0f..e0872da38d5 100644 --- a/service/signer/api_op_PutSigningProfile.go +++ b/service/signer/api_op_PutSigningProfile.go @@ -5,7 +5,6 @@ package signer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/signer/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) PutSigningProfile(ctx context.Context, params *PutSigningProfil addawsRestjson1_serdeOpPutSigningProfileMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/signer/api_op_StartSigningJob.go b/service/signer/api_op_StartSigningJob.go index 01e0797f62c..d1fcbede3b1 100644 --- a/service/signer/api_op_StartSigningJob.go +++ b/service/signer/api_op_StartSigningJob.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/signer/types" smithy "github.com/awslabs/smithy-go" @@ -49,9 +48,9 @@ func (c *Client) StartSigningJob(ctx context.Context, params *StartSigningJobInp addawsRestjson1_serdeOpStartSigningJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/signer/api_op_TagResource.go b/service/signer/api_op_TagResource.go index 2d7c0b28eca..a0ab9012eae 100644 --- a/service/signer/api_op_TagResource.go +++ b/service/signer/api_op_TagResource.go @@ -5,7 +5,6 @@ package signer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/signer/api_op_UntagResource.go b/service/signer/api_op_UntagResource.go index e6879a797d4..6861abb514e 100644 --- a/service/signer/api_op_UntagResource.go +++ b/service/signer/api_op_UntagResource.go @@ -5,7 +5,6 @@ package signer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/signer/endpoints.go b/service/signer/endpoints.go index 0a3ad60424e..04cd7e2c44c 100644 --- a/service/signer/endpoints.go +++ b/service/signer/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/sms/api_client.go b/service/sms/api_client.go index 703217e0be5..4550806d9a1 100644 --- a/service/sms/api_client.go +++ b/service/sms/api_client.go @@ -92,30 +92,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -181,6 +157,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/sms/api_op_CreateApp.go b/service/sms/api_op_CreateApp.go index ac22fa3436e..8d3ccbaa1ac 100644 --- a/service/sms/api_op_CreateApp.go +++ b/service/sms/api_op_CreateApp.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sms/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateApp(ctx context.Context, params *CreateAppInput, optFns . addawsAwsjson11_serdeOpCreateAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_CreateReplicationJob.go b/service/sms/api_op_CreateReplicationJob.go index 5ec7ef2b50f..b01469bca28 100644 --- a/service/sms/api_op_CreateReplicationJob.go +++ b/service/sms/api_op_CreateReplicationJob.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sms/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateReplicationJob(ctx context.Context, params *CreateReplica addawsAwsjson11_serdeOpCreateReplicationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_DeleteApp.go b/service/sms/api_op_DeleteApp.go index 1e469ddee87..8890a681f4c 100644 --- a/service/sms/api_op_DeleteApp.go +++ b/service/sms/api_op_DeleteApp.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteApp(ctx context.Context, params *DeleteAppInput, optFns . addawsAwsjson11_serdeOpDeleteAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_DeleteAppLaunchConfiguration.go b/service/sms/api_op_DeleteAppLaunchConfiguration.go index 5313a4a636d..fbc04e7c45f 100644 --- a/service/sms/api_op_DeleteAppLaunchConfiguration.go +++ b/service/sms/api_op_DeleteAppLaunchConfiguration.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteAppLaunchConfiguration(ctx context.Context, params *Delet addawsAwsjson11_serdeOpDeleteAppLaunchConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_DeleteAppReplicationConfiguration.go b/service/sms/api_op_DeleteAppReplicationConfiguration.go index a734b20588e..fc197d64903 100644 --- a/service/sms/api_op_DeleteAppReplicationConfiguration.go +++ b/service/sms/api_op_DeleteAppReplicationConfiguration.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteAppReplicationConfiguration(ctx context.Context, params * addawsAwsjson11_serdeOpDeleteAppReplicationConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_DeleteReplicationJob.go b/service/sms/api_op_DeleteReplicationJob.go index 6509a4f2889..20b41bf573f 100644 --- a/service/sms/api_op_DeleteReplicationJob.go +++ b/service/sms/api_op_DeleteReplicationJob.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteReplicationJob(ctx context.Context, params *DeleteReplica addawsAwsjson11_serdeOpDeleteReplicationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_DeleteServerCatalog.go b/service/sms/api_op_DeleteServerCatalog.go index bcc858a0fc2..9c7ed5a4767 100644 --- a/service/sms/api_op_DeleteServerCatalog.go +++ b/service/sms/api_op_DeleteServerCatalog.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteServerCatalog(ctx context.Context, params *DeleteServerCa addawsAwsjson11_serdeOpDeleteServerCatalogMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_DisassociateConnector.go b/service/sms/api_op_DisassociateConnector.go index 4c76ccef522..e9603567a88 100644 --- a/service/sms/api_op_DisassociateConnector.go +++ b/service/sms/api_op_DisassociateConnector.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisassociateConnector(ctx context.Context, params *Disassociate addawsAwsjson11_serdeOpDisassociateConnectorMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_GenerateChangeSet.go b/service/sms/api_op_GenerateChangeSet.go index 7a64999b64e..9cde4f63390 100644 --- a/service/sms/api_op_GenerateChangeSet.go +++ b/service/sms/api_op_GenerateChangeSet.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sms/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GenerateChangeSet(ctx context.Context, params *GenerateChangeSe addawsAwsjson11_serdeOpGenerateChangeSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_GenerateTemplate.go b/service/sms/api_op_GenerateTemplate.go index e3f59ac6240..2cd9c091d9e 100644 --- a/service/sms/api_op_GenerateTemplate.go +++ b/service/sms/api_op_GenerateTemplate.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sms/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GenerateTemplate(ctx context.Context, params *GenerateTemplateI addawsAwsjson11_serdeOpGenerateTemplateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_GetApp.go b/service/sms/api_op_GetApp.go index 76eb792f87a..812655c2506 100644 --- a/service/sms/api_op_GetApp.go +++ b/service/sms/api_op_GetApp.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetApp(ctx context.Context, params *GetAppInput, optFns ...func addawsAwsjson11_serdeOpGetAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_GetAppLaunchConfiguration.go b/service/sms/api_op_GetAppLaunchConfiguration.go index f135185cd57..9e654a0afb0 100644 --- a/service/sms/api_op_GetAppLaunchConfiguration.go +++ b/service/sms/api_op_GetAppLaunchConfiguration.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetAppLaunchConfiguration(ctx context.Context, params *GetAppLa addawsAwsjson11_serdeOpGetAppLaunchConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_GetAppReplicationConfiguration.go b/service/sms/api_op_GetAppReplicationConfiguration.go index 956087cd5ae..663e82fa39b 100644 --- a/service/sms/api_op_GetAppReplicationConfiguration.go +++ b/service/sms/api_op_GetAppReplicationConfiguration.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sms/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetAppReplicationConfiguration(ctx context.Context, params *Get addawsAwsjson11_serdeOpGetAppReplicationConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_GetConnectors.go b/service/sms/api_op_GetConnectors.go index 30011276fb4..fc1e5ee2c9d 100644 --- a/service/sms/api_op_GetConnectors.go +++ b/service/sms/api_op_GetConnectors.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetConnectors(ctx context.Context, params *GetConnectorsInput, addawsAwsjson11_serdeOpGetConnectorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_GetReplicationJobs.go b/service/sms/api_op_GetReplicationJobs.go index 4c9cd6655a6..e3dbc181514 100644 --- a/service/sms/api_op_GetReplicationJobs.go +++ b/service/sms/api_op_GetReplicationJobs.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetReplicationJobs(ctx context.Context, params *GetReplicationJ addawsAwsjson11_serdeOpGetReplicationJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_GetReplicationRuns.go b/service/sms/api_op_GetReplicationRuns.go index 10148cf60cc..fac93fd3c13 100644 --- a/service/sms/api_op_GetReplicationRuns.go +++ b/service/sms/api_op_GetReplicationRuns.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetReplicationRuns(ctx context.Context, params *GetReplicationR addawsAwsjson11_serdeOpGetReplicationRunsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_GetServers.go b/service/sms/api_op_GetServers.go index 68887e5b68d..6a317a53ed0 100644 --- a/service/sms/api_op_GetServers.go +++ b/service/sms/api_op_GetServers.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sms/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetServers(ctx context.Context, params *GetServersInput, optFns addawsAwsjson11_serdeOpGetServersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_ImportServerCatalog.go b/service/sms/api_op_ImportServerCatalog.go index 9c2d5b0b1b0..838a5b9872f 100644 --- a/service/sms/api_op_ImportServerCatalog.go +++ b/service/sms/api_op_ImportServerCatalog.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ImportServerCatalog(ctx context.Context, params *ImportServerCa addawsAwsjson11_serdeOpImportServerCatalogMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_LaunchApp.go b/service/sms/api_op_LaunchApp.go index 943216825ed..39f5d2877de 100644 --- a/service/sms/api_op_LaunchApp.go +++ b/service/sms/api_op_LaunchApp.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) LaunchApp(ctx context.Context, params *LaunchAppInput, optFns . addawsAwsjson11_serdeOpLaunchAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_ListApps.go b/service/sms/api_op_ListApps.go index a9e1cad81d3..e8d942750a6 100644 --- a/service/sms/api_op_ListApps.go +++ b/service/sms/api_op_ListApps.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListApps(ctx context.Context, params *ListAppsInput, optFns ... addawsAwsjson11_serdeOpListAppsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_PutAppLaunchConfiguration.go b/service/sms/api_op_PutAppLaunchConfiguration.go index 9910b8dde30..4ca8855a601 100644 --- a/service/sms/api_op_PutAppLaunchConfiguration.go +++ b/service/sms/api_op_PutAppLaunchConfiguration.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutAppLaunchConfiguration(ctx context.Context, params *PutAppLa addawsAwsjson11_serdeOpPutAppLaunchConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_PutAppReplicationConfiguration.go b/service/sms/api_op_PutAppReplicationConfiguration.go index 692ea7a00df..ba094347212 100644 --- a/service/sms/api_op_PutAppReplicationConfiguration.go +++ b/service/sms/api_op_PutAppReplicationConfiguration.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutAppReplicationConfiguration(ctx context.Context, params *Put addawsAwsjson11_serdeOpPutAppReplicationConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_StartAppReplication.go b/service/sms/api_op_StartAppReplication.go index 0a7b631720b..40aa4a5a82c 100644 --- a/service/sms/api_op_StartAppReplication.go +++ b/service/sms/api_op_StartAppReplication.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StartAppReplication(ctx context.Context, params *StartAppReplic addawsAwsjson11_serdeOpStartAppReplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_StartOnDemandReplicationRun.go b/service/sms/api_op_StartOnDemandReplicationRun.go index 8ea3160bdcc..1b249fb5640 100644 --- a/service/sms/api_op_StartOnDemandReplicationRun.go +++ b/service/sms/api_op_StartOnDemandReplicationRun.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) StartOnDemandReplicationRun(ctx context.Context, params *StartO addawsAwsjson11_serdeOpStartOnDemandReplicationRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_StopAppReplication.go b/service/sms/api_op_StopAppReplication.go index 8754a473040..93d9ed1f099 100644 --- a/service/sms/api_op_StopAppReplication.go +++ b/service/sms/api_op_StopAppReplication.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) StopAppReplication(ctx context.Context, params *StopAppReplicat addawsAwsjson11_serdeOpStopAppReplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_TerminateApp.go b/service/sms/api_op_TerminateApp.go index 389b9d9f1f1..ff9d425da1b 100644 --- a/service/sms/api_op_TerminateApp.go +++ b/service/sms/api_op_TerminateApp.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) TerminateApp(ctx context.Context, params *TerminateAppInput, op addawsAwsjson11_serdeOpTerminateAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_UpdateApp.go b/service/sms/api_op_UpdateApp.go index e9756fe4c3a..09d43b75345 100644 --- a/service/sms/api_op_UpdateApp.go +++ b/service/sms/api_op_UpdateApp.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sms/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateApp(ctx context.Context, params *UpdateAppInput, optFns . addawsAwsjson11_serdeOpUpdateAppMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/api_op_UpdateReplicationJob.go b/service/sms/api_op_UpdateReplicationJob.go index 9e7cfad7a9b..e94a991a539 100644 --- a/service/sms/api_op_UpdateReplicationJob.go +++ b/service/sms/api_op_UpdateReplicationJob.go @@ -5,7 +5,6 @@ package sms import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sms/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateReplicationJob(ctx context.Context, params *UpdateReplica addawsAwsjson11_serdeOpUpdateReplicationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sms/endpoints.go b/service/sms/endpoints.go index 9ede218c69e..fff26e623c7 100644 --- a/service/sms/endpoints.go +++ b/service/sms/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/snowball/api_client.go b/service/snowball/api_client.go index d33789026cd..24a8814c2fb 100644 --- a/service/snowball/api_client.go +++ b/service/snowball/api_client.go @@ -85,30 +85,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -174,6 +150,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/snowball/api_op_CancelCluster.go b/service/snowball/api_op_CancelCluster.go index 42244e11018..c4007b454c6 100644 --- a/service/snowball/api_op_CancelCluster.go +++ b/service/snowball/api_op_CancelCluster.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CancelCluster(ctx context.Context, params *CancelClusterInput, addawsAwsjson11_serdeOpCancelClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/api_op_CancelJob.go b/service/snowball/api_op_CancelJob.go index d2decfe2f17..05ea68a7d36 100644 --- a/service/snowball/api_op_CancelJob.go +++ b/service/snowball/api_op_CancelJob.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CancelJob(ctx context.Context, params *CancelJobInput, optFns . addawsAwsjson11_serdeOpCancelJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/api_op_CreateAddress.go b/service/snowball/api_op_CreateAddress.go index 4be08068b2e..e2fd7d57f9e 100644 --- a/service/snowball/api_op_CreateAddress.go +++ b/service/snowball/api_op_CreateAddress.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/snowball/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateAddress(ctx context.Context, params *CreateAddressInput, addawsAwsjson11_serdeOpCreateAddressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/api_op_CreateCluster.go b/service/snowball/api_op_CreateCluster.go index 5cd6dbf6613..58f53f29220 100644 --- a/service/snowball/api_op_CreateCluster.go +++ b/service/snowball/api_op_CreateCluster.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/snowball/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateCluster(ctx context.Context, params *CreateClusterInput, addawsAwsjson11_serdeOpCreateClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/api_op_CreateJob.go b/service/snowball/api_op_CreateJob.go index 1fc97baf300..7c70d9f2805 100644 --- a/service/snowball/api_op_CreateJob.go +++ b/service/snowball/api_op_CreateJob.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/snowball/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateJob(ctx context.Context, params *CreateJobInput, optFns . addawsAwsjson11_serdeOpCreateJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/api_op_DescribeAddress.go b/service/snowball/api_op_DescribeAddress.go index df852c3a160..000ba639638 100644 --- a/service/snowball/api_op_DescribeAddress.go +++ b/service/snowball/api_op_DescribeAddress.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/snowball/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAddress(ctx context.Context, params *DescribeAddressInp addawsAwsjson11_serdeOpDescribeAddressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/api_op_DescribeAddresses.go b/service/snowball/api_op_DescribeAddresses.go index ec0bbdefd80..429ecd0c1bd 100644 --- a/service/snowball/api_op_DescribeAddresses.go +++ b/service/snowball/api_op_DescribeAddresses.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/snowball/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeAddresses(ctx context.Context, params *DescribeAddresse addawsAwsjson11_serdeOpDescribeAddressesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/api_op_DescribeCluster.go b/service/snowball/api_op_DescribeCluster.go index f8d56c5befc..078f7fb110e 100644 --- a/service/snowball/api_op_DescribeCluster.go +++ b/service/snowball/api_op_DescribeCluster.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/snowball/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeCluster(ctx context.Context, params *DescribeClusterInp addawsAwsjson11_serdeOpDescribeClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/api_op_DescribeJob.go b/service/snowball/api_op_DescribeJob.go index 7a5b7c11ae8..4f112eb78dc 100644 --- a/service/snowball/api_op_DescribeJob.go +++ b/service/snowball/api_op_DescribeJob.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/snowball/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeJob(ctx context.Context, params *DescribeJobInput, optF addawsAwsjson11_serdeOpDescribeJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/api_op_GetJobManifest.go b/service/snowball/api_op_GetJobManifest.go index e9d52269c0d..acbb56344b8 100644 --- a/service/snowball/api_op_GetJobManifest.go +++ b/service/snowball/api_op_GetJobManifest.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) GetJobManifest(ctx context.Context, params *GetJobManifestInput addawsAwsjson11_serdeOpGetJobManifestMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/api_op_GetJobUnlockCode.go b/service/snowball/api_op_GetJobUnlockCode.go index 95e5d45792a..910abd42d68 100644 --- a/service/snowball/api_op_GetJobUnlockCode.go +++ b/service/snowball/api_op_GetJobUnlockCode.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) GetJobUnlockCode(ctx context.Context, params *GetJobUnlockCodeI addawsAwsjson11_serdeOpGetJobUnlockCodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/api_op_GetSnowballUsage.go b/service/snowball/api_op_GetSnowballUsage.go index a4820d6b0df..b2c49f62aac 100644 --- a/service/snowball/api_op_GetSnowballUsage.go +++ b/service/snowball/api_op_GetSnowballUsage.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) GetSnowballUsage(ctx context.Context, params *GetSnowballUsageI addawsAwsjson11_serdeOpGetSnowballUsageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/api_op_GetSoftwareUpdates.go b/service/snowball/api_op_GetSoftwareUpdates.go index af5183c8fb7..9b62886e99f 100644 --- a/service/snowball/api_op_GetSoftwareUpdates.go +++ b/service/snowball/api_op_GetSoftwareUpdates.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetSoftwareUpdates(ctx context.Context, params *GetSoftwareUpda addawsAwsjson11_serdeOpGetSoftwareUpdatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/api_op_ListClusterJobs.go b/service/snowball/api_op_ListClusterJobs.go index c35ede233c6..f10612d93b6 100644 --- a/service/snowball/api_op_ListClusterJobs.go +++ b/service/snowball/api_op_ListClusterJobs.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/snowball/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListClusterJobs(ctx context.Context, params *ListClusterJobsInp addawsAwsjson11_serdeOpListClusterJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/api_op_ListClusters.go b/service/snowball/api_op_ListClusters.go index da1077004a1..683163efc9f 100644 --- a/service/snowball/api_op_ListClusters.go +++ b/service/snowball/api_op_ListClusters.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/snowball/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListClusters(ctx context.Context, params *ListClustersInput, op addawsAwsjson11_serdeOpListClustersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/api_op_ListCompatibleImages.go b/service/snowball/api_op_ListCompatibleImages.go index e1769867d85..2a14471fad2 100644 --- a/service/snowball/api_op_ListCompatibleImages.go +++ b/service/snowball/api_op_ListCompatibleImages.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/snowball/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListCompatibleImages(ctx context.Context, params *ListCompatibl addawsAwsjson11_serdeOpListCompatibleImagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/api_op_ListJobs.go b/service/snowball/api_op_ListJobs.go index 5087e8548a6..12af7501c51 100644 --- a/service/snowball/api_op_ListJobs.go +++ b/service/snowball/api_op_ListJobs.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/snowball/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListJobs(ctx context.Context, params *ListJobsInput, optFns ... addawsAwsjson11_serdeOpListJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/api_op_UpdateCluster.go b/service/snowball/api_op_UpdateCluster.go index 47e4223e3e1..b7f187ed7ec 100644 --- a/service/snowball/api_op_UpdateCluster.go +++ b/service/snowball/api_op_UpdateCluster.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/snowball/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateCluster(ctx context.Context, params *UpdateClusterInput, addawsAwsjson11_serdeOpUpdateClusterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/api_op_UpdateJob.go b/service/snowball/api_op_UpdateJob.go index 4fb77da5ec7..4e343c0b755 100644 --- a/service/snowball/api_op_UpdateJob.go +++ b/service/snowball/api_op_UpdateJob.go @@ -5,7 +5,6 @@ package snowball import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/snowball/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateJob(ctx context.Context, params *UpdateJobInput, optFns . addawsAwsjson11_serdeOpUpdateJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/snowball/endpoints.go b/service/snowball/endpoints.go index 5c9f6fe193a..7ba3f2a4860 100644 --- a/service/snowball/endpoints.go +++ b/service/snowball/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/sns/api_client.go b/service/sns/api_client.go index 911fd5ca5c2..0ab809860bb 100644 --- a/service/sns/api_client.go +++ b/service/sns/api_client.go @@ -89,30 +89,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -178,6 +154,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/sns/api_op_AddPermission.go b/service/sns/api_op_AddPermission.go index 836ed6f53de..b86fa00de60 100644 --- a/service/sns/api_op_AddPermission.go +++ b/service/sns/api_op_AddPermission.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AddPermission(ctx context.Context, params *AddPermissionInput, addawsAwsquery_serdeOpAddPermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_CheckIfPhoneNumberIsOptedOut.go b/service/sns/api_op_CheckIfPhoneNumberIsOptedOut.go index c7f92cfb3cd..5e868e36520 100644 --- a/service/sns/api_op_CheckIfPhoneNumberIsOptedOut.go +++ b/service/sns/api_op_CheckIfPhoneNumberIsOptedOut.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) CheckIfPhoneNumberIsOptedOut(ctx context.Context, params *Check addawsAwsquery_serdeOpCheckIfPhoneNumberIsOptedOutMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_ConfirmSubscription.go b/service/sns/api_op_ConfirmSubscription.go index a9113f7aded..53097acd919 100644 --- a/service/sns/api_op_ConfirmSubscription.go +++ b/service/sns/api_op_ConfirmSubscription.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) ConfirmSubscription(ctx context.Context, params *ConfirmSubscri addawsAwsquery_serdeOpConfirmSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_CreatePlatformApplication.go b/service/sns/api_op_CreatePlatformApplication.go index 4dc2471364c..b2842492cbc 100644 --- a/service/sns/api_op_CreatePlatformApplication.go +++ b/service/sns/api_op_CreatePlatformApplication.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -50,9 +49,9 @@ func (c *Client) CreatePlatformApplication(ctx context.Context, params *CreatePl addawsAwsquery_serdeOpCreatePlatformApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_CreatePlatformEndpoint.go b/service/sns/api_op_CreatePlatformEndpoint.go index 22a1b7b4c70..4a6b48eb7d6 100644 --- a/service/sns/api_op_CreatePlatformEndpoint.go +++ b/service/sns/api_op_CreatePlatformEndpoint.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) CreatePlatformEndpoint(ctx context.Context, params *CreatePlatf addawsAwsquery_serdeOpCreatePlatformEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_CreateTopic.go b/service/sns/api_op_CreateTopic.go index 033b91f97e1..4d21c414b90 100644 --- a/service/sns/api_op_CreateTopic.go +++ b/service/sns/api_op_CreateTopic.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sns/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateTopic(ctx context.Context, params *CreateTopicInput, optF addawsAwsquery_serdeOpCreateTopicMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_DeleteEndpoint.go b/service/sns/api_op_DeleteEndpoint.go index ec8e256c639..83ca36cd945 100644 --- a/service/sns/api_op_DeleteEndpoint.go +++ b/service/sns/api_op_DeleteEndpoint.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteEndpoint(ctx context.Context, params *DeleteEndpointInput addawsAwsquery_serdeOpDeleteEndpointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_DeletePlatformApplication.go b/service/sns/api_op_DeletePlatformApplication.go index 712fb93e4ce..9bd13919dec 100644 --- a/service/sns/api_op_DeletePlatformApplication.go +++ b/service/sns/api_op_DeletePlatformApplication.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeletePlatformApplication(ctx context.Context, params *DeletePl addawsAwsquery_serdeOpDeletePlatformApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_DeleteTopic.go b/service/sns/api_op_DeleteTopic.go index 94d85d76c33..3a56f1e60c4 100644 --- a/service/sns/api_op_DeleteTopic.go +++ b/service/sns/api_op_DeleteTopic.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteTopic(ctx context.Context, params *DeleteTopicInput, optF addawsAwsquery_serdeOpDeleteTopicMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_GetEndpointAttributes.go b/service/sns/api_op_GetEndpointAttributes.go index 1d9185c5e23..fabafb5e437 100644 --- a/service/sns/api_op_GetEndpointAttributes.go +++ b/service/sns/api_op_GetEndpointAttributes.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) GetEndpointAttributes(ctx context.Context, params *GetEndpointA addawsAwsquery_serdeOpGetEndpointAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_GetPlatformApplicationAttributes.go b/service/sns/api_op_GetPlatformApplicationAttributes.go index 9b16de41a3e..ca065771179 100644 --- a/service/sns/api_op_GetPlatformApplicationAttributes.go +++ b/service/sns/api_op_GetPlatformApplicationAttributes.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) GetPlatformApplicationAttributes(ctx context.Context, params *G addawsAwsquery_serdeOpGetPlatformApplicationAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_GetSMSAttributes.go b/service/sns/api_op_GetSMSAttributes.go index bbdc90023df..4dcffe98f19 100644 --- a/service/sns/api_op_GetSMSAttributes.go +++ b/service/sns/api_op_GetSMSAttributes.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetSMSAttributes(ctx context.Context, params *GetSMSAttributesI addawsAwsquery_serdeOpGetSMSAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_GetSubscriptionAttributes.go b/service/sns/api_op_GetSubscriptionAttributes.go index 6476c5f449a..322720de481 100644 --- a/service/sns/api_op_GetSubscriptionAttributes.go +++ b/service/sns/api_op_GetSubscriptionAttributes.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetSubscriptionAttributes(ctx context.Context, params *GetSubsc addawsAwsquery_serdeOpGetSubscriptionAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_GetTopicAttributes.go b/service/sns/api_op_GetTopicAttributes.go index 806eee6363a..ee1f1b99e20 100644 --- a/service/sns/api_op_GetTopicAttributes.go +++ b/service/sns/api_op_GetTopicAttributes.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetTopicAttributes(ctx context.Context, params *GetTopicAttribu addawsAwsquery_serdeOpGetTopicAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_ListEndpointsByPlatformApplication.go b/service/sns/api_op_ListEndpointsByPlatformApplication.go index 83847c82c79..32d3db156a3 100644 --- a/service/sns/api_op_ListEndpointsByPlatformApplication.go +++ b/service/sns/api_op_ListEndpointsByPlatformApplication.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sns/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) ListEndpointsByPlatformApplication(ctx context.Context, params addawsAwsquery_serdeOpListEndpointsByPlatformApplicationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_ListPhoneNumbersOptedOut.go b/service/sns/api_op_ListPhoneNumbersOptedOut.go index 6d9b6ae218b..3c4f35da9d2 100644 --- a/service/sns/api_op_ListPhoneNumbersOptedOut.go +++ b/service/sns/api_op_ListPhoneNumbersOptedOut.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) ListPhoneNumbersOptedOut(ctx context.Context, params *ListPhone addawsAwsquery_serdeOpListPhoneNumbersOptedOutMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_ListPlatformApplications.go b/service/sns/api_op_ListPlatformApplications.go index 9a3fae7bb69..7efa08415d3 100644 --- a/service/sns/api_op_ListPlatformApplications.go +++ b/service/sns/api_op_ListPlatformApplications.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sns/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) ListPlatformApplications(ctx context.Context, params *ListPlatf addawsAwsquery_serdeOpListPlatformApplicationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_ListSubscriptions.go b/service/sns/api_op_ListSubscriptions.go index 3732e90dfb5..cbcd3a4a6df 100644 --- a/service/sns/api_op_ListSubscriptions.go +++ b/service/sns/api_op_ListSubscriptions.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sns/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListSubscriptions(ctx context.Context, params *ListSubscription addawsAwsquery_serdeOpListSubscriptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_ListSubscriptionsByTopic.go b/service/sns/api_op_ListSubscriptionsByTopic.go index 1e2763101a8..57dbe95649a 100644 --- a/service/sns/api_op_ListSubscriptionsByTopic.go +++ b/service/sns/api_op_ListSubscriptionsByTopic.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sns/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListSubscriptionsByTopic(ctx context.Context, params *ListSubsc addawsAwsquery_serdeOpListSubscriptionsByTopicMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_ListTagsForResource.go b/service/sns/api_op_ListTagsForResource.go index 5d748bcdc1e..5fbef0d993b 100644 --- a/service/sns/api_op_ListTagsForResource.go +++ b/service/sns/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sns/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsquery_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_ListTopics.go b/service/sns/api_op_ListTopics.go index cfbbffcc46a..ba034d0b88f 100644 --- a/service/sns/api_op_ListTopics.go +++ b/service/sns/api_op_ListTopics.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sns/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListTopics(ctx context.Context, params *ListTopicsInput, optFns addawsAwsquery_serdeOpListTopicsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_OptInPhoneNumber.go b/service/sns/api_op_OptInPhoneNumber.go index 372fb2ad6a8..4d178ca7f2f 100644 --- a/service/sns/api_op_OptInPhoneNumber.go +++ b/service/sns/api_op_OptInPhoneNumber.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) OptInPhoneNumber(ctx context.Context, params *OptInPhoneNumberI addawsAwsquery_serdeOpOptInPhoneNumberMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_Publish.go b/service/sns/api_op_Publish.go index 4c359781b6f..e93e76aa36a 100644 --- a/service/sns/api_op_Publish.go +++ b/service/sns/api_op_Publish.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sns/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) Publish(ctx context.Context, params *PublishInput, optFns ...fu addawsAwsquery_serdeOpPublishMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_RemovePermission.go b/service/sns/api_op_RemovePermission.go index 5ed6c574a44..945928b354f 100644 --- a/service/sns/api_op_RemovePermission.go +++ b/service/sns/api_op_RemovePermission.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RemovePermission(ctx context.Context, params *RemovePermissionI addawsAwsquery_serdeOpRemovePermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_SetEndpointAttributes.go b/service/sns/api_op_SetEndpointAttributes.go index f7c28f07c32..24860f81628 100644 --- a/service/sns/api_op_SetEndpointAttributes.go +++ b/service/sns/api_op_SetEndpointAttributes.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) SetEndpointAttributes(ctx context.Context, params *SetEndpointA addawsAwsquery_serdeOpSetEndpointAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_SetPlatformApplicationAttributes.go b/service/sns/api_op_SetPlatformApplicationAttributes.go index 014d0b9ab2d..a5510a37fdd 100644 --- a/service/sns/api_op_SetPlatformApplicationAttributes.go +++ b/service/sns/api_op_SetPlatformApplicationAttributes.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) SetPlatformApplicationAttributes(ctx context.Context, params *S addawsAwsquery_serdeOpSetPlatformApplicationAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_SetSMSAttributes.go b/service/sns/api_op_SetSMSAttributes.go index 8dc1abc473d..d9fd052a541 100644 --- a/service/sns/api_op_SetSMSAttributes.go +++ b/service/sns/api_op_SetSMSAttributes.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) SetSMSAttributes(ctx context.Context, params *SetSMSAttributesI addawsAwsquery_serdeOpSetSMSAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_SetSubscriptionAttributes.go b/service/sns/api_op_SetSubscriptionAttributes.go index 557fb8be927..0404aa83ad9 100644 --- a/service/sns/api_op_SetSubscriptionAttributes.go +++ b/service/sns/api_op_SetSubscriptionAttributes.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) SetSubscriptionAttributes(ctx context.Context, params *SetSubsc addawsAwsquery_serdeOpSetSubscriptionAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_SetTopicAttributes.go b/service/sns/api_op_SetTopicAttributes.go index 00905d7046b..ff376ba92ba 100644 --- a/service/sns/api_op_SetTopicAttributes.go +++ b/service/sns/api_op_SetTopicAttributes.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) SetTopicAttributes(ctx context.Context, params *SetTopicAttribu addawsAwsquery_serdeOpSetTopicAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_Subscribe.go b/service/sns/api_op_Subscribe.go index 76da63bf7ef..91d5db1185f 100644 --- a/service/sns/api_op_Subscribe.go +++ b/service/sns/api_op_Subscribe.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) Subscribe(ctx context.Context, params *SubscribeInput, optFns . addawsAwsquery_serdeOpSubscribeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_TagResource.go b/service/sns/api_op_TagResource.go index afd5f5cc4be..37ee77b0b57 100644 --- a/service/sns/api_op_TagResource.go +++ b/service/sns/api_op_TagResource.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sns/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsquery_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_Unsubscribe.go b/service/sns/api_op_Unsubscribe.go index 38bcd021ca1..f9cbfc334fe 100644 --- a/service/sns/api_op_Unsubscribe.go +++ b/service/sns/api_op_Unsubscribe.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) Unsubscribe(ctx context.Context, params *UnsubscribeInput, optF addawsAwsquery_serdeOpUnsubscribeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/api_op_UntagResource.go b/service/sns/api_op_UntagResource.go index 641bcc6726d..8f144686793 100644 --- a/service/sns/api_op_UntagResource.go +++ b/service/sns/api_op_UntagResource.go @@ -5,7 +5,6 @@ package sns import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsquery_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sns/endpoints.go b/service/sns/endpoints.go index 806f88f18d8..4b0c41fa339 100644 --- a/service/sns/endpoints.go +++ b/service/sns/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/sqs/api_client.go b/service/sqs/api_client.go index aaafaa05c32..589f0a923fb 100644 --- a/service/sqs/api_client.go +++ b/service/sqs/api_client.go @@ -106,30 +106,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -195,6 +171,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/sqs/api_op_AddPermission.go b/service/sqs/api_op_AddPermission.go index e6a37dca414..5e6e7230774 100644 --- a/service/sqs/api_op_AddPermission.go +++ b/service/sqs/api_op_AddPermission.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -52,9 +51,9 @@ func (c *Client) AddPermission(ctx context.Context, params *AddPermissionInput, addawsAwsquery_serdeOpAddPermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_ChangeMessageVisibility.go b/service/sqs/api_op_ChangeMessageVisibility.go index 062b6fd8472..b1bde067a6f 100644 --- a/service/sqs/api_op_ChangeMessageVisibility.go +++ b/service/sqs/api_op_ChangeMessageVisibility.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -67,9 +66,9 @@ func (c *Client) ChangeMessageVisibility(ctx context.Context, params *ChangeMess addawsAwsquery_serdeOpChangeMessageVisibilityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_ChangeMessageVisibilityBatch.go b/service/sqs/api_op_ChangeMessageVisibilityBatch.go index 1c917e407d9..47ac64b5982 100644 --- a/service/sqs/api_op_ChangeMessageVisibilityBatch.go +++ b/service/sqs/api_op_ChangeMessageVisibilityBatch.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sqs/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) ChangeMessageVisibilityBatch(ctx context.Context, params *Chang addawsAwsquery_serdeOpChangeMessageVisibilityBatchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_CreateQueue.go b/service/sqs/api_op_CreateQueue.go index be9643119fd..74c4f719de5 100644 --- a/service/sqs/api_op_CreateQueue.go +++ b/service/sqs/api_op_CreateQueue.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -62,9 +61,9 @@ func (c *Client) CreateQueue(ctx context.Context, params *CreateQueueInput, optF addawsAwsquery_serdeOpCreateQueueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_DeleteMessage.go b/service/sqs/api_op_DeleteMessage.go index daf2fbb4efe..b4c512f299f 100644 --- a/service/sqs/api_op_DeleteMessage.go +++ b/service/sqs/api_op_DeleteMessage.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -38,9 +37,9 @@ func (c *Client) DeleteMessage(ctx context.Context, params *DeleteMessageInput, addawsAwsquery_serdeOpDeleteMessageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_DeleteMessageBatch.go b/service/sqs/api_op_DeleteMessageBatch.go index 92608813f2b..816c35f4852 100644 --- a/service/sqs/api_op_DeleteMessageBatch.go +++ b/service/sqs/api_op_DeleteMessageBatch.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sqs/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DeleteMessageBatch(ctx context.Context, params *DeleteMessageBa addawsAwsquery_serdeOpDeleteMessageBatchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_DeleteQueue.go b/service/sqs/api_op_DeleteQueue.go index ed23dffa9f3..377db3db4d5 100644 --- a/service/sqs/api_op_DeleteQueue.go +++ b/service/sqs/api_op_DeleteQueue.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) DeleteQueue(ctx context.Context, params *DeleteQueueInput, optF addawsAwsquery_serdeOpDeleteQueueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_GetQueueAttributes.go b/service/sqs/api_op_GetQueueAttributes.go index 31ff123d56e..0925f6faeea 100644 --- a/service/sqs/api_op_GetQueueAttributes.go +++ b/service/sqs/api_op_GetQueueAttributes.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sqs/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetQueueAttributes(ctx context.Context, params *GetQueueAttribu addawsAwsquery_serdeOpGetQueueAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_GetQueueUrl.go b/service/sqs/api_op_GetQueueUrl.go index 0ae0839c4e2..d1d84b684e9 100644 --- a/service/sqs/api_op_GetQueueUrl.go +++ b/service/sqs/api_op_GetQueueUrl.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) GetQueueUrl(ctx context.Context, params *GetQueueUrlInput, optF addawsAwsquery_serdeOpGetQueueUrlMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_ListDeadLetterSourceQueues.go b/service/sqs/api_op_ListDeadLetterSourceQueues.go index cb5673b533f..18d5cccd471 100644 --- a/service/sqs/api_op_ListDeadLetterSourceQueues.go +++ b/service/sqs/api_op_ListDeadLetterSourceQueues.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) ListDeadLetterSourceQueues(ctx context.Context, params *ListDea addawsAwsquery_serdeOpListDeadLetterSourceQueuesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_ListQueueTags.go b/service/sqs/api_op_ListQueueTags.go index 5225b9d1680..b4a6cd0b7a4 100644 --- a/service/sqs/api_op_ListQueueTags.go +++ b/service/sqs/api_op_ListQueueTags.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) ListQueueTags(ctx context.Context, params *ListQueueTagsInput, addawsAwsquery_serdeOpListQueueTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_ListQueues.go b/service/sqs/api_op_ListQueues.go index 29c85362057..bb1f8ba2b35 100644 --- a/service/sqs/api_op_ListQueues.go +++ b/service/sqs/api_op_ListQueues.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) ListQueues(ctx context.Context, params *ListQueuesInput, optFns addawsAwsquery_serdeOpListQueuesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_PurgeQueue.go b/service/sqs/api_op_PurgeQueue.go index 0017cf2abb9..cdb9e9c36fc 100644 --- a/service/sqs/api_op_PurgeQueue.go +++ b/service/sqs/api_op_PurgeQueue.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) PurgeQueue(ctx context.Context, params *PurgeQueueInput, optFns addawsAwsquery_serdeOpPurgeQueueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_ReceiveMessage.go b/service/sqs/api_op_ReceiveMessage.go index 481365193f2..4803f72e56a 100644 --- a/service/sqs/api_op_ReceiveMessage.go +++ b/service/sqs/api_op_ReceiveMessage.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sqs/types" smithy "github.com/awslabs/smithy-go" @@ -68,9 +67,9 @@ func (c *Client) ReceiveMessage(ctx context.Context, params *ReceiveMessageInput addawsAwsquery_serdeOpReceiveMessageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_RemovePermission.go b/service/sqs/api_op_RemovePermission.go index 2f75325e756..9e0bb5a3e09 100644 --- a/service/sqs/api_op_RemovePermission.go +++ b/service/sqs/api_op_RemovePermission.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) RemovePermission(ctx context.Context, params *RemovePermissionI addawsAwsquery_serdeOpRemovePermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_SendMessage.go b/service/sqs/api_op_SendMessage.go index 969d7e7c5b8..dfe9dd2703c 100644 --- a/service/sqs/api_op_SendMessage.go +++ b/service/sqs/api_op_SendMessage.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sqs/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) SendMessage(ctx context.Context, params *SendMessageInput, optF addawsAwsquery_serdeOpSendMessageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_SendMessageBatch.go b/service/sqs/api_op_SendMessageBatch.go index b67b4467471..1bb748f2b4b 100644 --- a/service/sqs/api_op_SendMessageBatch.go +++ b/service/sqs/api_op_SendMessageBatch.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sqs/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) SendMessageBatch(ctx context.Context, params *SendMessageBatchI addawsAwsquery_serdeOpSendMessageBatchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_SetQueueAttributes.go b/service/sqs/api_op_SetQueueAttributes.go index 22eb791a27e..fc82bd163dd 100644 --- a/service/sqs/api_op_SetQueueAttributes.go +++ b/service/sqs/api_op_SetQueueAttributes.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -39,9 +38,9 @@ func (c *Client) SetQueueAttributes(ctx context.Context, params *SetQueueAttribu addawsAwsquery_serdeOpSetQueueAttributesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_TagQueue.go b/service/sqs/api_op_TagQueue.go index a98490429fc..6400d063237 100644 --- a/service/sqs/api_op_TagQueue.go +++ b/service/sqs/api_op_TagQueue.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -38,9 +37,9 @@ func (c *Client) TagQueue(ctx context.Context, params *TagQueueInput, optFns ... addawsAwsquery_serdeOpTagQueueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/api_op_UntagQueue.go b/service/sqs/api_op_UntagQueue.go index 87c4a003a5b..12ee14b6a21 100644 --- a/service/sqs/api_op_UntagQueue.go +++ b/service/sqs/api_op_UntagQueue.go @@ -5,7 +5,6 @@ package sqs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) UntagQueue(ctx context.Context, params *UntagQueueInput, optFns addawsAwsquery_serdeOpUntagQueueMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sqs/endpoints.go b/service/sqs/endpoints.go index 9a15b2bad0f..c9a8e8a609f 100644 --- a/service/sqs/endpoints.go +++ b/service/sqs/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/ssm/api_client.go b/service/ssm/api_client.go index 89faf10ca5b..e5971c8e831 100644 --- a/service/ssm/api_client.go +++ b/service/ssm/api_client.go @@ -103,34 +103,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -203,6 +175,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/ssm/api_op_AddTagsToResource.go b/service/ssm/api_op_AddTagsToResource.go index dc401c0da1b..9f3c0fba1e8 100644 --- a/service/ssm/api_op_AddTagsToResource.go +++ b/service/ssm/api_op_AddTagsToResource.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) AddTagsToResource(ctx context.Context, params *AddTagsToResourc addawsAwsjson11_serdeOpAddTagsToResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_CancelCommand.go b/service/ssm/api_op_CancelCommand.go index af03a628595..9bfddcdafef 100644 --- a/service/ssm/api_op_CancelCommand.go +++ b/service/ssm/api_op_CancelCommand.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CancelCommand(ctx context.Context, params *CancelCommandInput, addawsAwsjson11_serdeOpCancelCommandMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_CancelMaintenanceWindowExecution.go b/service/ssm/api_op_CancelMaintenanceWindowExecution.go index 6f06a02ca86..1fc72fced75 100644 --- a/service/ssm/api_op_CancelMaintenanceWindowExecution.go +++ b/service/ssm/api_op_CancelMaintenanceWindowExecution.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CancelMaintenanceWindowExecution(ctx context.Context, params *C addawsAwsjson11_serdeOpCancelMaintenanceWindowExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_CreateActivation.go b/service/ssm/api_op_CreateActivation.go index 1047b368019..076fbd8a529 100644 --- a/service/ssm/api_op_CreateActivation.go +++ b/service/ssm/api_op_CreateActivation.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) CreateActivation(ctx context.Context, params *CreateActivationI addawsAwsjson11_serdeOpCreateActivationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_CreateAssociation.go b/service/ssm/api_op_CreateAssociation.go index 12bd576c33a..b3606a4a2af 100644 --- a/service/ssm/api_op_CreateAssociation.go +++ b/service/ssm/api_op_CreateAssociation.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) CreateAssociation(ctx context.Context, params *CreateAssociatio addawsAwsjson11_serdeOpCreateAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_CreateAssociationBatch.go b/service/ssm/api_op_CreateAssociationBatch.go index 822380b2d14..a4af2ec8373 100644 --- a/service/ssm/api_op_CreateAssociationBatch.go +++ b/service/ssm/api_op_CreateAssociationBatch.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateAssociationBatch(ctx context.Context, params *CreateAssoc addawsAwsjson11_serdeOpCreateAssociationBatchMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_CreateDocument.go b/service/ssm/api_op_CreateDocument.go index d92335b440a..9fa3beb7e76 100644 --- a/service/ssm/api_op_CreateDocument.go +++ b/service/ssm/api_op_CreateDocument.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateDocument(ctx context.Context, params *CreateDocumentInput addawsAwsjson11_serdeOpCreateDocumentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_CreateMaintenanceWindow.go b/service/ssm/api_op_CreateMaintenanceWindow.go index de5aea1735e..20e02a75550 100644 --- a/service/ssm/api_op_CreateMaintenanceWindow.go +++ b/service/ssm/api_op_CreateMaintenanceWindow.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateMaintenanceWindow(ctx context.Context, params *CreateMain addawsAwsjson11_serdeOpCreateMaintenanceWindowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_CreateOpsItem.go b/service/ssm/api_op_CreateOpsItem.go index bfda45421cb..b5122cce90d 100644 --- a/service/ssm/api_op_CreateOpsItem.go +++ b/service/ssm/api_op_CreateOpsItem.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) CreateOpsItem(ctx context.Context, params *CreateOpsItemInput, addawsAwsjson11_serdeOpCreateOpsItemMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_CreatePatchBaseline.go b/service/ssm/api_op_CreatePatchBaseline.go index c37acf65382..48bc6c27f0a 100644 --- a/service/ssm/api_op_CreatePatchBaseline.go +++ b/service/ssm/api_op_CreatePatchBaseline.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreatePatchBaseline(ctx context.Context, params *CreatePatchBas addawsAwsjson11_serdeOpCreatePatchBaselineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_CreateResourceDataSync.go b/service/ssm/api_op_CreateResourceDataSync.go index 3a8c550cb9d..8d0167fa97d 100644 --- a/service/ssm/api_op_CreateResourceDataSync.go +++ b/service/ssm/api_op_CreateResourceDataSync.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) CreateResourceDataSync(ctx context.Context, params *CreateResou addawsAwsjson11_serdeOpCreateResourceDataSyncMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DeleteActivation.go b/service/ssm/api_op_DeleteActivation.go index bee07a043cf..66a27062d70 100644 --- a/service/ssm/api_op_DeleteActivation.go +++ b/service/ssm/api_op_DeleteActivation.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteActivation(ctx context.Context, params *DeleteActivationI addawsAwsjson11_serdeOpDeleteActivationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DeleteAssociation.go b/service/ssm/api_op_DeleteAssociation.go index 7cfdf44c666..90dc627b030 100644 --- a/service/ssm/api_op_DeleteAssociation.go +++ b/service/ssm/api_op_DeleteAssociation.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteAssociation(ctx context.Context, params *DeleteAssociatio addawsAwsjson11_serdeOpDeleteAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DeleteDocument.go b/service/ssm/api_op_DeleteDocument.go index e90f72c50ac..0cd2c09a471 100644 --- a/service/ssm/api_op_DeleteDocument.go +++ b/service/ssm/api_op_DeleteDocument.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeleteDocument(ctx context.Context, params *DeleteDocumentInput addawsAwsjson11_serdeOpDeleteDocumentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DeleteInventory.go b/service/ssm/api_op_DeleteInventory.go index 5833e3970ed..1338f70105e 100644 --- a/service/ssm/api_op_DeleteInventory.go +++ b/service/ssm/api_op_DeleteInventory.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DeleteInventory(ctx context.Context, params *DeleteInventoryInp addawsAwsjson11_serdeOpDeleteInventoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DeleteMaintenanceWindow.go b/service/ssm/api_op_DeleteMaintenanceWindow.go index fee44fb1329..4c06d18e76b 100644 --- a/service/ssm/api_op_DeleteMaintenanceWindow.go +++ b/service/ssm/api_op_DeleteMaintenanceWindow.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteMaintenanceWindow(ctx context.Context, params *DeleteMain addawsAwsjson11_serdeOpDeleteMaintenanceWindowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DeleteParameter.go b/service/ssm/api_op_DeleteParameter.go index 4505ecf97a0..66b5e334314 100644 --- a/service/ssm/api_op_DeleteParameter.go +++ b/service/ssm/api_op_DeleteParameter.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteParameter(ctx context.Context, params *DeleteParameterInp addawsAwsjson11_serdeOpDeleteParameterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DeleteParameters.go b/service/ssm/api_op_DeleteParameters.go index 4cf888e46d6..cc22d9aa2aa 100644 --- a/service/ssm/api_op_DeleteParameters.go +++ b/service/ssm/api_op_DeleteParameters.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteParameters(ctx context.Context, params *DeleteParametersI addawsAwsjson11_serdeOpDeleteParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DeletePatchBaseline.go b/service/ssm/api_op_DeletePatchBaseline.go index 234c58195d4..9111a39cb1a 100644 --- a/service/ssm/api_op_DeletePatchBaseline.go +++ b/service/ssm/api_op_DeletePatchBaseline.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeletePatchBaseline(ctx context.Context, params *DeletePatchBas addawsAwsjson11_serdeOpDeletePatchBaselineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DeleteResourceDataSync.go b/service/ssm/api_op_DeleteResourceDataSync.go index 74d5aea2987..15cc415c4d2 100644 --- a/service/ssm/api_op_DeleteResourceDataSync.go +++ b/service/ssm/api_op_DeleteResourceDataSync.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteResourceDataSync(ctx context.Context, params *DeleteResou addawsAwsjson11_serdeOpDeleteResourceDataSyncMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DeregisterManagedInstance.go b/service/ssm/api_op_DeregisterManagedInstance.go index 1968ce74d35..5200a177f31 100644 --- a/service/ssm/api_op_DeregisterManagedInstance.go +++ b/service/ssm/api_op_DeregisterManagedInstance.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeregisterManagedInstance(ctx context.Context, params *Deregist addawsAwsjson11_serdeOpDeregisterManagedInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DeregisterPatchBaselineForPatchGroup.go b/service/ssm/api_op_DeregisterPatchBaselineForPatchGroup.go index 06234ec4c96..18ca713ba7c 100644 --- a/service/ssm/api_op_DeregisterPatchBaselineForPatchGroup.go +++ b/service/ssm/api_op_DeregisterPatchBaselineForPatchGroup.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeregisterPatchBaselineForPatchGroup(ctx context.Context, param addawsAwsjson11_serdeOpDeregisterPatchBaselineForPatchGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DeregisterTargetFromMaintenanceWindow.go b/service/ssm/api_op_DeregisterTargetFromMaintenanceWindow.go index d15c91def87..1e56aa7d088 100644 --- a/service/ssm/api_op_DeregisterTargetFromMaintenanceWindow.go +++ b/service/ssm/api_op_DeregisterTargetFromMaintenanceWindow.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeregisterTargetFromMaintenanceWindow(ctx context.Context, para addawsAwsjson11_serdeOpDeregisterTargetFromMaintenanceWindowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DeregisterTaskFromMaintenanceWindow.go b/service/ssm/api_op_DeregisterTaskFromMaintenanceWindow.go index 02ba1811e0d..27600502f81 100644 --- a/service/ssm/api_op_DeregisterTaskFromMaintenanceWindow.go +++ b/service/ssm/api_op_DeregisterTaskFromMaintenanceWindow.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeregisterTaskFromMaintenanceWindow(ctx context.Context, params addawsAwsjson11_serdeOpDeregisterTaskFromMaintenanceWindowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeActivations.go b/service/ssm/api_op_DescribeActivations.go index c8992b2896c..ccdc07b024f 100644 --- a/service/ssm/api_op_DescribeActivations.go +++ b/service/ssm/api_op_DescribeActivations.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeActivations(ctx context.Context, params *DescribeActiva addawsAwsjson11_serdeOpDescribeActivationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeAssociation.go b/service/ssm/api_op_DescribeAssociation.go index 28c2de52e06..a9bc23eb560 100644 --- a/service/ssm/api_op_DescribeAssociation.go +++ b/service/ssm/api_op_DescribeAssociation.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeAssociation(ctx context.Context, params *DescribeAssoci addawsAwsjson11_serdeOpDescribeAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeAssociationExecutionTargets.go b/service/ssm/api_op_DescribeAssociationExecutionTargets.go index 778dd4da04c..925c3ba0cc5 100644 --- a/service/ssm/api_op_DescribeAssociationExecutionTargets.go +++ b/service/ssm/api_op_DescribeAssociationExecutionTargets.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAssociationExecutionTargets(ctx context.Context, params addawsAwsjson11_serdeOpDescribeAssociationExecutionTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeAssociationExecutions.go b/service/ssm/api_op_DescribeAssociationExecutions.go index 4e0ff4146d5..669ac7fd6a5 100644 --- a/service/ssm/api_op_DescribeAssociationExecutions.go +++ b/service/ssm/api_op_DescribeAssociationExecutions.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeAssociationExecutions(ctx context.Context, params *Desc addawsAwsjson11_serdeOpDescribeAssociationExecutionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeAutomationExecutions.go b/service/ssm/api_op_DescribeAutomationExecutions.go index d0a63e0b3ae..18a37028ad1 100644 --- a/service/ssm/api_op_DescribeAutomationExecutions.go +++ b/service/ssm/api_op_DescribeAutomationExecutions.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeAutomationExecutions(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribeAutomationExecutionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeAutomationStepExecutions.go b/service/ssm/api_op_DescribeAutomationStepExecutions.go index 2b0c3b7e422..7bd68c0bbfe 100644 --- a/service/ssm/api_op_DescribeAutomationStepExecutions.go +++ b/service/ssm/api_op_DescribeAutomationStepExecutions.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAutomationStepExecutions(ctx context.Context, params *D addawsAwsjson11_serdeOpDescribeAutomationStepExecutionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeAvailablePatches.go b/service/ssm/api_op_DescribeAvailablePatches.go index 3322968751d..69a1d00bf7a 100644 --- a/service/ssm/api_op_DescribeAvailablePatches.go +++ b/service/ssm/api_op_DescribeAvailablePatches.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeAvailablePatches(ctx context.Context, params *DescribeA addawsAwsjson11_serdeOpDescribeAvailablePatchesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeDocument.go b/service/ssm/api_op_DescribeDocument.go index ffa7e286ccb..4f723fe6f54 100644 --- a/service/ssm/api_op_DescribeDocument.go +++ b/service/ssm/api_op_DescribeDocument.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeDocument(ctx context.Context, params *DescribeDocumentI addawsAwsjson11_serdeOpDescribeDocumentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeDocumentPermission.go b/service/ssm/api_op_DescribeDocumentPermission.go index ef2fd1f3177..47bc000e414 100644 --- a/service/ssm/api_op_DescribeDocumentPermission.go +++ b/service/ssm/api_op_DescribeDocumentPermission.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeDocumentPermission(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeDocumentPermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeEffectiveInstanceAssociations.go b/service/ssm/api_op_DescribeEffectiveInstanceAssociations.go index f779818338d..16b5661172b 100644 --- a/service/ssm/api_op_DescribeEffectiveInstanceAssociations.go +++ b/service/ssm/api_op_DescribeEffectiveInstanceAssociations.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeEffectiveInstanceAssociations(ctx context.Context, para addawsAwsjson11_serdeOpDescribeEffectiveInstanceAssociationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeEffectivePatchesForPatchBaseline.go b/service/ssm/api_op_DescribeEffectivePatchesForPatchBaseline.go index cde5796410c..a6989ed7e8f 100644 --- a/service/ssm/api_op_DescribeEffectivePatchesForPatchBaseline.go +++ b/service/ssm/api_op_DescribeEffectivePatchesForPatchBaseline.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeEffectivePatchesForPatchBaseline(ctx context.Context, p addawsAwsjson11_serdeOpDescribeEffectivePatchesForPatchBaselineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeInstanceAssociationsStatus.go b/service/ssm/api_op_DescribeInstanceAssociationsStatus.go index 36b45fac077..9f3306eb8fc 100644 --- a/service/ssm/api_op_DescribeInstanceAssociationsStatus.go +++ b/service/ssm/api_op_DescribeInstanceAssociationsStatus.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeInstanceAssociationsStatus(ctx context.Context, params addawsAwsjson11_serdeOpDescribeInstanceAssociationsStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeInstanceInformation.go b/service/ssm/api_op_DescribeInstanceInformation.go index f154950306f..b29b04751a4 100644 --- a/service/ssm/api_op_DescribeInstanceInformation.go +++ b/service/ssm/api_op_DescribeInstanceInformation.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) DescribeInstanceInformation(ctx context.Context, params *Descri addawsAwsjson11_serdeOpDescribeInstanceInformationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeInstancePatchStates.go b/service/ssm/api_op_DescribeInstancePatchStates.go index 7ab280caee9..b478ca07d00 100644 --- a/service/ssm/api_op_DescribeInstancePatchStates.go +++ b/service/ssm/api_op_DescribeInstancePatchStates.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeInstancePatchStates(ctx context.Context, params *Descri addawsAwsjson11_serdeOpDescribeInstancePatchStatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeInstancePatchStatesForPatchGroup.go b/service/ssm/api_op_DescribeInstancePatchStatesForPatchGroup.go index d7ee15162f7..d88dfc4e5bc 100644 --- a/service/ssm/api_op_DescribeInstancePatchStatesForPatchGroup.go +++ b/service/ssm/api_op_DescribeInstancePatchStatesForPatchGroup.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeInstancePatchStatesForPatchGroup(ctx context.Context, p addawsAwsjson11_serdeOpDescribeInstancePatchStatesForPatchGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeInstancePatches.go b/service/ssm/api_op_DescribeInstancePatches.go index 0b470ce7981..368ccc3b961 100644 --- a/service/ssm/api_op_DescribeInstancePatches.go +++ b/service/ssm/api_op_DescribeInstancePatches.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeInstancePatches(ctx context.Context, params *DescribeIn addawsAwsjson11_serdeOpDescribeInstancePatchesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeInventoryDeletions.go b/service/ssm/api_op_DescribeInventoryDeletions.go index c90a1223c75..5fa776e9fca 100644 --- a/service/ssm/api_op_DescribeInventoryDeletions.go +++ b/service/ssm/api_op_DescribeInventoryDeletions.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeInventoryDeletions(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeInventoryDeletionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeMaintenanceWindowExecutionTaskInvocations.go b/service/ssm/api_op_DescribeMaintenanceWindowExecutionTaskInvocations.go index d8753a66454..447b3c6a0fb 100644 --- a/service/ssm/api_op_DescribeMaintenanceWindowExecutionTaskInvocations.go +++ b/service/ssm/api_op_DescribeMaintenanceWindowExecutionTaskInvocations.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeMaintenanceWindowExecutionTaskInvocations(ctx context.C addawsAwsjson11_serdeOpDescribeMaintenanceWindowExecutionTaskInvocationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeMaintenanceWindowExecutionTasks.go b/service/ssm/api_op_DescribeMaintenanceWindowExecutionTasks.go index b579c280e2e..33e80124d2d 100644 --- a/service/ssm/api_op_DescribeMaintenanceWindowExecutionTasks.go +++ b/service/ssm/api_op_DescribeMaintenanceWindowExecutionTasks.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeMaintenanceWindowExecutionTasks(ctx context.Context, pa addawsAwsjson11_serdeOpDescribeMaintenanceWindowExecutionTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeMaintenanceWindowExecutions.go b/service/ssm/api_op_DescribeMaintenanceWindowExecutions.go index 1e72dcedbcb..731f55c21ee 100644 --- a/service/ssm/api_op_DescribeMaintenanceWindowExecutions.go +++ b/service/ssm/api_op_DescribeMaintenanceWindowExecutions.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeMaintenanceWindowExecutions(ctx context.Context, params addawsAwsjson11_serdeOpDescribeMaintenanceWindowExecutionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeMaintenanceWindowSchedule.go b/service/ssm/api_op_DescribeMaintenanceWindowSchedule.go index 91c7e863d99..46fb423b8fa 100644 --- a/service/ssm/api_op_DescribeMaintenanceWindowSchedule.go +++ b/service/ssm/api_op_DescribeMaintenanceWindowSchedule.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeMaintenanceWindowSchedule(ctx context.Context, params * addawsAwsjson11_serdeOpDescribeMaintenanceWindowScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeMaintenanceWindowTargets.go b/service/ssm/api_op_DescribeMaintenanceWindowTargets.go index c13c4acb612..509389081cf 100644 --- a/service/ssm/api_op_DescribeMaintenanceWindowTargets.go +++ b/service/ssm/api_op_DescribeMaintenanceWindowTargets.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeMaintenanceWindowTargets(ctx context.Context, params *D addawsAwsjson11_serdeOpDescribeMaintenanceWindowTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeMaintenanceWindowTasks.go b/service/ssm/api_op_DescribeMaintenanceWindowTasks.go index bc735ad6d99..95949ba0a3e 100644 --- a/service/ssm/api_op_DescribeMaintenanceWindowTasks.go +++ b/service/ssm/api_op_DescribeMaintenanceWindowTasks.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeMaintenanceWindowTasks(ctx context.Context, params *Des addawsAwsjson11_serdeOpDescribeMaintenanceWindowTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeMaintenanceWindows.go b/service/ssm/api_op_DescribeMaintenanceWindows.go index 24873f60363..14a5a51e18d 100644 --- a/service/ssm/api_op_DescribeMaintenanceWindows.go +++ b/service/ssm/api_op_DescribeMaintenanceWindows.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeMaintenanceWindows(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeMaintenanceWindowsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeMaintenanceWindowsForTarget.go b/service/ssm/api_op_DescribeMaintenanceWindowsForTarget.go index f327cde3764..e01b6012b55 100644 --- a/service/ssm/api_op_DescribeMaintenanceWindowsForTarget.go +++ b/service/ssm/api_op_DescribeMaintenanceWindowsForTarget.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeMaintenanceWindowsForTarget(ctx context.Context, params addawsAwsjson11_serdeOpDescribeMaintenanceWindowsForTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeOpsItems.go b/service/ssm/api_op_DescribeOpsItems.go index 1ae16333a73..3d01646681a 100644 --- a/service/ssm/api_op_DescribeOpsItems.go +++ b/service/ssm/api_op_DescribeOpsItems.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) DescribeOpsItems(ctx context.Context, params *DescribeOpsItemsI addawsAwsjson11_serdeOpDescribeOpsItemsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeParameters.go b/service/ssm/api_op_DescribeParameters.go index 62f7f093df6..2bc7d45aa9e 100644 --- a/service/ssm/api_op_DescribeParameters.go +++ b/service/ssm/api_op_DescribeParameters.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) DescribeParameters(ctx context.Context, params *DescribeParamet addawsAwsjson11_serdeOpDescribeParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribePatchBaselines.go b/service/ssm/api_op_DescribePatchBaselines.go index 0b0d97d4cc8..009e0ed9fe6 100644 --- a/service/ssm/api_op_DescribePatchBaselines.go +++ b/service/ssm/api_op_DescribePatchBaselines.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribePatchBaselines(ctx context.Context, params *DescribePat addawsAwsjson11_serdeOpDescribePatchBaselinesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribePatchGroupState.go b/service/ssm/api_op_DescribePatchGroupState.go index ae7318f393c..0b539f1a15a 100644 --- a/service/ssm/api_op_DescribePatchGroupState.go +++ b/service/ssm/api_op_DescribePatchGroupState.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DescribePatchGroupState(ctx context.Context, params *DescribePa addawsAwsjson11_serdeOpDescribePatchGroupStateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribePatchGroups.go b/service/ssm/api_op_DescribePatchGroups.go index b38ff624579..e823b3b83ff 100644 --- a/service/ssm/api_op_DescribePatchGroups.go +++ b/service/ssm/api_op_DescribePatchGroups.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribePatchGroups(ctx context.Context, params *DescribePatchG addawsAwsjson11_serdeOpDescribePatchGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribePatchProperties.go b/service/ssm/api_op_DescribePatchProperties.go index 89137075488..752562123b0 100644 --- a/service/ssm/api_op_DescribePatchProperties.go +++ b/service/ssm/api_op_DescribePatchProperties.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) DescribePatchProperties(ctx context.Context, params *DescribePa addawsAwsjson11_serdeOpDescribePatchPropertiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_DescribeSessions.go b/service/ssm/api_op_DescribeSessions.go index 6f7b936d424..3fda85b594a 100644 --- a/service/ssm/api_op_DescribeSessions.go +++ b/service/ssm/api_op_DescribeSessions.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeSessions(ctx context.Context, params *DescribeSessionsI addawsAwsjson11_serdeOpDescribeSessionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetAutomationExecution.go b/service/ssm/api_op_GetAutomationExecution.go index 8704722b72f..70c2480e5cd 100644 --- a/service/ssm/api_op_GetAutomationExecution.go +++ b/service/ssm/api_op_GetAutomationExecution.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetAutomationExecution(ctx context.Context, params *GetAutomati addawsAwsjson11_serdeOpGetAutomationExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetCalendarState.go b/service/ssm/api_op_GetCalendarState.go index c2583cf3db6..debc06bd41f 100644 --- a/service/ssm/api_op_GetCalendarState.go +++ b/service/ssm/api_op_GetCalendarState.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) GetCalendarState(ctx context.Context, params *GetCalendarStateI addawsAwsjson11_serdeOpGetCalendarStateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetCommandInvocation.go b/service/ssm/api_op_GetCommandInvocation.go index 376d339de39..aac61bfb9bf 100644 --- a/service/ssm/api_op_GetCommandInvocation.go +++ b/service/ssm/api_op_GetCommandInvocation.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetCommandInvocation(ctx context.Context, params *GetCommandInv addawsAwsjson11_serdeOpGetCommandInvocationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetConnectionStatus.go b/service/ssm/api_op_GetConnectionStatus.go index aced1129c1f..2fce7be2029 100644 --- a/service/ssm/api_op_GetConnectionStatus.go +++ b/service/ssm/api_op_GetConnectionStatus.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetConnectionStatus(ctx context.Context, params *GetConnectionS addawsAwsjson11_serdeOpGetConnectionStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetDefaultPatchBaseline.go b/service/ssm/api_op_GetDefaultPatchBaseline.go index 400968249ea..9c76d268608 100644 --- a/service/ssm/api_op_GetDefaultPatchBaseline.go +++ b/service/ssm/api_op_GetDefaultPatchBaseline.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetDefaultPatchBaseline(ctx context.Context, params *GetDefault addawsAwsjson11_serdeOpGetDefaultPatchBaselineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetDeployablePatchSnapshotForInstance.go b/service/ssm/api_op_GetDeployablePatchSnapshotForInstance.go index 66e1efce0c7..51df91aa4ea 100644 --- a/service/ssm/api_op_GetDeployablePatchSnapshotForInstance.go +++ b/service/ssm/api_op_GetDeployablePatchSnapshotForInstance.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetDeployablePatchSnapshotForInstance(ctx context.Context, para addawsAwsjson11_serdeOpGetDeployablePatchSnapshotForInstanceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetDocument.go b/service/ssm/api_op_GetDocument.go index 6af7a8fa7fd..41660a6c439 100644 --- a/service/ssm/api_op_GetDocument.go +++ b/service/ssm/api_op_GetDocument.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDocument(ctx context.Context, params *GetDocumentInput, optF addawsAwsjson11_serdeOpGetDocumentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetInventory.go b/service/ssm/api_op_GetInventory.go index 8aab00ad722..914c07b0546 100644 --- a/service/ssm/api_op_GetInventory.go +++ b/service/ssm/api_op_GetInventory.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetInventory(ctx context.Context, params *GetInventoryInput, op addawsAwsjson11_serdeOpGetInventoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetInventorySchema.go b/service/ssm/api_op_GetInventorySchema.go index 52350516bc5..816cfc504ef 100644 --- a/service/ssm/api_op_GetInventorySchema.go +++ b/service/ssm/api_op_GetInventorySchema.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetInventorySchema(ctx context.Context, params *GetInventorySch addawsAwsjson11_serdeOpGetInventorySchemaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetMaintenanceWindow.go b/service/ssm/api_op_GetMaintenanceWindow.go index 188b6c1164f..898ebeba917 100644 --- a/service/ssm/api_op_GetMaintenanceWindow.go +++ b/service/ssm/api_op_GetMaintenanceWindow.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetMaintenanceWindow(ctx context.Context, params *GetMaintenanc addawsAwsjson11_serdeOpGetMaintenanceWindowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetMaintenanceWindowExecution.go b/service/ssm/api_op_GetMaintenanceWindowExecution.go index e40635222a5..7134b572f41 100644 --- a/service/ssm/api_op_GetMaintenanceWindowExecution.go +++ b/service/ssm/api_op_GetMaintenanceWindowExecution.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetMaintenanceWindowExecution(ctx context.Context, params *GetM addawsAwsjson11_serdeOpGetMaintenanceWindowExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetMaintenanceWindowExecutionTask.go b/service/ssm/api_op_GetMaintenanceWindowExecutionTask.go index 5623e08d9d4..652508036ba 100644 --- a/service/ssm/api_op_GetMaintenanceWindowExecutionTask.go +++ b/service/ssm/api_op_GetMaintenanceWindowExecutionTask.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetMaintenanceWindowExecutionTask(ctx context.Context, params * addawsAwsjson11_serdeOpGetMaintenanceWindowExecutionTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetMaintenanceWindowExecutionTaskInvocation.go b/service/ssm/api_op_GetMaintenanceWindowExecutionTaskInvocation.go index 280a5b48b63..1848f939d74 100644 --- a/service/ssm/api_op_GetMaintenanceWindowExecutionTaskInvocation.go +++ b/service/ssm/api_op_GetMaintenanceWindowExecutionTaskInvocation.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetMaintenanceWindowExecutionTaskInvocation(ctx context.Context addawsAwsjson11_serdeOpGetMaintenanceWindowExecutionTaskInvocationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetMaintenanceWindowTask.go b/service/ssm/api_op_GetMaintenanceWindowTask.go index e4c487aa86d..16622a13213 100644 --- a/service/ssm/api_op_GetMaintenanceWindowTask.go +++ b/service/ssm/api_op_GetMaintenanceWindowTask.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetMaintenanceWindowTask(ctx context.Context, params *GetMainte addawsAwsjson11_serdeOpGetMaintenanceWindowTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetOpsItem.go b/service/ssm/api_op_GetOpsItem.go index fdc5f8ec641..16283b5431d 100644 --- a/service/ssm/api_op_GetOpsItem.go +++ b/service/ssm/api_op_GetOpsItem.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) GetOpsItem(ctx context.Context, params *GetOpsItemInput, optFns addawsAwsjson11_serdeOpGetOpsItemMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetOpsSummary.go b/service/ssm/api_op_GetOpsSummary.go index 76994450cb2..c56a266cee5 100644 --- a/service/ssm/api_op_GetOpsSummary.go +++ b/service/ssm/api_op_GetOpsSummary.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetOpsSummary(ctx context.Context, params *GetOpsSummaryInput, addawsAwsjson11_serdeOpGetOpsSummaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetParameter.go b/service/ssm/api_op_GetParameter.go index 7e3aabbb98e..17c480b8d3c 100644 --- a/service/ssm/api_op_GetParameter.go +++ b/service/ssm/api_op_GetParameter.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetParameter(ctx context.Context, params *GetParameterInput, op addawsAwsjson11_serdeOpGetParameterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetParameterHistory.go b/service/ssm/api_op_GetParameterHistory.go index 3e16bdc7a16..d976f7beefb 100644 --- a/service/ssm/api_op_GetParameterHistory.go +++ b/service/ssm/api_op_GetParameterHistory.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetParameterHistory(ctx context.Context, params *GetParameterHi addawsAwsjson11_serdeOpGetParameterHistoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetParameters.go b/service/ssm/api_op_GetParameters.go index c0386dcb4c7..613a5598d20 100644 --- a/service/ssm/api_op_GetParameters.go +++ b/service/ssm/api_op_GetParameters.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetParameters(ctx context.Context, params *GetParametersInput, addawsAwsjson11_serdeOpGetParametersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetParametersByPath.go b/service/ssm/api_op_GetParametersByPath.go index a61399c4bb1..311b21f731c 100644 --- a/service/ssm/api_op_GetParametersByPath.go +++ b/service/ssm/api_op_GetParametersByPath.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetParametersByPath(ctx context.Context, params *GetParametersB addawsAwsjson11_serdeOpGetParametersByPathMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetPatchBaseline.go b/service/ssm/api_op_GetPatchBaseline.go index b2ea8aca59d..9dc5193c72d 100644 --- a/service/ssm/api_op_GetPatchBaseline.go +++ b/service/ssm/api_op_GetPatchBaseline.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetPatchBaseline(ctx context.Context, params *GetPatchBaselineI addawsAwsjson11_serdeOpGetPatchBaselineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetPatchBaselineForPatchGroup.go b/service/ssm/api_op_GetPatchBaselineForPatchGroup.go index 243ad5982e2..d214548636c 100644 --- a/service/ssm/api_op_GetPatchBaselineForPatchGroup.go +++ b/service/ssm/api_op_GetPatchBaselineForPatchGroup.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetPatchBaselineForPatchGroup(ctx context.Context, params *GetP addawsAwsjson11_serdeOpGetPatchBaselineForPatchGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_GetServiceSetting.go b/service/ssm/api_op_GetServiceSetting.go index 77873f6a601..8c39b590735 100644 --- a/service/ssm/api_op_GetServiceSetting.go +++ b/service/ssm/api_op_GetServiceSetting.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) GetServiceSetting(ctx context.Context, params *GetServiceSettin addawsAwsjson11_serdeOpGetServiceSettingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_LabelParameterVersion.go b/service/ssm/api_op_LabelParameterVersion.go index 55aa01b0a2e..5d61c4ef7e3 100644 --- a/service/ssm/api_op_LabelParameterVersion.go +++ b/service/ssm/api_op_LabelParameterVersion.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -55,9 +54,9 @@ func (c *Client) LabelParameterVersion(ctx context.Context, params *LabelParamet addawsAwsjson11_serdeOpLabelParameterVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_ListAssociationVersions.go b/service/ssm/api_op_ListAssociationVersions.go index 71dddeb35ca..c61c6b5ffd7 100644 --- a/service/ssm/api_op_ListAssociationVersions.go +++ b/service/ssm/api_op_ListAssociationVersions.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListAssociationVersions(ctx context.Context, params *ListAssoci addawsAwsjson11_serdeOpListAssociationVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_ListAssociations.go b/service/ssm/api_op_ListAssociations.go index 3b08d57485b..ad09b8b05e2 100644 --- a/service/ssm/api_op_ListAssociations.go +++ b/service/ssm/api_op_ListAssociations.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListAssociations(ctx context.Context, params *ListAssociationsI addawsAwsjson11_serdeOpListAssociationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_ListCommandInvocations.go b/service/ssm/api_op_ListCommandInvocations.go index 183e53e151d..d73b4e396dd 100644 --- a/service/ssm/api_op_ListCommandInvocations.go +++ b/service/ssm/api_op_ListCommandInvocations.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListCommandInvocations(ctx context.Context, params *ListCommand addawsAwsjson11_serdeOpListCommandInvocationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_ListCommands.go b/service/ssm/api_op_ListCommands.go index 3439392d241..295a5b2b334 100644 --- a/service/ssm/api_op_ListCommands.go +++ b/service/ssm/api_op_ListCommands.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListCommands(ctx context.Context, params *ListCommandsInput, op addawsAwsjson11_serdeOpListCommandsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_ListComplianceItems.go b/service/ssm/api_op_ListComplianceItems.go index 72cad7d11b8..3b490879b0e 100644 --- a/service/ssm/api_op_ListComplianceItems.go +++ b/service/ssm/api_op_ListComplianceItems.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListComplianceItems(ctx context.Context, params *ListCompliance addawsAwsjson11_serdeOpListComplianceItemsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_ListComplianceSummaries.go b/service/ssm/api_op_ListComplianceSummaries.go index 0aa1f940ce7..f17add22b8c 100644 --- a/service/ssm/api_op_ListComplianceSummaries.go +++ b/service/ssm/api_op_ListComplianceSummaries.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ListComplianceSummaries(ctx context.Context, params *ListCompli addawsAwsjson11_serdeOpListComplianceSummariesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_ListDocumentVersions.go b/service/ssm/api_op_ListDocumentVersions.go index 9d692c62eda..ca8a25fdd63 100644 --- a/service/ssm/api_op_ListDocumentVersions.go +++ b/service/ssm/api_op_ListDocumentVersions.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDocumentVersions(ctx context.Context, params *ListDocumentV addawsAwsjson11_serdeOpListDocumentVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_ListDocuments.go b/service/ssm/api_op_ListDocuments.go index 93208d77241..7ad01250870 100644 --- a/service/ssm/api_op_ListDocuments.go +++ b/service/ssm/api_op_ListDocuments.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListDocuments(ctx context.Context, params *ListDocumentsInput, addawsAwsjson11_serdeOpListDocumentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_ListInventoryEntries.go b/service/ssm/api_op_ListInventoryEntries.go index 4e87a734503..3344c58402c 100644 --- a/service/ssm/api_op_ListInventoryEntries.go +++ b/service/ssm/api_op_ListInventoryEntries.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListInventoryEntries(ctx context.Context, params *ListInventory addawsAwsjson11_serdeOpListInventoryEntriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_ListResourceComplianceSummaries.go b/service/ssm/api_op_ListResourceComplianceSummaries.go index 61c911825ec..0859db2cef1 100644 --- a/service/ssm/api_op_ListResourceComplianceSummaries.go +++ b/service/ssm/api_op_ListResourceComplianceSummaries.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListResourceComplianceSummaries(ctx context.Context, params *Li addawsAwsjson11_serdeOpListResourceComplianceSummariesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_ListResourceDataSync.go b/service/ssm/api_op_ListResourceDataSync.go index c14fac1791e..82ea7ca5831 100644 --- a/service/ssm/api_op_ListResourceDataSync.go +++ b/service/ssm/api_op_ListResourceDataSync.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) ListResourceDataSync(ctx context.Context, params *ListResourceD addawsAwsjson11_serdeOpListResourceDataSyncMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_ListTagsForResource.go b/service/ssm/api_op_ListTagsForResource.go index 507eb5d3ef1..3d827318f3c 100644 --- a/service/ssm/api_op_ListTagsForResource.go +++ b/service/ssm/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_ModifyDocumentPermission.go b/service/ssm/api_op_ModifyDocumentPermission.go index 6eff3699641..0070c9dbcfa 100644 --- a/service/ssm/api_op_ModifyDocumentPermission.go +++ b/service/ssm/api_op_ModifyDocumentPermission.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ModifyDocumentPermission(ctx context.Context, params *ModifyDoc addawsAwsjson11_serdeOpModifyDocumentPermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_PutComplianceItems.go b/service/ssm/api_op_PutComplianceItems.go index 66d1a1b7f00..c32975b648c 100644 --- a/service/ssm/api_op_PutComplianceItems.go +++ b/service/ssm/api_op_PutComplianceItems.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -72,9 +71,9 @@ func (c *Client) PutComplianceItems(ctx context.Context, params *PutComplianceIt addawsAwsjson11_serdeOpPutComplianceItemsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_PutInventory.go b/service/ssm/api_op_PutInventory.go index 8800e1446fa..59309bbb795 100644 --- a/service/ssm/api_op_PutInventory.go +++ b/service/ssm/api_op_PutInventory.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) PutInventory(ctx context.Context, params *PutInventoryInput, op addawsAwsjson11_serdeOpPutInventoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_PutParameter.go b/service/ssm/api_op_PutParameter.go index 8a91b43ba3b..87d2a48725f 100644 --- a/service/ssm/api_op_PutParameter.go +++ b/service/ssm/api_op_PutParameter.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutParameter(ctx context.Context, params *PutParameterInput, op addawsAwsjson11_serdeOpPutParameterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_RegisterDefaultPatchBaseline.go b/service/ssm/api_op_RegisterDefaultPatchBaseline.go index d702e6dfde0..5206a52678d 100644 --- a/service/ssm/api_op_RegisterDefaultPatchBaseline.go +++ b/service/ssm/api_op_RegisterDefaultPatchBaseline.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) RegisterDefaultPatchBaseline(ctx context.Context, params *Regis addawsAwsjson11_serdeOpRegisterDefaultPatchBaselineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_RegisterPatchBaselineForPatchGroup.go b/service/ssm/api_op_RegisterPatchBaselineForPatchGroup.go index 34ba831dead..a87066cca1c 100644 --- a/service/ssm/api_op_RegisterPatchBaselineForPatchGroup.go +++ b/service/ssm/api_op_RegisterPatchBaselineForPatchGroup.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RegisterPatchBaselineForPatchGroup(ctx context.Context, params addawsAwsjson11_serdeOpRegisterPatchBaselineForPatchGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_RegisterTargetWithMaintenanceWindow.go b/service/ssm/api_op_RegisterTargetWithMaintenanceWindow.go index 6656bd71eea..9537321e25e 100644 --- a/service/ssm/api_op_RegisterTargetWithMaintenanceWindow.go +++ b/service/ssm/api_op_RegisterTargetWithMaintenanceWindow.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) RegisterTargetWithMaintenanceWindow(ctx context.Context, params addawsAwsjson11_serdeOpRegisterTargetWithMaintenanceWindowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_RegisterTaskWithMaintenanceWindow.go b/service/ssm/api_op_RegisterTaskWithMaintenanceWindow.go index 1449cc32d51..1ef307a40d6 100644 --- a/service/ssm/api_op_RegisterTaskWithMaintenanceWindow.go +++ b/service/ssm/api_op_RegisterTaskWithMaintenanceWindow.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) RegisterTaskWithMaintenanceWindow(ctx context.Context, params * addawsAwsjson11_serdeOpRegisterTaskWithMaintenanceWindowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_RemoveTagsFromResource.go b/service/ssm/api_op_RemoveTagsFromResource.go index 844364ef2b1..f7472b781e6 100644 --- a/service/ssm/api_op_RemoveTagsFromResource.go +++ b/service/ssm/api_op_RemoveTagsFromResource.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RemoveTagsFromResource(ctx context.Context, params *RemoveTagsF addawsAwsjson11_serdeOpRemoveTagsFromResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_ResetServiceSetting.go b/service/ssm/api_op_ResetServiceSetting.go index 209b3d48ad5..dd66fc116c3 100644 --- a/service/ssm/api_op_ResetServiceSetting.go +++ b/service/ssm/api_op_ResetServiceSetting.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) ResetServiceSetting(ctx context.Context, params *ResetServiceSe addawsAwsjson11_serdeOpResetServiceSettingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_ResumeSession.go b/service/ssm/api_op_ResumeSession.go index e60ede045f1..83c49c6a618 100644 --- a/service/ssm/api_op_ResumeSession.go +++ b/service/ssm/api_op_ResumeSession.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) ResumeSession(ctx context.Context, params *ResumeSessionInput, addawsAwsjson11_serdeOpResumeSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_SendAutomationSignal.go b/service/ssm/api_op_SendAutomationSignal.go index 597bfa51a2f..2aec44d57de 100644 --- a/service/ssm/api_op_SendAutomationSignal.go +++ b/service/ssm/api_op_SendAutomationSignal.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) SendAutomationSignal(ctx context.Context, params *SendAutomatio addawsAwsjson11_serdeOpSendAutomationSignalMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_SendCommand.go b/service/ssm/api_op_SendCommand.go index c84ea59b919..c9b9080c719 100644 --- a/service/ssm/api_op_SendCommand.go +++ b/service/ssm/api_op_SendCommand.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) SendCommand(ctx context.Context, params *SendCommandInput, optF addawsAwsjson11_serdeOpSendCommandMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_StartAssociationsOnce.go b/service/ssm/api_op_StartAssociationsOnce.go index e474c0d139d..eaead40f2a8 100644 --- a/service/ssm/api_op_StartAssociationsOnce.go +++ b/service/ssm/api_op_StartAssociationsOnce.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) StartAssociationsOnce(ctx context.Context, params *StartAssocia addawsAwsjson11_serdeOpStartAssociationsOnceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_StartAutomationExecution.go b/service/ssm/api_op_StartAutomationExecution.go index 95266c53626..33d808bc65b 100644 --- a/service/ssm/api_op_StartAutomationExecution.go +++ b/service/ssm/api_op_StartAutomationExecution.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StartAutomationExecution(ctx context.Context, params *StartAuto addawsAwsjson11_serdeOpStartAutomationExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_StartSession.go b/service/ssm/api_op_StartSession.go index 9dfcaa88748..73d631ec8de 100644 --- a/service/ssm/api_op_StartSession.go +++ b/service/ssm/api_op_StartSession.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) StartSession(ctx context.Context, params *StartSessionInput, op addawsAwsjson11_serdeOpStartSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_StopAutomationExecution.go b/service/ssm/api_op_StopAutomationExecution.go index 9c1f14ee1cc..cbabdff2969 100644 --- a/service/ssm/api_op_StopAutomationExecution.go +++ b/service/ssm/api_op_StopAutomationExecution.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StopAutomationExecution(ctx context.Context, params *StopAutoma addawsAwsjson11_serdeOpStopAutomationExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_TerminateSession.go b/service/ssm/api_op_TerminateSession.go index c8f6da14a24..514c54395fc 100644 --- a/service/ssm/api_op_TerminateSession.go +++ b/service/ssm/api_op_TerminateSession.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) TerminateSession(ctx context.Context, params *TerminateSessionI addawsAwsjson11_serdeOpTerminateSessionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_UpdateAssociation.go b/service/ssm/api_op_UpdateAssociation.go index ad50edd559b..0cf3ffb19b7 100644 --- a/service/ssm/api_op_UpdateAssociation.go +++ b/service/ssm/api_op_UpdateAssociation.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) UpdateAssociation(ctx context.Context, params *UpdateAssociatio addawsAwsjson11_serdeOpUpdateAssociationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_UpdateAssociationStatus.go b/service/ssm/api_op_UpdateAssociationStatus.go index 1ae5f5a8f34..183cd141346 100644 --- a/service/ssm/api_op_UpdateAssociationStatus.go +++ b/service/ssm/api_op_UpdateAssociationStatus.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateAssociationStatus(ctx context.Context, params *UpdateAsso addawsAwsjson11_serdeOpUpdateAssociationStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_UpdateDocument.go b/service/ssm/api_op_UpdateDocument.go index 361958538ae..f00628adf50 100644 --- a/service/ssm/api_op_UpdateDocument.go +++ b/service/ssm/api_op_UpdateDocument.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDocument(ctx context.Context, params *UpdateDocumentInput addawsAwsjson11_serdeOpUpdateDocumentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_UpdateDocumentDefaultVersion.go b/service/ssm/api_op_UpdateDocumentDefaultVersion.go index 99a1dd71d31..3ceee4f3aee 100644 --- a/service/ssm/api_op_UpdateDocumentDefaultVersion.go +++ b/service/ssm/api_op_UpdateDocumentDefaultVersion.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateDocumentDefaultVersion(ctx context.Context, params *Updat addawsAwsjson11_serdeOpUpdateDocumentDefaultVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_UpdateMaintenanceWindow.go b/service/ssm/api_op_UpdateMaintenanceWindow.go index dbd1c8ea0e8..7a364e329c2 100644 --- a/service/ssm/api_op_UpdateMaintenanceWindow.go +++ b/service/ssm/api_op_UpdateMaintenanceWindow.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) UpdateMaintenanceWindow(ctx context.Context, params *UpdateMain addawsAwsjson11_serdeOpUpdateMaintenanceWindowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_UpdateMaintenanceWindowTarget.go b/service/ssm/api_op_UpdateMaintenanceWindowTarget.go index 685598c89b8..89e1d73a294 100644 --- a/service/ssm/api_op_UpdateMaintenanceWindowTarget.go +++ b/service/ssm/api_op_UpdateMaintenanceWindowTarget.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) UpdateMaintenanceWindowTarget(ctx context.Context, params *Upda addawsAwsjson11_serdeOpUpdateMaintenanceWindowTargetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_UpdateMaintenanceWindowTask.go b/service/ssm/api_op_UpdateMaintenanceWindowTask.go index 78b917d8bcc..3b77f6f9c98 100644 --- a/service/ssm/api_op_UpdateMaintenanceWindowTask.go +++ b/service/ssm/api_op_UpdateMaintenanceWindowTask.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) UpdateMaintenanceWindowTask(ctx context.Context, params *Update addawsAwsjson11_serdeOpUpdateMaintenanceWindowTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_UpdateManagedInstanceRole.go b/service/ssm/api_op_UpdateManagedInstanceRole.go index 765e42b7040..2edb7d964a3 100644 --- a/service/ssm/api_op_UpdateManagedInstanceRole.go +++ b/service/ssm/api_op_UpdateManagedInstanceRole.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) UpdateManagedInstanceRole(ctx context.Context, params *UpdateMa addawsAwsjson11_serdeOpUpdateManagedInstanceRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_UpdateOpsItem.go b/service/ssm/api_op_UpdateOpsItem.go index 8a1d858657f..e1c2e6302e0 100644 --- a/service/ssm/api_op_UpdateOpsItem.go +++ b/service/ssm/api_op_UpdateOpsItem.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) UpdateOpsItem(ctx context.Context, params *UpdateOpsItemInput, addawsAwsjson11_serdeOpUpdateOpsItemMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_UpdatePatchBaseline.go b/service/ssm/api_op_UpdatePatchBaseline.go index fb78b76702e..0e089195b79 100644 --- a/service/ssm/api_op_UpdatePatchBaseline.go +++ b/service/ssm/api_op_UpdatePatchBaseline.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdatePatchBaseline(ctx context.Context, params *UpdatePatchBas addawsAwsjson11_serdeOpUpdatePatchBaselineMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_UpdateResourceDataSync.go b/service/ssm/api_op_UpdateResourceDataSync.go index 1694633e741..068033cb82a 100644 --- a/service/ssm/api_op_UpdateResourceDataSync.go +++ b/service/ssm/api_op_UpdateResourceDataSync.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/ssm/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) UpdateResourceDataSync(ctx context.Context, params *UpdateResou addawsAwsjson11_serdeOpUpdateResourceDataSyncMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/api_op_UpdateServiceSetting.go b/service/ssm/api_op_UpdateServiceSetting.go index 2966cedf3b1..35742fdae97 100644 --- a/service/ssm/api_op_UpdateServiceSetting.go +++ b/service/ssm/api_op_UpdateServiceSetting.go @@ -5,7 +5,6 @@ package ssm import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -34,9 +33,9 @@ func (c *Client) UpdateServiceSetting(ctx context.Context, params *UpdateService addawsAwsjson11_serdeOpUpdateServiceSettingMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/ssm/endpoints.go b/service/ssm/endpoints.go index 6948bb5b184..214eb8b13c3 100644 --- a/service/ssm/endpoints.go +++ b/service/ssm/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/sso/api_client.go b/service/sso/api_client.go index a16b7e0286c..7f3a4fa02d1 100644 --- a/service/sso/api_client.go +++ b/service/sso/api_client.go @@ -91,30 +91,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -180,6 +156,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/sso/api_op_GetRoleCredentials.go b/service/sso/api_op_GetRoleCredentials.go index 2bc9ca0e1b0..f137795b596 100644 --- a/service/sso/api_op_GetRoleCredentials.go +++ b/service/sso/api_op_GetRoleCredentials.go @@ -5,7 +5,6 @@ package sso import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/sso/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,8 +22,8 @@ func (c *Client) GetRoleCredentials(ctx context.Context, params *GetRoleCredenti addawsRestjson1_serdeOpGetRoleCredentialsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/sso/api_op_ListAccountRoles.go b/service/sso/api_op_ListAccountRoles.go index cf2cc8a8a17..ece4ab65d70 100644 --- a/service/sso/api_op_ListAccountRoles.go +++ b/service/sso/api_op_ListAccountRoles.go @@ -5,7 +5,6 @@ package sso import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/sso/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,8 +21,8 @@ func (c *Client) ListAccountRoles(ctx context.Context, params *ListAccountRolesI addawsRestjson1_serdeOpListAccountRolesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/sso/api_op_ListAccounts.go b/service/sso/api_op_ListAccounts.go index a8dad16c3c8..80236439a40 100644 --- a/service/sso/api_op_ListAccounts.go +++ b/service/sso/api_op_ListAccounts.go @@ -5,7 +5,6 @@ package sso import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/sso/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,8 +24,8 @@ func (c *Client) ListAccounts(ctx context.Context, params *ListAccountsInput, op addawsRestjson1_serdeOpListAccountsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/sso/api_op_Logout.go b/service/sso/api_op_Logout.go index 096567b6bf9..d96ea9c8396 100644 --- a/service/sso/api_op_Logout.go +++ b/service/sso/api_op_Logout.go @@ -5,7 +5,6 @@ package sso import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -21,8 +20,8 @@ func (c *Client) Logout(ctx context.Context, params *LogoutInput, optFns ...func addawsRestjson1_serdeOpLogoutMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/sso/endpoints.go b/service/sso/endpoints.go index 85911f79d98..086403d7b4b 100644 --- a/service/sso/endpoints.go +++ b/service/sso/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/ssooidc/api_client.go b/service/ssooidc/api_client.go index fa5852b0166..bf90229c8d0 100644 --- a/service/ssooidc/api_client.go +++ b/service/ssooidc/api_client.go @@ -94,30 +94,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -183,6 +159,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/ssooidc/api_op_CreateToken.go b/service/ssooidc/api_op_CreateToken.go index ac969e20a41..01125562d88 100644 --- a/service/ssooidc/api_op_CreateToken.go +++ b/service/ssooidc/api_op_CreateToken.go @@ -5,7 +5,6 @@ package ssooidc import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) CreateToken(ctx context.Context, params *CreateTokenInput, optF addawsRestjson1_serdeOpCreateTokenMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/ssooidc/api_op_RegisterClient.go b/service/ssooidc/api_op_RegisterClient.go index eb2ce3cb22b..d6d942cde03 100644 --- a/service/ssooidc/api_op_RegisterClient.go +++ b/service/ssooidc/api_op_RegisterClient.go @@ -5,7 +5,6 @@ package ssooidc import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -23,8 +22,8 @@ func (c *Client) RegisterClient(ctx context.Context, params *RegisterClientInput addawsRestjson1_serdeOpRegisterClientMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/ssooidc/api_op_StartDeviceAuthorization.go b/service/ssooidc/api_op_StartDeviceAuthorization.go index df3f086d02a..2bd21f6b3bb 100644 --- a/service/ssooidc/api_op_StartDeviceAuthorization.go +++ b/service/ssooidc/api_op_StartDeviceAuthorization.go @@ -5,7 +5,6 @@ package ssooidc import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" smithyhttp "github.com/awslabs/smithy-go/transport/http" @@ -22,8 +21,8 @@ func (c *Client) StartDeviceAuthorization(ctx context.Context, params *StartDevi addawsRestjson1_serdeOpStartDeviceAuthorizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/ssooidc/endpoints.go b/service/ssooidc/endpoints.go index caae2804289..73664010147 100644 --- a/service/ssooidc/endpoints.go +++ b/service/ssooidc/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/storagegateway/api_client.go b/service/storagegateway/api_client.go index 2de3d4e687e..18c73cdcc2c 100644 --- a/service/storagegateway/api_client.go +++ b/service/storagegateway/api_client.go @@ -120,30 +120,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -209,6 +185,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/storagegateway/api_op_ActivateGateway.go b/service/storagegateway/api_op_ActivateGateway.go index 7ea2c9805d0..dfc3fbd1c4f 100644 --- a/service/storagegateway/api_op_ActivateGateway.go +++ b/service/storagegateway/api_op_ActivateGateway.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ActivateGateway(ctx context.Context, params *ActivateGatewayInp addawsAwsjson11_serdeOpActivateGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_AddCache.go b/service/storagegateway/api_op_AddCache.go index daa74aefc14..e6ed84a8709 100644 --- a/service/storagegateway/api_op_AddCache.go +++ b/service/storagegateway/api_op_AddCache.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) AddCache(ctx context.Context, params *AddCacheInput, optFns ... addawsAwsjson11_serdeOpAddCacheMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_AddTagsToResource.go b/service/storagegateway/api_op_AddTagsToResource.go index 50164ce6fa2..e4a86376a6b 100644 --- a/service/storagegateway/api_op_AddTagsToResource.go +++ b/service/storagegateway/api_op_AddTagsToResource.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) AddTagsToResource(ctx context.Context, params *AddTagsToResourc addawsAwsjson11_serdeOpAddTagsToResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_AddUploadBuffer.go b/service/storagegateway/api_op_AddUploadBuffer.go index b4ade9012da..74540aac977 100644 --- a/service/storagegateway/api_op_AddUploadBuffer.go +++ b/service/storagegateway/api_op_AddUploadBuffer.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) AddUploadBuffer(ctx context.Context, params *AddUploadBufferInp addawsAwsjson11_serdeOpAddUploadBufferMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_AddWorkingStorage.go b/service/storagegateway/api_op_AddWorkingStorage.go index bafd51162f8..0aefcfa82fc 100644 --- a/service/storagegateway/api_op_AddWorkingStorage.go +++ b/service/storagegateway/api_op_AddWorkingStorage.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) AddWorkingStorage(ctx context.Context, params *AddWorkingStorag addawsAwsjson11_serdeOpAddWorkingStorageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_AssignTapePool.go b/service/storagegateway/api_op_AssignTapePool.go index 0e02e47b084..00629aae682 100644 --- a/service/storagegateway/api_op_AssignTapePool.go +++ b/service/storagegateway/api_op_AssignTapePool.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) AssignTapePool(ctx context.Context, params *AssignTapePoolInput addawsAwsjson11_serdeOpAssignTapePoolMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_AttachVolume.go b/service/storagegateway/api_op_AttachVolume.go index 8fbc1f6feb7..56e5d79a04f 100644 --- a/service/storagegateway/api_op_AttachVolume.go +++ b/service/storagegateway/api_op_AttachVolume.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) AttachVolume(ctx context.Context, params *AttachVolumeInput, op addawsAwsjson11_serdeOpAttachVolumeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_CancelArchival.go b/service/storagegateway/api_op_CancelArchival.go index 192257dc92c..b47e38c990a 100644 --- a/service/storagegateway/api_op_CancelArchival.go +++ b/service/storagegateway/api_op_CancelArchival.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CancelArchival(ctx context.Context, params *CancelArchivalInput addawsAwsjson11_serdeOpCancelArchivalMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_CancelRetrieval.go b/service/storagegateway/api_op_CancelRetrieval.go index 536d9adb523..8c71d9e0ab2 100644 --- a/service/storagegateway/api_op_CancelRetrieval.go +++ b/service/storagegateway/api_op_CancelRetrieval.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CancelRetrieval(ctx context.Context, params *CancelRetrievalInp addawsAwsjson11_serdeOpCancelRetrievalMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_CreateCachediSCSIVolume.go b/service/storagegateway/api_op_CreateCachediSCSIVolume.go index fd9c7131e0b..8ff59e48624 100644 --- a/service/storagegateway/api_op_CreateCachediSCSIVolume.go +++ b/service/storagegateway/api_op_CreateCachediSCSIVolume.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) CreateCachediSCSIVolume(ctx context.Context, params *CreateCach addawsAwsjson11_serdeOpCreateCachediSCSIVolumeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_CreateNFSFileShare.go b/service/storagegateway/api_op_CreateNFSFileShare.go index 89ad9ddafa7..f9c0d479481 100644 --- a/service/storagegateway/api_op_CreateNFSFileShare.go +++ b/service/storagegateway/api_op_CreateNFSFileShare.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) CreateNFSFileShare(ctx context.Context, params *CreateNFSFileSh addawsAwsjson11_serdeOpCreateNFSFileShareMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_CreateSMBFileShare.go b/service/storagegateway/api_op_CreateSMBFileShare.go index 783fc66ee86..63047b9a52c 100644 --- a/service/storagegateway/api_op_CreateSMBFileShare.go +++ b/service/storagegateway/api_op_CreateSMBFileShare.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) CreateSMBFileShare(ctx context.Context, params *CreateSMBFileSh addawsAwsjson11_serdeOpCreateSMBFileShareMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_CreateSnapshot.go b/service/storagegateway/api_op_CreateSnapshot.go index 1105a5d2377..ebdd130896a 100644 --- a/service/storagegateway/api_op_CreateSnapshot.go +++ b/service/storagegateway/api_op_CreateSnapshot.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) CreateSnapshot(ctx context.Context, params *CreateSnapshotInput addawsAwsjson11_serdeOpCreateSnapshotMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_CreateSnapshotFromVolumeRecoveryPoint.go b/service/storagegateway/api_op_CreateSnapshotFromVolumeRecoveryPoint.go index 949d2d16465..c2afd67d85f 100644 --- a/service/storagegateway/api_op_CreateSnapshotFromVolumeRecoveryPoint.go +++ b/service/storagegateway/api_op_CreateSnapshotFromVolumeRecoveryPoint.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) CreateSnapshotFromVolumeRecoveryPoint(ctx context.Context, para addawsAwsjson11_serdeOpCreateSnapshotFromVolumeRecoveryPointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_CreateStorediSCSIVolume.go b/service/storagegateway/api_op_CreateStorediSCSIVolume.go index 4806eabb2b8..f7a6328db04 100644 --- a/service/storagegateway/api_op_CreateStorediSCSIVolume.go +++ b/service/storagegateway/api_op_CreateStorediSCSIVolume.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) CreateStorediSCSIVolume(ctx context.Context, params *CreateStor addawsAwsjson11_serdeOpCreateStorediSCSIVolumeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_CreateTapeWithBarcode.go b/service/storagegateway/api_op_CreateTapeWithBarcode.go index 5b3b0b2cc5f..a82628a90d5 100644 --- a/service/storagegateway/api_op_CreateTapeWithBarcode.go +++ b/service/storagegateway/api_op_CreateTapeWithBarcode.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) CreateTapeWithBarcode(ctx context.Context, params *CreateTapeWi addawsAwsjson11_serdeOpCreateTapeWithBarcodeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_CreateTapes.go b/service/storagegateway/api_op_CreateTapes.go index 247d5d0df5d..439de2964bd 100644 --- a/service/storagegateway/api_op_CreateTapes.go +++ b/service/storagegateway/api_op_CreateTapes.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateTapes(ctx context.Context, params *CreateTapesInput, optF addawsAwsjson11_serdeOpCreateTapesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DeleteAutomaticTapeCreationPolicy.go b/service/storagegateway/api_op_DeleteAutomaticTapeCreationPolicy.go index 688f25b51d7..b7fda33b66c 100644 --- a/service/storagegateway/api_op_DeleteAutomaticTapeCreationPolicy.go +++ b/service/storagegateway/api_op_DeleteAutomaticTapeCreationPolicy.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteAutomaticTapeCreationPolicy(ctx context.Context, params * addawsAwsjson11_serdeOpDeleteAutomaticTapeCreationPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DeleteBandwidthRateLimit.go b/service/storagegateway/api_op_DeleteBandwidthRateLimit.go index 6cbeb0f11da..55fe1d9b016 100644 --- a/service/storagegateway/api_op_DeleteBandwidthRateLimit.go +++ b/service/storagegateway/api_op_DeleteBandwidthRateLimit.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DeleteBandwidthRateLimit(ctx context.Context, params *DeleteBan addawsAwsjson11_serdeOpDeleteBandwidthRateLimitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DeleteChapCredentials.go b/service/storagegateway/api_op_DeleteChapCredentials.go index 9f22b46b9bc..a21c150ba3e 100644 --- a/service/storagegateway/api_op_DeleteChapCredentials.go +++ b/service/storagegateway/api_op_DeleteChapCredentials.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteChapCredentials(ctx context.Context, params *DeleteChapCr addawsAwsjson11_serdeOpDeleteChapCredentialsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DeleteFileShare.go b/service/storagegateway/api_op_DeleteFileShare.go index d647e717b07..8f590c099f5 100644 --- a/service/storagegateway/api_op_DeleteFileShare.go +++ b/service/storagegateway/api_op_DeleteFileShare.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteFileShare(ctx context.Context, params *DeleteFileShareInp addawsAwsjson11_serdeOpDeleteFileShareMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DeleteGateway.go b/service/storagegateway/api_op_DeleteGateway.go index c46638b00ea..7908deea4ba 100644 --- a/service/storagegateway/api_op_DeleteGateway.go +++ b/service/storagegateway/api_op_DeleteGateway.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) DeleteGateway(ctx context.Context, params *DeleteGatewayInput, addawsAwsjson11_serdeOpDeleteGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DeleteSnapshotSchedule.go b/service/storagegateway/api_op_DeleteSnapshotSchedule.go index 4d656126c98..450b860535b 100644 --- a/service/storagegateway/api_op_DeleteSnapshotSchedule.go +++ b/service/storagegateway/api_op_DeleteSnapshotSchedule.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) DeleteSnapshotSchedule(ctx context.Context, params *DeleteSnaps addawsAwsjson11_serdeOpDeleteSnapshotScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DeleteTape.go b/service/storagegateway/api_op_DeleteTape.go index 230a08c565e..9bb1588b775 100644 --- a/service/storagegateway/api_op_DeleteTape.go +++ b/service/storagegateway/api_op_DeleteTape.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteTape(ctx context.Context, params *DeleteTapeInput, optFns addawsAwsjson11_serdeOpDeleteTapeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DeleteTapeArchive.go b/service/storagegateway/api_op_DeleteTapeArchive.go index 8fdab7dec44..75f2f304966 100644 --- a/service/storagegateway/api_op_DeleteTapeArchive.go +++ b/service/storagegateway/api_op_DeleteTapeArchive.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteTapeArchive(ctx context.Context, params *DeleteTapeArchiv addawsAwsjson11_serdeOpDeleteTapeArchiveMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DeleteVolume.go b/service/storagegateway/api_op_DeleteVolume.go index 9e7a2b9ed7d..5932e6bf284 100644 --- a/service/storagegateway/api_op_DeleteVolume.go +++ b/service/storagegateway/api_op_DeleteVolume.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -35,9 +34,9 @@ func (c *Client) DeleteVolume(ctx context.Context, params *DeleteVolumeInput, op addawsAwsjson11_serdeOpDeleteVolumeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DescribeAvailabilityMonitorTest.go b/service/storagegateway/api_op_DescribeAvailabilityMonitorTest.go index 41bfd91008c..88e59f78248 100644 --- a/service/storagegateway/api_op_DescribeAvailabilityMonitorTest.go +++ b/service/storagegateway/api_op_DescribeAvailabilityMonitorTest.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeAvailabilityMonitorTest(ctx context.Context, params *De addawsAwsjson11_serdeOpDescribeAvailabilityMonitorTestMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DescribeBandwidthRateLimit.go b/service/storagegateway/api_op_DescribeBandwidthRateLimit.go index bce34b44f8c..a9022f45aec 100644 --- a/service/storagegateway/api_op_DescribeBandwidthRateLimit.go +++ b/service/storagegateway/api_op_DescribeBandwidthRateLimit.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) DescribeBandwidthRateLimit(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeBandwidthRateLimitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DescribeCache.go b/service/storagegateway/api_op_DescribeCache.go index bd563f4c6d1..4da8b355138 100644 --- a/service/storagegateway/api_op_DescribeCache.go +++ b/service/storagegateway/api_op_DescribeCache.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DescribeCache(ctx context.Context, params *DescribeCacheInput, addawsAwsjson11_serdeOpDescribeCacheMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DescribeCachediSCSIVolumes.go b/service/storagegateway/api_op_DescribeCachediSCSIVolumes.go index dde8876a08f..f5aa40ff9f4 100644 --- a/service/storagegateway/api_op_DescribeCachediSCSIVolumes.go +++ b/service/storagegateway/api_op_DescribeCachediSCSIVolumes.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeCachediSCSIVolumes(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeCachediSCSIVolumesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DescribeChapCredentials.go b/service/storagegateway/api_op_DescribeChapCredentials.go index 70026dd9306..e67110ac37a 100644 --- a/service/storagegateway/api_op_DescribeChapCredentials.go +++ b/service/storagegateway/api_op_DescribeChapCredentials.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeChapCredentials(ctx context.Context, params *DescribeCh addawsAwsjson11_serdeOpDescribeChapCredentialsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DescribeGatewayInformation.go b/service/storagegateway/api_op_DescribeGatewayInformation.go index 3215c2d3527..e905e88b378 100644 --- a/service/storagegateway/api_op_DescribeGatewayInformation.go +++ b/service/storagegateway/api_op_DescribeGatewayInformation.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeGatewayInformation(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeGatewayInformationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DescribeMaintenanceStartTime.go b/service/storagegateway/api_op_DescribeMaintenanceStartTime.go index 22fe110cac1..69972bdd8c7 100644 --- a/service/storagegateway/api_op_DescribeMaintenanceStartTime.go +++ b/service/storagegateway/api_op_DescribeMaintenanceStartTime.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DescribeMaintenanceStartTime(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribeMaintenanceStartTimeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DescribeNFSFileShares.go b/service/storagegateway/api_op_DescribeNFSFileShares.go index ed604747981..ca7358329c9 100644 --- a/service/storagegateway/api_op_DescribeNFSFileShares.go +++ b/service/storagegateway/api_op_DescribeNFSFileShares.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeNFSFileShares(ctx context.Context, params *DescribeNFSF addawsAwsjson11_serdeOpDescribeNFSFileSharesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DescribeSMBFileShares.go b/service/storagegateway/api_op_DescribeSMBFileShares.go index 4d39a94e322..ddde2af68c0 100644 --- a/service/storagegateway/api_op_DescribeSMBFileShares.go +++ b/service/storagegateway/api_op_DescribeSMBFileShares.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeSMBFileShares(ctx context.Context, params *DescribeSMBF addawsAwsjson11_serdeOpDescribeSMBFileSharesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DescribeSMBSettings.go b/service/storagegateway/api_op_DescribeSMBSettings.go index 2b91562b06b..44e8375e98b 100644 --- a/service/storagegateway/api_op_DescribeSMBSettings.go +++ b/service/storagegateway/api_op_DescribeSMBSettings.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeSMBSettings(ctx context.Context, params *DescribeSMBSet addawsAwsjson11_serdeOpDescribeSMBSettingsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DescribeSnapshotSchedule.go b/service/storagegateway/api_op_DescribeSnapshotSchedule.go index e9c55b72ebf..c1af2eba34f 100644 --- a/service/storagegateway/api_op_DescribeSnapshotSchedule.go +++ b/service/storagegateway/api_op_DescribeSnapshotSchedule.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeSnapshotSchedule(ctx context.Context, params *DescribeS addawsAwsjson11_serdeOpDescribeSnapshotScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DescribeStorediSCSIVolumes.go b/service/storagegateway/api_op_DescribeStorediSCSIVolumes.go index b293d1abb48..892431ca724 100644 --- a/service/storagegateway/api_op_DescribeStorediSCSIVolumes.go +++ b/service/storagegateway/api_op_DescribeStorediSCSIVolumes.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeStorediSCSIVolumes(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeStorediSCSIVolumesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DescribeTapeArchives.go b/service/storagegateway/api_op_DescribeTapeArchives.go index 447442014ba..14787273a38 100644 --- a/service/storagegateway/api_op_DescribeTapeArchives.go +++ b/service/storagegateway/api_op_DescribeTapeArchives.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeTapeArchives(ctx context.Context, params *DescribeTapeA addawsAwsjson11_serdeOpDescribeTapeArchivesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DescribeTapeRecoveryPoints.go b/service/storagegateway/api_op_DescribeTapeRecoveryPoints.go index 98d094043d2..6c7870b363d 100644 --- a/service/storagegateway/api_op_DescribeTapeRecoveryPoints.go +++ b/service/storagegateway/api_op_DescribeTapeRecoveryPoints.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeTapeRecoveryPoints(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeTapeRecoveryPointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DescribeTapes.go b/service/storagegateway/api_op_DescribeTapes.go index 05861493c68..05addf57f80 100644 --- a/service/storagegateway/api_op_DescribeTapes.go +++ b/service/storagegateway/api_op_DescribeTapes.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeTapes(ctx context.Context, params *DescribeTapesInput, addawsAwsjson11_serdeOpDescribeTapesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DescribeUploadBuffer.go b/service/storagegateway/api_op_DescribeUploadBuffer.go index 923ccfe4e3f..b2ac6d10285 100644 --- a/service/storagegateway/api_op_DescribeUploadBuffer.go +++ b/service/storagegateway/api_op_DescribeUploadBuffer.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DescribeUploadBuffer(ctx context.Context, params *DescribeUploa addawsAwsjson11_serdeOpDescribeUploadBufferMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DescribeVTLDevices.go b/service/storagegateway/api_op_DescribeVTLDevices.go index 1d6c4918b14..1e1a783d7e6 100644 --- a/service/storagegateway/api_op_DescribeVTLDevices.go +++ b/service/storagegateway/api_op_DescribeVTLDevices.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeVTLDevices(ctx context.Context, params *DescribeVTLDevi addawsAwsjson11_serdeOpDescribeVTLDevicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DescribeWorkingStorage.go b/service/storagegateway/api_op_DescribeWorkingStorage.go index 8691e6f1b44..9863d2b7c06 100644 --- a/service/storagegateway/api_op_DescribeWorkingStorage.go +++ b/service/storagegateway/api_op_DescribeWorkingStorage.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DescribeWorkingStorage(ctx context.Context, params *DescribeWor addawsAwsjson11_serdeOpDescribeWorkingStorageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DetachVolume.go b/service/storagegateway/api_op_DetachVolume.go index ffdf6139046..4663430fccd 100644 --- a/service/storagegateway/api_op_DetachVolume.go +++ b/service/storagegateway/api_op_DetachVolume.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DetachVolume(ctx context.Context, params *DetachVolumeInput, op addawsAwsjson11_serdeOpDetachVolumeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_DisableGateway.go b/service/storagegateway/api_op_DisableGateway.go index 0011efbf7d3..5078814ae6d 100644 --- a/service/storagegateway/api_op_DisableGateway.go +++ b/service/storagegateway/api_op_DisableGateway.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) DisableGateway(ctx context.Context, params *DisableGatewayInput addawsAwsjson11_serdeOpDisableGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_JoinDomain.go b/service/storagegateway/api_op_JoinDomain.go index 862bf504fe0..ac1366bca49 100644 --- a/service/storagegateway/api_op_JoinDomain.go +++ b/service/storagegateway/api_op_JoinDomain.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) JoinDomain(ctx context.Context, params *JoinDomainInput, optFns addawsAwsjson11_serdeOpJoinDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_ListAutomaticTapeCreationPolicies.go b/service/storagegateway/api_op_ListAutomaticTapeCreationPolicies.go index 1f2021b2815..f7b5fee4d0c 100644 --- a/service/storagegateway/api_op_ListAutomaticTapeCreationPolicies.go +++ b/service/storagegateway/api_op_ListAutomaticTapeCreationPolicies.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListAutomaticTapeCreationPolicies(ctx context.Context, params * addawsAwsjson11_serdeOpListAutomaticTapeCreationPoliciesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_ListFileShares.go b/service/storagegateway/api_op_ListFileShares.go index 3e39d57667c..e7ebc55d500 100644 --- a/service/storagegateway/api_op_ListFileShares.go +++ b/service/storagegateway/api_op_ListFileShares.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListFileShares(ctx context.Context, params *ListFileSharesInput addawsAwsjson11_serdeOpListFileSharesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_ListGateways.go b/service/storagegateway/api_op_ListGateways.go index d45145378ad..52cea4c5e2d 100644 --- a/service/storagegateway/api_op_ListGateways.go +++ b/service/storagegateway/api_op_ListGateways.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListGateways(ctx context.Context, params *ListGatewaysInput, op addawsAwsjson11_serdeOpListGatewaysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_ListLocalDisks.go b/service/storagegateway/api_op_ListLocalDisks.go index f6d3905fe2c..a255e46cf6e 100644 --- a/service/storagegateway/api_op_ListLocalDisks.go +++ b/service/storagegateway/api_op_ListLocalDisks.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListLocalDisks(ctx context.Context, params *ListLocalDisksInput addawsAwsjson11_serdeOpListLocalDisksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_ListTagsForResource.go b/service/storagegateway/api_op_ListTagsForResource.go index 23bc5ab38bf..0b9af84542e 100644 --- a/service/storagegateway/api_op_ListTagsForResource.go +++ b/service/storagegateway/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_ListTapes.go b/service/storagegateway/api_op_ListTapes.go index 8637f16dce1..fa23f35f7cf 100644 --- a/service/storagegateway/api_op_ListTapes.go +++ b/service/storagegateway/api_op_ListTapes.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) ListTapes(ctx context.Context, params *ListTapesInput, optFns . addawsAwsjson11_serdeOpListTapesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_ListVolumeInitiators.go b/service/storagegateway/api_op_ListVolumeInitiators.go index 224cf03f7ec..6ddabe01dca 100644 --- a/service/storagegateway/api_op_ListVolumeInitiators.go +++ b/service/storagegateway/api_op_ListVolumeInitiators.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) ListVolumeInitiators(ctx context.Context, params *ListVolumeIni addawsAwsjson11_serdeOpListVolumeInitiatorsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_ListVolumeRecoveryPoints.go b/service/storagegateway/api_op_ListVolumeRecoveryPoints.go index 77e40fd5fdb..3007cfe50ff 100644 --- a/service/storagegateway/api_op_ListVolumeRecoveryPoints.go +++ b/service/storagegateway/api_op_ListVolumeRecoveryPoints.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListVolumeRecoveryPoints(ctx context.Context, params *ListVolum addawsAwsjson11_serdeOpListVolumeRecoveryPointsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_ListVolumes.go b/service/storagegateway/api_op_ListVolumes.go index 2137d66f663..c3a0b357699 100644 --- a/service/storagegateway/api_op_ListVolumes.go +++ b/service/storagegateway/api_op_ListVolumes.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) ListVolumes(ctx context.Context, params *ListVolumesInput, optF addawsAwsjson11_serdeOpListVolumesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_NotifyWhenUploaded.go b/service/storagegateway/api_op_NotifyWhenUploaded.go index 15c0b6cbaca..cbef0c283e7 100644 --- a/service/storagegateway/api_op_NotifyWhenUploaded.go +++ b/service/storagegateway/api_op_NotifyWhenUploaded.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) NotifyWhenUploaded(ctx context.Context, params *NotifyWhenUploa addawsAwsjson11_serdeOpNotifyWhenUploadedMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_RefreshCache.go b/service/storagegateway/api_op_RefreshCache.go index 05f770d8928..9c3b411f3db 100644 --- a/service/storagegateway/api_op_RefreshCache.go +++ b/service/storagegateway/api_op_RefreshCache.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -47,9 +46,9 @@ func (c *Client) RefreshCache(ctx context.Context, params *RefreshCacheInput, op addawsAwsjson11_serdeOpRefreshCacheMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_RemoveTagsFromResource.go b/service/storagegateway/api_op_RemoveTagsFromResource.go index 1dfa20373e9..460284cf54f 100644 --- a/service/storagegateway/api_op_RemoveTagsFromResource.go +++ b/service/storagegateway/api_op_RemoveTagsFromResource.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) RemoveTagsFromResource(ctx context.Context, params *RemoveTagsF addawsAwsjson11_serdeOpRemoveTagsFromResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_ResetCache.go b/service/storagegateway/api_op_ResetCache.go index 675b289bbed..eeef2b47893 100644 --- a/service/storagegateway/api_op_ResetCache.go +++ b/service/storagegateway/api_op_ResetCache.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) ResetCache(ctx context.Context, params *ResetCacheInput, optFns addawsAwsjson11_serdeOpResetCacheMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_RetrieveTapeArchive.go b/service/storagegateway/api_op_RetrieveTapeArchive.go index f4d11bbb7aa..8287d7a4c63 100644 --- a/service/storagegateway/api_op_RetrieveTapeArchive.go +++ b/service/storagegateway/api_op_RetrieveTapeArchive.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) RetrieveTapeArchive(ctx context.Context, params *RetrieveTapeAr addawsAwsjson11_serdeOpRetrieveTapeArchiveMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_RetrieveTapeRecoveryPoint.go b/service/storagegateway/api_op_RetrieveTapeRecoveryPoint.go index 8cc69a9dbf9..e6d6ba8eefe 100644 --- a/service/storagegateway/api_op_RetrieveTapeRecoveryPoint.go +++ b/service/storagegateway/api_op_RetrieveTapeRecoveryPoint.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) RetrieveTapeRecoveryPoint(ctx context.Context, params *Retrieve addawsAwsjson11_serdeOpRetrieveTapeRecoveryPointMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_SetLocalConsolePassword.go b/service/storagegateway/api_op_SetLocalConsolePassword.go index 58108a98e29..7ee4ac2913e 100644 --- a/service/storagegateway/api_op_SetLocalConsolePassword.go +++ b/service/storagegateway/api_op_SetLocalConsolePassword.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) SetLocalConsolePassword(ctx context.Context, params *SetLocalCo addawsAwsjson11_serdeOpSetLocalConsolePasswordMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_SetSMBGuestPassword.go b/service/storagegateway/api_op_SetSMBGuestPassword.go index d07fd0f2092..8b6e4064552 100644 --- a/service/storagegateway/api_op_SetSMBGuestPassword.go +++ b/service/storagegateway/api_op_SetSMBGuestPassword.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) SetSMBGuestPassword(ctx context.Context, params *SetSMBGuestPas addawsAwsjson11_serdeOpSetSMBGuestPasswordMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_ShutdownGateway.go b/service/storagegateway/api_op_ShutdownGateway.go index 7f7dc3af35f..e0ea7461e76 100644 --- a/service/storagegateway/api_op_ShutdownGateway.go +++ b/service/storagegateway/api_op_ShutdownGateway.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -38,9 +37,9 @@ func (c *Client) ShutdownGateway(ctx context.Context, params *ShutdownGatewayInp addawsAwsjson11_serdeOpShutdownGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_StartAvailabilityMonitorTest.go b/service/storagegateway/api_op_StartAvailabilityMonitorTest.go index 593e6ea8c60..9b36643462a 100644 --- a/service/storagegateway/api_op_StartAvailabilityMonitorTest.go +++ b/service/storagegateway/api_op_StartAvailabilityMonitorTest.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) StartAvailabilityMonitorTest(ctx context.Context, params *Start addawsAwsjson11_serdeOpStartAvailabilityMonitorTestMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_StartGateway.go b/service/storagegateway/api_op_StartGateway.go index d4b671febe9..e33de4d9d08 100644 --- a/service/storagegateway/api_op_StartGateway.go +++ b/service/storagegateway/api_op_StartGateway.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) StartGateway(ctx context.Context, params *StartGatewayInput, op addawsAwsjson11_serdeOpStartGatewayMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_UpdateAutomaticTapeCreationPolicy.go b/service/storagegateway/api_op_UpdateAutomaticTapeCreationPolicy.go index 473a91f3bf1..c25394715be 100644 --- a/service/storagegateway/api_op_UpdateAutomaticTapeCreationPolicy.go +++ b/service/storagegateway/api_op_UpdateAutomaticTapeCreationPolicy.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateAutomaticTapeCreationPolicy(ctx context.Context, params * addawsAwsjson11_serdeOpUpdateAutomaticTapeCreationPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_UpdateBandwidthRateLimit.go b/service/storagegateway/api_op_UpdateBandwidthRateLimit.go index 3d0f5192def..e90fc2bce00 100644 --- a/service/storagegateway/api_op_UpdateBandwidthRateLimit.go +++ b/service/storagegateway/api_op_UpdateBandwidthRateLimit.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) UpdateBandwidthRateLimit(ctx context.Context, params *UpdateBan addawsAwsjson11_serdeOpUpdateBandwidthRateLimitMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_UpdateChapCredentials.go b/service/storagegateway/api_op_UpdateChapCredentials.go index d5881656b51..028e4667a2b 100644 --- a/service/storagegateway/api_op_UpdateChapCredentials.go +++ b/service/storagegateway/api_op_UpdateChapCredentials.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) UpdateChapCredentials(ctx context.Context, params *UpdateChapCr addawsAwsjson11_serdeOpUpdateChapCredentialsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_UpdateGatewayInformation.go b/service/storagegateway/api_op_UpdateGatewayInformation.go index 529faeba447..eddc2a7d566 100644 --- a/service/storagegateway/api_op_UpdateGatewayInformation.go +++ b/service/storagegateway/api_op_UpdateGatewayInformation.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) UpdateGatewayInformation(ctx context.Context, params *UpdateGat addawsAwsjson11_serdeOpUpdateGatewayInformationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_UpdateGatewaySoftwareNow.go b/service/storagegateway/api_op_UpdateGatewaySoftwareNow.go index 21ed8ebf2ec..6321681e254 100644 --- a/service/storagegateway/api_op_UpdateGatewaySoftwareNow.go +++ b/service/storagegateway/api_op_UpdateGatewaySoftwareNow.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -34,9 +33,9 @@ func (c *Client) UpdateGatewaySoftwareNow(ctx context.Context, params *UpdateGat addawsAwsjson11_serdeOpUpdateGatewaySoftwareNowMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_UpdateMaintenanceStartTime.go b/service/storagegateway/api_op_UpdateMaintenanceStartTime.go index ccfcbae51e7..7bfadf99d45 100644 --- a/service/storagegateway/api_op_UpdateMaintenanceStartTime.go +++ b/service/storagegateway/api_op_UpdateMaintenanceStartTime.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) UpdateMaintenanceStartTime(ctx context.Context, params *UpdateM addawsAwsjson11_serdeOpUpdateMaintenanceStartTimeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_UpdateNFSFileShare.go b/service/storagegateway/api_op_UpdateNFSFileShare.go index fa70434ac8e..80386eb417d 100644 --- a/service/storagegateway/api_op_UpdateNFSFileShare.go +++ b/service/storagegateway/api_op_UpdateNFSFileShare.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) UpdateNFSFileShare(ctx context.Context, params *UpdateNFSFileSh addawsAwsjson11_serdeOpUpdateNFSFileShareMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_UpdateSMBFileShare.go b/service/storagegateway/api_op_UpdateSMBFileShare.go index 1a3e2e1e0e6..e0b66778e02 100644 --- a/service/storagegateway/api_op_UpdateSMBFileShare.go +++ b/service/storagegateway/api_op_UpdateSMBFileShare.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) UpdateSMBFileShare(ctx context.Context, params *UpdateSMBFileSh addawsAwsjson11_serdeOpUpdateSMBFileShareMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_UpdateSMBSecurityStrategy.go b/service/storagegateway/api_op_UpdateSMBSecurityStrategy.go index 212f821b942..7292474d50e 100644 --- a/service/storagegateway/api_op_UpdateSMBSecurityStrategy.go +++ b/service/storagegateway/api_op_UpdateSMBSecurityStrategy.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateSMBSecurityStrategy(ctx context.Context, params *UpdateSM addawsAwsjson11_serdeOpUpdateSMBSecurityStrategyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_UpdateSnapshotSchedule.go b/service/storagegateway/api_op_UpdateSnapshotSchedule.go index e3da07f90a1..bab78ec7269 100644 --- a/service/storagegateway/api_op_UpdateSnapshotSchedule.go +++ b/service/storagegateway/api_op_UpdateSnapshotSchedule.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) UpdateSnapshotSchedule(ctx context.Context, params *UpdateSnaps addawsAwsjson11_serdeOpUpdateSnapshotScheduleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/api_op_UpdateVTLDeviceType.go b/service/storagegateway/api_op_UpdateVTLDeviceType.go index 7ba6fde67c3..b152c7eaeac 100644 --- a/service/storagegateway/api_op_UpdateVTLDeviceType.go +++ b/service/storagegateway/api_op_UpdateVTLDeviceType.go @@ -5,7 +5,6 @@ package storagegateway import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) UpdateVTLDeviceType(ctx context.Context, params *UpdateVTLDevic addawsAwsjson11_serdeOpUpdateVTLDeviceTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/storagegateway/endpoints.go b/service/storagegateway/endpoints.go index 0981ac2b9f2..6ad99dcda29 100644 --- a/service/storagegateway/endpoints.go +++ b/service/storagegateway/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/sts/api_client.go b/service/sts/api_client.go index eccf999ea21..e22aab9a68c 100644 --- a/service/sts/api_client.go +++ b/service/sts/api_client.go @@ -151,30 +151,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -240,6 +216,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/sts/api_op_AssumeRole.go b/service/sts/api_op_AssumeRole.go index f863f10f291..f2a67351d58 100644 --- a/service/sts/api_op_AssumeRole.go +++ b/service/sts/api_op_AssumeRole.go @@ -5,7 +5,6 @@ package sts import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sts/types" smithy "github.com/awslabs/smithy-go" @@ -120,9 +119,9 @@ func (c *Client) AssumeRole(ctx context.Context, params *AssumeRoleInput, optFns addawsAwsquery_serdeOpAssumeRoleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sts/api_op_AssumeRoleWithSAML.go b/service/sts/api_op_AssumeRoleWithSAML.go index 967550b5881..25a6d26add9 100644 --- a/service/sts/api_op_AssumeRoleWithSAML.go +++ b/service/sts/api_op_AssumeRoleWithSAML.go @@ -5,7 +5,6 @@ package sts import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/sts/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -119,8 +118,8 @@ func (c *Client) AssumeRoleWithSAML(ctx context.Context, params *AssumeRoleWithS addawsAwsquery_serdeOpAssumeRoleWithSAMLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/sts/api_op_AssumeRoleWithWebIdentity.go b/service/sts/api_op_AssumeRoleWithWebIdentity.go index 128c6df21f8..63fb7577a13 100644 --- a/service/sts/api_op_AssumeRoleWithWebIdentity.go +++ b/service/sts/api_op_AssumeRoleWithWebIdentity.go @@ -5,7 +5,6 @@ package sts import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/sts/types" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -141,8 +140,8 @@ func (c *Client) AssumeRoleWithWebIdentity(ctx context.Context, params *AssumeRo addawsAwsquery_serdeOpAssumeRoleWithWebIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) - retry.AddRetryMiddlewares(stack, options) + addResolveEndpointMiddleware(stack, options) + addRetryMiddlewares(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) smithyhttp.AddErrorCloseResponseBodyMiddleware(stack) diff --git a/service/sts/api_op_DecodeAuthorizationMessage.go b/service/sts/api_op_DecodeAuthorizationMessage.go index 5b390211fe5..770a97a4573 100644 --- a/service/sts/api_op_DecodeAuthorizationMessage.go +++ b/service/sts/api_op_DecodeAuthorizationMessage.go @@ -5,7 +5,6 @@ package sts import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -51,9 +50,9 @@ func (c *Client) DecodeAuthorizationMessage(ctx context.Context, params *DecodeA addawsAwsquery_serdeOpDecodeAuthorizationMessageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sts/api_op_GetAccessKeyInfo.go b/service/sts/api_op_GetAccessKeyInfo.go index fddc658f52f..3344acacd5a 100644 --- a/service/sts/api_op_GetAccessKeyInfo.go +++ b/service/sts/api_op_GetAccessKeyInfo.go @@ -5,7 +5,6 @@ package sts import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) GetAccessKeyInfo(ctx context.Context, params *GetAccessKeyInfoI addawsAwsquery_serdeOpGetAccessKeyInfoMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sts/api_op_GetCallerIdentity.go b/service/sts/api_op_GetCallerIdentity.go index d201010eb06..2e6e2a3c9c1 100644 --- a/service/sts/api_op_GetCallerIdentity.go +++ b/service/sts/api_op_GetCallerIdentity.go @@ -5,7 +5,6 @@ package sts import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) GetCallerIdentity(ctx context.Context, params *GetCallerIdentit addawsAwsquery_serdeOpGetCallerIdentityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sts/api_op_GetFederationToken.go b/service/sts/api_op_GetFederationToken.go index 71639f3b2c4..b416be6209e 100644 --- a/service/sts/api_op_GetFederationToken.go +++ b/service/sts/api_op_GetFederationToken.go @@ -5,7 +5,6 @@ package sts import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sts/types" smithy "github.com/awslabs/smithy-go" @@ -99,9 +98,9 @@ func (c *Client) GetFederationToken(ctx context.Context, params *GetFederationTo addawsAwsquery_serdeOpGetFederationTokenMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sts/api_op_GetSessionToken.go b/service/sts/api_op_GetSessionToken.go index 813ae874746..7f03c3282db 100644 --- a/service/sts/api_op_GetSessionToken.go +++ b/service/sts/api_op_GetSessionToken.go @@ -5,7 +5,6 @@ package sts import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/sts/types" smithy "github.com/awslabs/smithy-go" @@ -67,9 +66,9 @@ func (c *Client) GetSessionToken(ctx context.Context, params *GetSessionTokenInp addawsAwsquery_serdeOpGetSessionTokenMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/sts/endpoints.go b/service/sts/endpoints.go index 1aadb250f85..dc095f73d9b 100644 --- a/service/sts/endpoints.go +++ b/service/sts/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/support/api_client.go b/service/support/api_client.go index aa8db1374a3..bed803edaef 100644 --- a/service/support/api_client.go +++ b/service/support/api_client.go @@ -142,30 +142,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -231,6 +207,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/support/api_op_AddAttachmentsToSet.go b/service/support/api_op_AddAttachmentsToSet.go index b72d2aca8db..ad506deda39 100644 --- a/service/support/api_op_AddAttachmentsToSet.go +++ b/service/support/api_op_AddAttachmentsToSet.go @@ -5,7 +5,6 @@ package support import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/support/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) AddAttachmentsToSet(ctx context.Context, params *AddAttachments addawsAwsjson11_serdeOpAddAttachmentsToSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/support/api_op_AddCommunicationToCase.go b/service/support/api_op_AddCommunicationToCase.go index 1e7a3242b62..2bc842607bf 100644 --- a/service/support/api_op_AddCommunicationToCase.go +++ b/service/support/api_op_AddCommunicationToCase.go @@ -5,7 +5,6 @@ package support import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) AddCommunicationToCase(ctx context.Context, params *AddCommunic addawsAwsjson11_serdeOpAddCommunicationToCaseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/support/api_op_CreateCase.go b/service/support/api_op_CreateCase.go index c7976c310c3..f3e8aff553f 100644 --- a/service/support/api_op_CreateCase.go +++ b/service/support/api_op_CreateCase.go @@ -5,7 +5,6 @@ package support import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -52,9 +51,9 @@ func (c *Client) CreateCase(ctx context.Context, params *CreateCaseInput, optFns addawsAwsjson11_serdeOpCreateCaseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/support/api_op_DescribeAttachment.go b/service/support/api_op_DescribeAttachment.go index a01ef3b2eaa..63b5c595c34 100644 --- a/service/support/api_op_DescribeAttachment.go +++ b/service/support/api_op_DescribeAttachment.go @@ -5,7 +5,6 @@ package support import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/support/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) DescribeAttachment(ctx context.Context, params *DescribeAttachm addawsAwsjson11_serdeOpDescribeAttachmentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/support/api_op_DescribeCases.go b/service/support/api_op_DescribeCases.go index 767af1817c9..74b1c79d9ba 100644 --- a/service/support/api_op_DescribeCases.go +++ b/service/support/api_op_DescribeCases.go @@ -5,7 +5,6 @@ package support import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/support/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) DescribeCases(ctx context.Context, params *DescribeCasesInput, addawsAwsjson11_serdeOpDescribeCasesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/support/api_op_DescribeCommunications.go b/service/support/api_op_DescribeCommunications.go index 4b803c5a816..7f7ee4d1ec7 100644 --- a/service/support/api_op_DescribeCommunications.go +++ b/service/support/api_op_DescribeCommunications.go @@ -5,7 +5,6 @@ package support import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/support/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) DescribeCommunications(ctx context.Context, params *DescribeCom addawsAwsjson11_serdeOpDescribeCommunicationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/support/api_op_DescribeServices.go b/service/support/api_op_DescribeServices.go index 67442bf56d0..1519dd79594 100644 --- a/service/support/api_op_DescribeServices.go +++ b/service/support/api_op_DescribeServices.go @@ -5,7 +5,6 @@ package support import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/support/types" smithy "github.com/awslabs/smithy-go" @@ -41,9 +40,9 @@ func (c *Client) DescribeServices(ctx context.Context, params *DescribeServicesI addawsAwsjson11_serdeOpDescribeServicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/support/api_op_DescribeSeverityLevels.go b/service/support/api_op_DescribeSeverityLevels.go index 1d3d06de896..05d171c3294 100644 --- a/service/support/api_op_DescribeSeverityLevels.go +++ b/service/support/api_op_DescribeSeverityLevels.go @@ -5,7 +5,6 @@ package support import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/support/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) DescribeSeverityLevels(ctx context.Context, params *DescribeSev addawsAwsjson11_serdeOpDescribeSeverityLevelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/support/api_op_DescribeTrustedAdvisorCheckRefreshStatuses.go b/service/support/api_op_DescribeTrustedAdvisorCheckRefreshStatuses.go index 44240135c57..894e90aacf2 100644 --- a/service/support/api_op_DescribeTrustedAdvisorCheckRefreshStatuses.go +++ b/service/support/api_op_DescribeTrustedAdvisorCheckRefreshStatuses.go @@ -5,7 +5,6 @@ package support import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/support/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) DescribeTrustedAdvisorCheckRefreshStatuses(ctx context.Context, addawsAwsjson11_serdeOpDescribeTrustedAdvisorCheckRefreshStatusesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/support/api_op_DescribeTrustedAdvisorCheckResult.go b/service/support/api_op_DescribeTrustedAdvisorCheckResult.go index 5589891319a..d5e5a3cd571 100644 --- a/service/support/api_op_DescribeTrustedAdvisorCheckResult.go +++ b/service/support/api_op_DescribeTrustedAdvisorCheckResult.go @@ -5,7 +5,6 @@ package support import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/support/types" smithy "github.com/awslabs/smithy-go" @@ -54,9 +53,9 @@ func (c *Client) DescribeTrustedAdvisorCheckResult(ctx context.Context, params * addawsAwsjson11_serdeOpDescribeTrustedAdvisorCheckResultMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/support/api_op_DescribeTrustedAdvisorCheckSummaries.go b/service/support/api_op_DescribeTrustedAdvisorCheckSummaries.go index 4af6d0f72b9..d950998b0c0 100644 --- a/service/support/api_op_DescribeTrustedAdvisorCheckSummaries.go +++ b/service/support/api_op_DescribeTrustedAdvisorCheckSummaries.go @@ -5,7 +5,6 @@ package support import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/support/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) DescribeTrustedAdvisorCheckSummaries(ctx context.Context, param addawsAwsjson11_serdeOpDescribeTrustedAdvisorCheckSummariesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/support/api_op_DescribeTrustedAdvisorChecks.go b/service/support/api_op_DescribeTrustedAdvisorChecks.go index 5d069fd34ff..2e3aabcdcfd 100644 --- a/service/support/api_op_DescribeTrustedAdvisorChecks.go +++ b/service/support/api_op_DescribeTrustedAdvisorChecks.go @@ -5,7 +5,6 @@ package support import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/support/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) DescribeTrustedAdvisorChecks(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribeTrustedAdvisorChecksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/support/api_op_RefreshTrustedAdvisorCheck.go b/service/support/api_op_RefreshTrustedAdvisorCheck.go index 774d252f618..404d6a18b22 100644 --- a/service/support/api_op_RefreshTrustedAdvisorCheck.go +++ b/service/support/api_op_RefreshTrustedAdvisorCheck.go @@ -5,7 +5,6 @@ package support import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/support/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) RefreshTrustedAdvisorCheck(ctx context.Context, params *Refresh addawsAwsjson11_serdeOpRefreshTrustedAdvisorCheckMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/support/api_op_ResolveCase.go b/service/support/api_op_ResolveCase.go index af48a3e97c7..d2a28fa12bb 100644 --- a/service/support/api_op_ResolveCase.go +++ b/service/support/api_op_ResolveCase.go @@ -5,7 +5,6 @@ package support import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) ResolveCase(ctx context.Context, params *ResolveCaseInput, optF addawsAwsjson11_serdeOpResolveCaseMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/support/endpoints.go b/service/support/endpoints.go index c0bddcaaf20..2ca2ec6b2da 100644 --- a/service/support/endpoints.go +++ b/service/support/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/swf/api_client.go b/service/swf/api_client.go index 3449ee64d67..5634510f773 100644 --- a/service/swf/api_client.go +++ b/service/swf/api_client.go @@ -89,30 +89,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -178,6 +154,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/swf/api_op_CountClosedWorkflowExecutions.go b/service/swf/api_op_CountClosedWorkflowExecutions.go index aca0a22a3a9..e4f57b841c2 100644 --- a/service/swf/api_op_CountClosedWorkflowExecutions.go +++ b/service/swf/api_op_CountClosedWorkflowExecutions.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -54,9 +53,9 @@ func (c *Client) CountClosedWorkflowExecutions(ctx context.Context, params *Coun addawsAwsjson10_serdeOpCountClosedWorkflowExecutionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_CountOpenWorkflowExecutions.go b/service/swf/api_op_CountOpenWorkflowExecutions.go index 04d763f6a8c..22adc6c1197 100644 --- a/service/swf/api_op_CountOpenWorkflowExecutions.go +++ b/service/swf/api_op_CountOpenWorkflowExecutions.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -54,9 +53,9 @@ func (c *Client) CountOpenWorkflowExecutions(ctx context.Context, params *CountO addawsAwsjson10_serdeOpCountOpenWorkflowExecutionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_CountPendingActivityTasks.go b/service/swf/api_op_CountPendingActivityTasks.go index f8de70aad54..18f478c5ca1 100644 --- a/service/swf/api_op_CountPendingActivityTasks.go +++ b/service/swf/api_op_CountPendingActivityTasks.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) CountPendingActivityTasks(ctx context.Context, params *CountPen addawsAwsjson10_serdeOpCountPendingActivityTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_CountPendingDecisionTasks.go b/service/swf/api_op_CountPendingDecisionTasks.go index 0459f784c15..eb3bda54ea4 100644 --- a/service/swf/api_op_CountPendingDecisionTasks.go +++ b/service/swf/api_op_CountPendingDecisionTasks.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) CountPendingDecisionTasks(ctx context.Context, params *CountPen addawsAwsjson10_serdeOpCountPendingDecisionTasksMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_DeprecateActivityType.go b/service/swf/api_op_DeprecateActivityType.go index e29bc04a1cc..cf6dfaf4e39 100644 --- a/service/swf/api_op_DeprecateActivityType.go +++ b/service/swf/api_op_DeprecateActivityType.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -52,9 +51,9 @@ func (c *Client) DeprecateActivityType(ctx context.Context, params *DeprecateAct addawsAwsjson10_serdeOpDeprecateActivityTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_DeprecateDomain.go b/service/swf/api_op_DeprecateDomain.go index e8e8ac867aa..a2a6ba16184 100644 --- a/service/swf/api_op_DeprecateDomain.go +++ b/service/swf/api_op_DeprecateDomain.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -47,9 +46,9 @@ func (c *Client) DeprecateDomain(ctx context.Context, params *DeprecateDomainInp addawsAwsjson10_serdeOpDeprecateDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_DeprecateWorkflowType.go b/service/swf/api_op_DeprecateWorkflowType.go index 80bbf97743b..70261993e24 100644 --- a/service/swf/api_op_DeprecateWorkflowType.go +++ b/service/swf/api_op_DeprecateWorkflowType.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -53,9 +52,9 @@ func (c *Client) DeprecateWorkflowType(ctx context.Context, params *DeprecateWor addawsAwsjson10_serdeOpDeprecateWorkflowTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_DescribeActivityType.go b/service/swf/api_op_DescribeActivityType.go index ad5def7c303..2aca29d305b 100644 --- a/service/swf/api_op_DescribeActivityType.go +++ b/service/swf/api_op_DescribeActivityType.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -50,9 +49,9 @@ func (c *Client) DescribeActivityType(ctx context.Context, params *DescribeActiv addawsAwsjson10_serdeOpDescribeActivityTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_DescribeDomain.go b/service/swf/api_op_DescribeDomain.go index 9f1cefa2cc6..375bd41eecc 100644 --- a/service/swf/api_op_DescribeDomain.go +++ b/service/swf/api_op_DescribeDomain.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) DescribeDomain(ctx context.Context, params *DescribeDomainInput addawsAwsjson10_serdeOpDescribeDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_DescribeWorkflowExecution.go b/service/swf/api_op_DescribeWorkflowExecution.go index f291aa9a5e0..0532a4aaa43 100644 --- a/service/swf/api_op_DescribeWorkflowExecution.go +++ b/service/swf/api_op_DescribeWorkflowExecution.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) DescribeWorkflowExecution(ctx context.Context, params *Describe addawsAwsjson10_serdeOpDescribeWorkflowExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_DescribeWorkflowType.go b/service/swf/api_op_DescribeWorkflowType.go index 784b3a16d2a..dca3400ada1 100644 --- a/service/swf/api_op_DescribeWorkflowType.go +++ b/service/swf/api_op_DescribeWorkflowType.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -51,9 +50,9 @@ func (c *Client) DescribeWorkflowType(ctx context.Context, params *DescribeWorkf addawsAwsjson10_serdeOpDescribeWorkflowTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_GetWorkflowExecutionHistory.go b/service/swf/api_op_GetWorkflowExecutionHistory.go index e5230315e5f..d2b60735333 100644 --- a/service/swf/api_op_GetWorkflowExecutionHistory.go +++ b/service/swf/api_op_GetWorkflowExecutionHistory.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) GetWorkflowExecutionHistory(ctx context.Context, params *GetWor addawsAwsjson10_serdeOpGetWorkflowExecutionHistoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_ListActivityTypes.go b/service/swf/api_op_ListActivityTypes.go index 6bfdc0a1864..71f87d7834c 100644 --- a/service/swf/api_op_ListActivityTypes.go +++ b/service/swf/api_op_ListActivityTypes.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) ListActivityTypes(ctx context.Context, params *ListActivityType addawsAwsjson10_serdeOpListActivityTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_ListClosedWorkflowExecutions.go b/service/swf/api_op_ListClosedWorkflowExecutions.go index dd7f36bf9d4..03998c24d07 100644 --- a/service/swf/api_op_ListClosedWorkflowExecutions.go +++ b/service/swf/api_op_ListClosedWorkflowExecutions.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -56,9 +55,9 @@ func (c *Client) ListClosedWorkflowExecutions(ctx context.Context, params *ListC addawsAwsjson10_serdeOpListClosedWorkflowExecutionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_ListDomains.go b/service/swf/api_op_ListDomains.go index 6c054e1b6a8..e21b6a4e257 100644 --- a/service/swf/api_op_ListDomains.go +++ b/service/swf/api_op_ListDomains.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) ListDomains(ctx context.Context, params *ListDomainsInput, optF addawsAwsjson10_serdeOpListDomainsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_ListOpenWorkflowExecutions.go b/service/swf/api_op_ListOpenWorkflowExecutions.go index ac649d40b05..4f2d47dcfab 100644 --- a/service/swf/api_op_ListOpenWorkflowExecutions.go +++ b/service/swf/api_op_ListOpenWorkflowExecutions.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -56,9 +55,9 @@ func (c *Client) ListOpenWorkflowExecutions(ctx context.Context, params *ListOpe addawsAwsjson10_serdeOpListOpenWorkflowExecutionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_ListTagsForResource.go b/service/swf/api_op_ListTagsForResource.go index f82fd6cd10b..c060adb59a3 100644 --- a/service/swf/api_op_ListTagsForResource.go +++ b/service/swf/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson10_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_ListWorkflowTypes.go b/service/swf/api_op_ListWorkflowTypes.go index a13f7a06df7..e521db1e427 100644 --- a/service/swf/api_op_ListWorkflowTypes.go +++ b/service/swf/api_op_ListWorkflowTypes.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -43,9 +42,9 @@ func (c *Client) ListWorkflowTypes(ctx context.Context, params *ListWorkflowType addawsAwsjson10_serdeOpListWorkflowTypesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_PollForActivityTask.go b/service/swf/api_op_PollForActivityTask.go index ee215f920b7..dca782f100c 100644 --- a/service/swf/api_op_PollForActivityTask.go +++ b/service/swf/api_op_PollForActivityTask.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -52,9 +51,9 @@ func (c *Client) PollForActivityTask(ctx context.Context, params *PollForActivit addawsAwsjson10_serdeOpPollForActivityTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_PollForDecisionTask.go b/service/swf/api_op_PollForDecisionTask.go index 732bb8619f1..64caacde37d 100644 --- a/service/swf/api_op_PollForDecisionTask.go +++ b/service/swf/api_op_PollForDecisionTask.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -59,9 +58,9 @@ func (c *Client) PollForDecisionTask(ctx context.Context, params *PollForDecisio addawsAwsjson10_serdeOpPollForDecisionTaskMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_RecordActivityTaskHeartbeat.go b/service/swf/api_op_RecordActivityTaskHeartbeat.go index 176892a8d84..d46e5b9819d 100644 --- a/service/swf/api_op_RecordActivityTaskHeartbeat.go +++ b/service/swf/api_op_RecordActivityTaskHeartbeat.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -60,9 +59,9 @@ func (c *Client) RecordActivityTaskHeartbeat(ctx context.Context, params *Record addawsAwsjson10_serdeOpRecordActivityTaskHeartbeatMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_RegisterActivityType.go b/service/swf/api_op_RegisterActivityType.go index bfa61a2f57b..b78cf650c0d 100644 --- a/service/swf/api_op_RegisterActivityType.go +++ b/service/swf/api_op_RegisterActivityType.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -54,9 +53,9 @@ func (c *Client) RegisterActivityType(ctx context.Context, params *RegisterActiv addawsAwsjson10_serdeOpRegisterActivityTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_RegisterDomain.go b/service/swf/api_op_RegisterDomain.go index 732a1304f71..f0db662e519 100644 --- a/service/swf/api_op_RegisterDomain.go +++ b/service/swf/api_op_RegisterDomain.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -42,9 +41,9 @@ func (c *Client) RegisterDomain(ctx context.Context, params *RegisterDomainInput addawsAwsjson10_serdeOpRegisterDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_RegisterWorkflowType.go b/service/swf/api_op_RegisterWorkflowType.go index b88ffa0ff67..92802c08866 100644 --- a/service/swf/api_op_RegisterWorkflowType.go +++ b/service/swf/api_op_RegisterWorkflowType.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -55,9 +54,9 @@ func (c *Client) RegisterWorkflowType(ctx context.Context, params *RegisterWorkf addawsAwsjson10_serdeOpRegisterWorkflowTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_RequestCancelWorkflowExecution.go b/service/swf/api_op_RequestCancelWorkflowExecution.go index d0066706179..b10b44a95b9 100644 --- a/service/swf/api_op_RequestCancelWorkflowExecution.go +++ b/service/swf/api_op_RequestCancelWorkflowExecution.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -45,9 +44,9 @@ func (c *Client) RequestCancelWorkflowExecution(ctx context.Context, params *Req addawsAwsjson10_serdeOpRequestCancelWorkflowExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_RespondActivityTaskCanceled.go b/service/swf/api_op_RespondActivityTaskCanceled.go index 5b85c89bbab..4533a7dfa52 100644 --- a/service/swf/api_op_RespondActivityTaskCanceled.go +++ b/service/swf/api_op_RespondActivityTaskCanceled.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -48,9 +47,9 @@ func (c *Client) RespondActivityTaskCanceled(ctx context.Context, params *Respon addawsAwsjson10_serdeOpRespondActivityTaskCanceledMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_RespondActivityTaskCompleted.go b/service/swf/api_op_RespondActivityTaskCompleted.go index a167cd00d60..0098df1b19f 100644 --- a/service/swf/api_op_RespondActivityTaskCompleted.go +++ b/service/swf/api_op_RespondActivityTaskCompleted.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -49,9 +48,9 @@ func (c *Client) RespondActivityTaskCompleted(ctx context.Context, params *Respo addawsAwsjson10_serdeOpRespondActivityTaskCompletedMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_RespondActivityTaskFailed.go b/service/swf/api_op_RespondActivityTaskFailed.go index 8f5e8e0612e..056d5fd1c12 100644 --- a/service/swf/api_op_RespondActivityTaskFailed.go +++ b/service/swf/api_op_RespondActivityTaskFailed.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -44,9 +43,9 @@ func (c *Client) RespondActivityTaskFailed(ctx context.Context, params *RespondA addawsAwsjson10_serdeOpRespondActivityTaskFailedMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_RespondDecisionTaskCompleted.go b/service/swf/api_op_RespondDecisionTaskCompleted.go index bb48055305e..976627db366 100644 --- a/service/swf/api_op_RespondDecisionTaskCompleted.go +++ b/service/swf/api_op_RespondDecisionTaskCompleted.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -37,9 +36,9 @@ func (c *Client) RespondDecisionTaskCompleted(ctx context.Context, params *Respo addawsAwsjson10_serdeOpRespondDecisionTaskCompletedMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_SignalWorkflowExecution.go b/service/swf/api_op_SignalWorkflowExecution.go index 7ab877a29d7..5b7f2d4858a 100644 --- a/service/swf/api_op_SignalWorkflowExecution.go +++ b/service/swf/api_op_SignalWorkflowExecution.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -43,9 +42,9 @@ func (c *Client) SignalWorkflowExecution(ctx context.Context, params *SignalWork addawsAwsjson10_serdeOpSignalWorkflowExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_StartWorkflowExecution.go b/service/swf/api_op_StartWorkflowExecution.go index 6dfc5367a64..7cddd7707b6 100644 --- a/service/swf/api_op_StartWorkflowExecution.go +++ b/service/swf/api_op_StartWorkflowExecution.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -52,9 +51,9 @@ func (c *Client) StartWorkflowExecution(ctx context.Context, params *StartWorkfl addawsAwsjson10_serdeOpStartWorkflowExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_TagResource.go b/service/swf/api_op_TagResource.go index 507f9016a3b..0eb7b51e453 100644 --- a/service/swf/api_op_TagResource.go +++ b/service/swf/api_op_TagResource.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson10_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_TerminateWorkflowExecution.go b/service/swf/api_op_TerminateWorkflowExecution.go index 3c4f4a64de6..fbd762a49cb 100644 --- a/service/swf/api_op_TerminateWorkflowExecution.go +++ b/service/swf/api_op_TerminateWorkflowExecution.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) TerminateWorkflowExecution(ctx context.Context, params *Termina addawsAwsjson10_serdeOpTerminateWorkflowExecutionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_UndeprecateActivityType.go b/service/swf/api_op_UndeprecateActivityType.go index 61ee45dbdeb..4b3afa08903 100644 --- a/service/swf/api_op_UndeprecateActivityType.go +++ b/service/swf/api_op_UndeprecateActivityType.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -51,9 +50,9 @@ func (c *Client) UndeprecateActivityType(ctx context.Context, params *Undeprecat addawsAwsjson10_serdeOpUndeprecateActivityTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_UndeprecateDomain.go b/service/swf/api_op_UndeprecateDomain.go index adff8562a7a..3c988ba47e1 100644 --- a/service/swf/api_op_UndeprecateDomain.go +++ b/service/swf/api_op_UndeprecateDomain.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -44,9 +43,9 @@ func (c *Client) UndeprecateDomain(ctx context.Context, params *UndeprecateDomai addawsAwsjson10_serdeOpUndeprecateDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_UndeprecateWorkflowType.go b/service/swf/api_op_UndeprecateWorkflowType.go index 5871b2408b7..1f795bab1a6 100644 --- a/service/swf/api_op_UndeprecateWorkflowType.go +++ b/service/swf/api_op_UndeprecateWorkflowType.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/swf/types" smithy "github.com/awslabs/smithy-go" @@ -51,9 +50,9 @@ func (c *Client) UndeprecateWorkflowType(ctx context.Context, params *Undeprecat addawsAwsjson10_serdeOpUndeprecateWorkflowTypeMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/api_op_UntagResource.go b/service/swf/api_op_UntagResource.go index 8f4523a8f0c..7e8622e8ef6 100644 --- a/service/swf/api_op_UntagResource.go +++ b/service/swf/api_op_UntagResource.go @@ -5,7 +5,6 @@ package swf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson10_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/swf/endpoints.go b/service/swf/endpoints.go index 120eaabd534..717a9d1d82b 100644 --- a/service/swf/endpoints.go +++ b/service/swf/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/synthetics/api_client.go b/service/synthetics/api_client.go index 52fe14e2550..2e13d616083 100644 --- a/service/synthetics/api_client.go +++ b/service/synthetics/api_client.go @@ -91,30 +91,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -180,6 +156,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/synthetics/api_op_CreateCanary.go b/service/synthetics/api_op_CreateCanary.go index 9a529617fa5..ea68846b2e2 100644 --- a/service/synthetics/api_op_CreateCanary.go +++ b/service/synthetics/api_op_CreateCanary.go @@ -5,7 +5,6 @@ package synthetics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/synthetics/types" smithy "github.com/awslabs/smithy-go" @@ -39,9 +38,9 @@ func (c *Client) CreateCanary(ctx context.Context, params *CreateCanaryInput, op addawsRestjson1_serdeOpCreateCanaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/synthetics/api_op_DeleteCanary.go b/service/synthetics/api_op_DeleteCanary.go index 8edf34bb40b..55204901b40 100644 --- a/service/synthetics/api_op_DeleteCanary.go +++ b/service/synthetics/api_op_DeleteCanary.go @@ -5,7 +5,6 @@ package synthetics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -48,9 +47,9 @@ func (c *Client) DeleteCanary(ctx context.Context, params *DeleteCanaryInput, op addawsRestjson1_serdeOpDeleteCanaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/synthetics/api_op_DescribeCanaries.go b/service/synthetics/api_op_DescribeCanaries.go index dd776cd63ae..b654e565cf7 100644 --- a/service/synthetics/api_op_DescribeCanaries.go +++ b/service/synthetics/api_op_DescribeCanaries.go @@ -5,7 +5,6 @@ package synthetics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/synthetics/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeCanaries(ctx context.Context, params *DescribeCanariesI addawsRestjson1_serdeOpDescribeCanariesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/synthetics/api_op_DescribeCanariesLastRun.go b/service/synthetics/api_op_DescribeCanariesLastRun.go index 932a74e70a6..8a9ccd6900c 100644 --- a/service/synthetics/api_op_DescribeCanariesLastRun.go +++ b/service/synthetics/api_op_DescribeCanariesLastRun.go @@ -5,7 +5,6 @@ package synthetics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/synthetics/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeCanariesLastRun(ctx context.Context, params *DescribeCa addawsRestjson1_serdeOpDescribeCanariesLastRunMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/synthetics/api_op_DescribeRuntimeVersions.go b/service/synthetics/api_op_DescribeRuntimeVersions.go index 082498a125d..a71478c342a 100644 --- a/service/synthetics/api_op_DescribeRuntimeVersions.go +++ b/service/synthetics/api_op_DescribeRuntimeVersions.go @@ -5,7 +5,6 @@ package synthetics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/synthetics/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeRuntimeVersions(ctx context.Context, params *DescribeRu addawsRestjson1_serdeOpDescribeRuntimeVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/synthetics/api_op_GetCanary.go b/service/synthetics/api_op_GetCanary.go index cde4aa38a15..fcbfdaa9e18 100644 --- a/service/synthetics/api_op_GetCanary.go +++ b/service/synthetics/api_op_GetCanary.go @@ -5,7 +5,6 @@ package synthetics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/synthetics/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetCanary(ctx context.Context, params *GetCanaryInput, optFns . addawsRestjson1_serdeOpGetCanaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/synthetics/api_op_GetCanaryRuns.go b/service/synthetics/api_op_GetCanaryRuns.go index 9404018197c..3489569837a 100644 --- a/service/synthetics/api_op_GetCanaryRuns.go +++ b/service/synthetics/api_op_GetCanaryRuns.go @@ -5,7 +5,6 @@ package synthetics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/synthetics/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetCanaryRuns(ctx context.Context, params *GetCanaryRunsInput, addawsRestjson1_serdeOpGetCanaryRunsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/synthetics/api_op_ListTagsForResource.go b/service/synthetics/api_op_ListTagsForResource.go index db384e3ebba..66188e8e1e0 100644 --- a/service/synthetics/api_op_ListTagsForResource.go +++ b/service/synthetics/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package synthetics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/synthetics/api_op_StartCanary.go b/service/synthetics/api_op_StartCanary.go index 3ebb396ed86..97c53959b41 100644 --- a/service/synthetics/api_op_StartCanary.go +++ b/service/synthetics/api_op_StartCanary.go @@ -5,7 +5,6 @@ package synthetics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) StartCanary(ctx context.Context, params *StartCanaryInput, optF addawsRestjson1_serdeOpStartCanaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/synthetics/api_op_StopCanary.go b/service/synthetics/api_op_StopCanary.go index a75e7f5ae82..de134b0c22b 100644 --- a/service/synthetics/api_op_StopCanary.go +++ b/service/synthetics/api_op_StopCanary.go @@ -5,7 +5,6 @@ package synthetics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) StopCanary(ctx context.Context, params *StopCanaryInput, optFns addawsRestjson1_serdeOpStopCanaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/synthetics/api_op_TagResource.go b/service/synthetics/api_op_TagResource.go index bb7c62bf184..baa921b37ff 100644 --- a/service/synthetics/api_op_TagResource.go +++ b/service/synthetics/api_op_TagResource.go @@ -5,7 +5,6 @@ package synthetics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/synthetics/api_op_UntagResource.go b/service/synthetics/api_op_UntagResource.go index f7930ba5f93..9186ebc222b 100644 --- a/service/synthetics/api_op_UntagResource.go +++ b/service/synthetics/api_op_UntagResource.go @@ -5,7 +5,6 @@ package synthetics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/synthetics/api_op_UpdateCanary.go b/service/synthetics/api_op_UpdateCanary.go index 8d1f4ff6697..b2387cbbfa2 100644 --- a/service/synthetics/api_op_UpdateCanary.go +++ b/service/synthetics/api_op_UpdateCanary.go @@ -5,7 +5,6 @@ package synthetics import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/synthetics/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateCanary(ctx context.Context, params *UpdateCanaryInput, op addawsRestjson1_serdeOpUpdateCanaryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/synthetics/endpoints.go b/service/synthetics/endpoints.go index c5f4f166217..bbfefadb52e 100644 --- a/service/synthetics/endpoints.go +++ b/service/synthetics/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/textract/api_client.go b/service/textract/api_client.go index 9072bef13bd..db4e4b3a9e0 100644 --- a/service/textract/api_client.go +++ b/service/textract/api_client.go @@ -79,30 +79,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -168,6 +144,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/textract/api_op_AnalyzeDocument.go b/service/textract/api_op_AnalyzeDocument.go index 00e11a891d2..8d46b4f85b6 100644 --- a/service/textract/api_op_AnalyzeDocument.go +++ b/service/textract/api_op_AnalyzeDocument.go @@ -5,7 +5,6 @@ package textract import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/textract/types" smithy "github.com/awslabs/smithy-go" @@ -51,9 +50,9 @@ func (c *Client) AnalyzeDocument(ctx context.Context, params *AnalyzeDocumentInp addawsAwsjson11_serdeOpAnalyzeDocumentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/textract/api_op_DetectDocumentText.go b/service/textract/api_op_DetectDocumentText.go index d63c96f5544..6dee123bc1c 100644 --- a/service/textract/api_op_DetectDocumentText.go +++ b/service/textract/api_op_DetectDocumentText.go @@ -5,7 +5,6 @@ package textract import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/textract/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) DetectDocumentText(ctx context.Context, params *DetectDocumentT addawsAwsjson11_serdeOpDetectDocumentTextMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/textract/api_op_GetDocumentAnalysis.go b/service/textract/api_op_GetDocumentAnalysis.go index 149efc3ae4b..ba7910d72a3 100644 --- a/service/textract/api_op_GetDocumentAnalysis.go +++ b/service/textract/api_op_GetDocumentAnalysis.go @@ -5,7 +5,6 @@ package textract import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/textract/types" smithy "github.com/awslabs/smithy-go" @@ -63,9 +62,9 @@ func (c *Client) GetDocumentAnalysis(ctx context.Context, params *GetDocumentAna addawsAwsjson11_serdeOpGetDocumentAnalysisMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/textract/api_op_GetDocumentTextDetection.go b/service/textract/api_op_GetDocumentTextDetection.go index b54718a2d85..de541002fb5 100644 --- a/service/textract/api_op_GetDocumentTextDetection.go +++ b/service/textract/api_op_GetDocumentTextDetection.go @@ -5,7 +5,6 @@ package textract import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/textract/types" smithy "github.com/awslabs/smithy-go" @@ -46,9 +45,9 @@ func (c *Client) GetDocumentTextDetection(ctx context.Context, params *GetDocume addawsAwsjson11_serdeOpGetDocumentTextDetectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/textract/api_op_StartDocumentAnalysis.go b/service/textract/api_op_StartDocumentAnalysis.go index aeb53df5046..218fc78e584 100644 --- a/service/textract/api_op_StartDocumentAnalysis.go +++ b/service/textract/api_op_StartDocumentAnalysis.go @@ -5,7 +5,6 @@ package textract import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/textract/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) StartDocumentAnalysis(ctx context.Context, params *StartDocumen addawsAwsjson11_serdeOpStartDocumentAnalysisMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/textract/api_op_StartDocumentTextDetection.go b/service/textract/api_op_StartDocumentTextDetection.go index 22af0318168..59ac07ed3ce 100644 --- a/service/textract/api_op_StartDocumentTextDetection.go +++ b/service/textract/api_op_StartDocumentTextDetection.go @@ -5,7 +5,6 @@ package textract import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/textract/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) StartDocumentTextDetection(ctx context.Context, params *StartDo addawsAwsjson11_serdeOpStartDocumentTextDetectionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/textract/endpoints.go b/service/textract/endpoints.go index 1cb48ce8613..95604a66113 100644 --- a/service/textract/endpoints.go +++ b/service/textract/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/transcribe/api_client.go b/service/transcribe/api_client.go index 38513b89f4c..988199a5eee 100644 --- a/service/transcribe/api_client.go +++ b/service/transcribe/api_client.go @@ -77,30 +77,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -166,6 +142,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/transcribe/api_op_CreateMedicalVocabulary.go b/service/transcribe/api_op_CreateMedicalVocabulary.go index 3668b821a4c..53b3b44917a 100644 --- a/service/transcribe/api_op_CreateMedicalVocabulary.go +++ b/service/transcribe/api_op_CreateMedicalVocabulary.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transcribe/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateMedicalVocabulary(ctx context.Context, params *CreateMedi addawsAwsjson11_serdeOpCreateMedicalVocabularyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_CreateVocabulary.go b/service/transcribe/api_op_CreateVocabulary.go index 7f3330cc3e1..f2d05d0bfff 100644 --- a/service/transcribe/api_op_CreateVocabulary.go +++ b/service/transcribe/api_op_CreateVocabulary.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transcribe/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateVocabulary(ctx context.Context, params *CreateVocabularyI addawsAwsjson11_serdeOpCreateVocabularyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_CreateVocabularyFilter.go b/service/transcribe/api_op_CreateVocabularyFilter.go index 40bf3904363..594eb24d132 100644 --- a/service/transcribe/api_op_CreateVocabularyFilter.go +++ b/service/transcribe/api_op_CreateVocabularyFilter.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transcribe/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) CreateVocabularyFilter(ctx context.Context, params *CreateVocab addawsAwsjson11_serdeOpCreateVocabularyFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_DeleteMedicalTranscriptionJob.go b/service/transcribe/api_op_DeleteMedicalTranscriptionJob.go index 43fc6825aa8..9df93657791 100644 --- a/service/transcribe/api_op_DeleteMedicalTranscriptionJob.go +++ b/service/transcribe/api_op_DeleteMedicalTranscriptionJob.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteMedicalTranscriptionJob(ctx context.Context, params *Dele addawsAwsjson11_serdeOpDeleteMedicalTranscriptionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_DeleteMedicalVocabulary.go b/service/transcribe/api_op_DeleteMedicalVocabulary.go index 56565195f09..7bf3bd51a04 100644 --- a/service/transcribe/api_op_DeleteMedicalVocabulary.go +++ b/service/transcribe/api_op_DeleteMedicalVocabulary.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteMedicalVocabulary(ctx context.Context, params *DeleteMedi addawsAwsjson11_serdeOpDeleteMedicalVocabularyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_DeleteTranscriptionJob.go b/service/transcribe/api_op_DeleteTranscriptionJob.go index a252eea7611..054fdd717e3 100644 --- a/service/transcribe/api_op_DeleteTranscriptionJob.go +++ b/service/transcribe/api_op_DeleteTranscriptionJob.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteTranscriptionJob(ctx context.Context, params *DeleteTrans addawsAwsjson11_serdeOpDeleteTranscriptionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_DeleteVocabulary.go b/service/transcribe/api_op_DeleteVocabulary.go index b89d9e1eec2..8a33468c579 100644 --- a/service/transcribe/api_op_DeleteVocabulary.go +++ b/service/transcribe/api_op_DeleteVocabulary.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteVocabulary(ctx context.Context, params *DeleteVocabularyI addawsAwsjson11_serdeOpDeleteVocabularyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_DeleteVocabularyFilter.go b/service/transcribe/api_op_DeleteVocabularyFilter.go index a3176ca394b..c3ebaba0462 100644 --- a/service/transcribe/api_op_DeleteVocabularyFilter.go +++ b/service/transcribe/api_op_DeleteVocabularyFilter.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteVocabularyFilter(ctx context.Context, params *DeleteVocab addawsAwsjson11_serdeOpDeleteVocabularyFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_GetMedicalTranscriptionJob.go b/service/transcribe/api_op_GetMedicalTranscriptionJob.go index 9e7487e2252..dd43fc83f0e 100644 --- a/service/transcribe/api_op_GetMedicalTranscriptionJob.go +++ b/service/transcribe/api_op_GetMedicalTranscriptionJob.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transcribe/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) GetMedicalTranscriptionJob(ctx context.Context, params *GetMedi addawsAwsjson11_serdeOpGetMedicalTranscriptionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_GetMedicalVocabulary.go b/service/transcribe/api_op_GetMedicalVocabulary.go index 84e926087f3..9c51068c80d 100644 --- a/service/transcribe/api_op_GetMedicalVocabulary.go +++ b/service/transcribe/api_op_GetMedicalVocabulary.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transcribe/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetMedicalVocabulary(ctx context.Context, params *GetMedicalVoc addawsAwsjson11_serdeOpGetMedicalVocabularyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_GetTranscriptionJob.go b/service/transcribe/api_op_GetTranscriptionJob.go index cbb4ec005e6..0bbbeda3c39 100644 --- a/service/transcribe/api_op_GetTranscriptionJob.go +++ b/service/transcribe/api_op_GetTranscriptionJob.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transcribe/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetTranscriptionJob(ctx context.Context, params *GetTranscripti addawsAwsjson11_serdeOpGetTranscriptionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_GetVocabulary.go b/service/transcribe/api_op_GetVocabulary.go index 6bd711323d8..075396be130 100644 --- a/service/transcribe/api_op_GetVocabulary.go +++ b/service/transcribe/api_op_GetVocabulary.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transcribe/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetVocabulary(ctx context.Context, params *GetVocabularyInput, addawsAwsjson11_serdeOpGetVocabularyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_GetVocabularyFilter.go b/service/transcribe/api_op_GetVocabularyFilter.go index 7fc3977053b..1ca7b534e04 100644 --- a/service/transcribe/api_op_GetVocabularyFilter.go +++ b/service/transcribe/api_op_GetVocabularyFilter.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transcribe/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetVocabularyFilter(ctx context.Context, params *GetVocabularyF addawsAwsjson11_serdeOpGetVocabularyFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_ListMedicalTranscriptionJobs.go b/service/transcribe/api_op_ListMedicalTranscriptionJobs.go index 6667a66b051..9ba3f93e09a 100644 --- a/service/transcribe/api_op_ListMedicalTranscriptionJobs.go +++ b/service/transcribe/api_op_ListMedicalTranscriptionJobs.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transcribe/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListMedicalTranscriptionJobs(ctx context.Context, params *ListM addawsAwsjson11_serdeOpListMedicalTranscriptionJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_ListMedicalVocabularies.go b/service/transcribe/api_op_ListMedicalVocabularies.go index cf78ca79779..9dc916ac9c5 100644 --- a/service/transcribe/api_op_ListMedicalVocabularies.go +++ b/service/transcribe/api_op_ListMedicalVocabularies.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transcribe/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ListMedicalVocabularies(ctx context.Context, params *ListMedica addawsAwsjson11_serdeOpListMedicalVocabulariesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_ListTranscriptionJobs.go b/service/transcribe/api_op_ListTranscriptionJobs.go index 3b61fef2f58..3ea0b12c0b4 100644 --- a/service/transcribe/api_op_ListTranscriptionJobs.go +++ b/service/transcribe/api_op_ListTranscriptionJobs.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transcribe/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTranscriptionJobs(ctx context.Context, params *ListTranscri addawsAwsjson11_serdeOpListTranscriptionJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_ListVocabularies.go b/service/transcribe/api_op_ListVocabularies.go index 2d5c5caa778..6ce61dee3ab 100644 --- a/service/transcribe/api_op_ListVocabularies.go +++ b/service/transcribe/api_op_ListVocabularies.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transcribe/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListVocabularies(ctx context.Context, params *ListVocabulariesI addawsAwsjson11_serdeOpListVocabulariesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_ListVocabularyFilters.go b/service/transcribe/api_op_ListVocabularyFilters.go index 6ae40de32f4..3d230ab5e9a 100644 --- a/service/transcribe/api_op_ListVocabularyFilters.go +++ b/service/transcribe/api_op_ListVocabularyFilters.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transcribe/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListVocabularyFilters(ctx context.Context, params *ListVocabula addawsAwsjson11_serdeOpListVocabularyFiltersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_StartMedicalTranscriptionJob.go b/service/transcribe/api_op_StartMedicalTranscriptionJob.go index 5734b33ea3d..4e71c3d5bdc 100644 --- a/service/transcribe/api_op_StartMedicalTranscriptionJob.go +++ b/service/transcribe/api_op_StartMedicalTranscriptionJob.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transcribe/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StartMedicalTranscriptionJob(ctx context.Context, params *Start addawsAwsjson11_serdeOpStartMedicalTranscriptionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_StartTranscriptionJob.go b/service/transcribe/api_op_StartTranscriptionJob.go index e1ac9f213e2..e1a5a6df67d 100644 --- a/service/transcribe/api_op_StartTranscriptionJob.go +++ b/service/transcribe/api_op_StartTranscriptionJob.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transcribe/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) StartTranscriptionJob(ctx context.Context, params *StartTranscr addawsAwsjson11_serdeOpStartTranscriptionJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_UpdateMedicalVocabulary.go b/service/transcribe/api_op_UpdateMedicalVocabulary.go index 70b504fe0cc..c72ec172362 100644 --- a/service/transcribe/api_op_UpdateMedicalVocabulary.go +++ b/service/transcribe/api_op_UpdateMedicalVocabulary.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transcribe/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateMedicalVocabulary(ctx context.Context, params *UpdateMedi addawsAwsjson11_serdeOpUpdateMedicalVocabularyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_UpdateVocabulary.go b/service/transcribe/api_op_UpdateVocabulary.go index 1874d8f2ec0..43b8dea053b 100644 --- a/service/transcribe/api_op_UpdateVocabulary.go +++ b/service/transcribe/api_op_UpdateVocabulary.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transcribe/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateVocabulary(ctx context.Context, params *UpdateVocabularyI addawsAwsjson11_serdeOpUpdateVocabularyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/api_op_UpdateVocabularyFilter.go b/service/transcribe/api_op_UpdateVocabularyFilter.go index 8821f2b417f..5198baf3912 100644 --- a/service/transcribe/api_op_UpdateVocabularyFilter.go +++ b/service/transcribe/api_op_UpdateVocabularyFilter.go @@ -5,7 +5,6 @@ package transcribe import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transcribe/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateVocabularyFilter(ctx context.Context, params *UpdateVocab addawsAwsjson11_serdeOpUpdateVocabularyFilterMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transcribe/endpoints.go b/service/transcribe/endpoints.go index ceab5d89602..6d2907fff45 100644 --- a/service/transcribe/endpoints.go +++ b/service/transcribe/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/transfer/api_client.go b/service/transfer/api_client.go index 33531736330..779876aa7a0 100644 --- a/service/transfer/api_client.go +++ b/service/transfer/api_client.go @@ -86,30 +86,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -175,6 +151,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/transfer/api_op_CreateServer.go b/service/transfer/api_op_CreateServer.go index 240f75500a6..6c537af4fb2 100644 --- a/service/transfer/api_op_CreateServer.go +++ b/service/transfer/api_op_CreateServer.go @@ -5,7 +5,6 @@ package transfer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transfer/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) CreateServer(ctx context.Context, params *CreateServerInput, op addawsAwsjson11_serdeOpCreateServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transfer/api_op_CreateUser.go b/service/transfer/api_op_CreateUser.go index db042af73a2..984518732b6 100644 --- a/service/transfer/api_op_CreateUser.go +++ b/service/transfer/api_op_CreateUser.go @@ -5,7 +5,6 @@ package transfer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transfer/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateUser(ctx context.Context, params *CreateUserInput, optFns addawsAwsjson11_serdeOpCreateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transfer/api_op_DeleteServer.go b/service/transfer/api_op_DeleteServer.go index feb87a38887..127a2a79e19 100644 --- a/service/transfer/api_op_DeleteServer.go +++ b/service/transfer/api_op_DeleteServer.go @@ -5,7 +5,6 @@ package transfer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteServer(ctx context.Context, params *DeleteServerInput, op addawsAwsjson11_serdeOpDeleteServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transfer/api_op_DeleteSshPublicKey.go b/service/transfer/api_op_DeleteSshPublicKey.go index 7c798ce5470..d93f2c9efbf 100644 --- a/service/transfer/api_op_DeleteSshPublicKey.go +++ b/service/transfer/api_op_DeleteSshPublicKey.go @@ -5,7 +5,6 @@ package transfer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteSshPublicKey(ctx context.Context, params *DeleteSshPublic addawsAwsjson11_serdeOpDeleteSshPublicKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transfer/api_op_DeleteUser.go b/service/transfer/api_op_DeleteUser.go index 2782f60b914..7e56d8f339e 100644 --- a/service/transfer/api_op_DeleteUser.go +++ b/service/transfer/api_op_DeleteUser.go @@ -5,7 +5,6 @@ package transfer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteUser(ctx context.Context, params *DeleteUserInput, optFns addawsAwsjson11_serdeOpDeleteUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transfer/api_op_DescribeServer.go b/service/transfer/api_op_DescribeServer.go index aff610575fc..1d3363f0898 100644 --- a/service/transfer/api_op_DescribeServer.go +++ b/service/transfer/api_op_DescribeServer.go @@ -5,7 +5,6 @@ package transfer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transfer/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeServer(ctx context.Context, params *DescribeServerInput addawsAwsjson11_serdeOpDescribeServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transfer/api_op_DescribeUser.go b/service/transfer/api_op_DescribeUser.go index 71f5daf8ac0..468795d6017 100644 --- a/service/transfer/api_op_DescribeUser.go +++ b/service/transfer/api_op_DescribeUser.go @@ -5,7 +5,6 @@ package transfer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transfer/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeUser(ctx context.Context, params *DescribeUserInput, op addawsAwsjson11_serdeOpDescribeUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transfer/api_op_ImportSshPublicKey.go b/service/transfer/api_op_ImportSshPublicKey.go index 2791b5382b2..bc26d9e3bce 100644 --- a/service/transfer/api_op_ImportSshPublicKey.go +++ b/service/transfer/api_op_ImportSshPublicKey.go @@ -5,7 +5,6 @@ package transfer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) ImportSshPublicKey(ctx context.Context, params *ImportSshPublic addawsAwsjson11_serdeOpImportSshPublicKeyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transfer/api_op_ListServers.go b/service/transfer/api_op_ListServers.go index 5feff94ffed..46dbbc8ef8f 100644 --- a/service/transfer/api_op_ListServers.go +++ b/service/transfer/api_op_ListServers.go @@ -5,7 +5,6 @@ package transfer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transfer/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListServers(ctx context.Context, params *ListServersInput, optF addawsAwsjson11_serdeOpListServersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transfer/api_op_ListTagsForResource.go b/service/transfer/api_op_ListTagsForResource.go index a8b3dff311c..c91fe4a7213 100644 --- a/service/transfer/api_op_ListTagsForResource.go +++ b/service/transfer/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package transfer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transfer/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transfer/api_op_ListUsers.go b/service/transfer/api_op_ListUsers.go index a42d7ec1265..18a2334c854 100644 --- a/service/transfer/api_op_ListUsers.go +++ b/service/transfer/api_op_ListUsers.go @@ -5,7 +5,6 @@ package transfer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transfer/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListUsers(ctx context.Context, params *ListUsersInput, optFns . addawsAwsjson11_serdeOpListUsersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transfer/api_op_StartServer.go b/service/transfer/api_op_StartServer.go index 830c1d3bac0..ddf8004dd0d 100644 --- a/service/transfer/api_op_StartServer.go +++ b/service/transfer/api_op_StartServer.go @@ -5,7 +5,6 @@ package transfer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) StartServer(ctx context.Context, params *StartServerInput, optF addawsAwsjson11_serdeOpStartServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transfer/api_op_StopServer.go b/service/transfer/api_op_StopServer.go index 1a949ba6ec8..445b250c702 100644 --- a/service/transfer/api_op_StopServer.go +++ b/service/transfer/api_op_StopServer.go @@ -5,7 +5,6 @@ package transfer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) StopServer(ctx context.Context, params *StopServerInput, optFns addawsAwsjson11_serdeOpStopServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transfer/api_op_TagResource.go b/service/transfer/api_op_TagResource.go index 00aa7d59b24..e602bac9356 100644 --- a/service/transfer/api_op_TagResource.go +++ b/service/transfer/api_op_TagResource.go @@ -5,7 +5,6 @@ package transfer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transfer/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transfer/api_op_TestIdentityProvider.go b/service/transfer/api_op_TestIdentityProvider.go index e6ec78772f3..f22c0685b5d 100644 --- a/service/transfer/api_op_TestIdentityProvider.go +++ b/service/transfer/api_op_TestIdentityProvider.go @@ -5,7 +5,6 @@ package transfer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transfer/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) TestIdentityProvider(ctx context.Context, params *TestIdentityP addawsAwsjson11_serdeOpTestIdentityProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transfer/api_op_UntagResource.go b/service/transfer/api_op_UntagResource.go index 52d9c0e6530..2bc11568616 100644 --- a/service/transfer/api_op_UntagResource.go +++ b/service/transfer/api_op_UntagResource.go @@ -5,7 +5,6 @@ package transfer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transfer/api_op_UpdateServer.go b/service/transfer/api_op_UpdateServer.go index 438b0daa7f7..e337ee9393d 100644 --- a/service/transfer/api_op_UpdateServer.go +++ b/service/transfer/api_op_UpdateServer.go @@ -5,7 +5,6 @@ package transfer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transfer/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateServer(ctx context.Context, params *UpdateServerInput, op addawsAwsjson11_serdeOpUpdateServerMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transfer/api_op_UpdateUser.go b/service/transfer/api_op_UpdateUser.go index 089b94757ed..1f1d0324f1b 100644 --- a/service/transfer/api_op_UpdateUser.go +++ b/service/transfer/api_op_UpdateUser.go @@ -5,7 +5,6 @@ package transfer import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/transfer/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateUser(ctx context.Context, params *UpdateUserInput, optFns addawsAwsjson11_serdeOpUpdateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/transfer/endpoints.go b/service/transfer/endpoints.go index c47fe00ca19..24eaea5b65b 100644 --- a/service/transfer/endpoints.go +++ b/service/transfer/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/translate/api_client.go b/service/translate/api_client.go index ae6d055e937..f03f5fd4717 100644 --- a/service/translate/api_client.go +++ b/service/translate/api_client.go @@ -86,34 +86,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetIdempotencyTokenProvider() IdempotencyTokenProvider { - return o.IdempotencyTokenProvider -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -186,6 +158,13 @@ func resolveIdempotencyTokenProvider(o *Options) { o.IdempotencyTokenProvider = smithyrand.NewUUIDIdempotencyToken(cryptorand.Reader) } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + // IdempotencyTokenProvider interface for providing idempotency token type IdempotencyTokenProvider interface { GetIdempotencyToken() (string, error) diff --git a/service/translate/api_op_DeleteTerminology.go b/service/translate/api_op_DeleteTerminology.go index 8ccf372b42a..c2b3c36727f 100644 --- a/service/translate/api_op_DeleteTerminology.go +++ b/service/translate/api_op_DeleteTerminology.go @@ -5,7 +5,6 @@ package translate import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteTerminology(ctx context.Context, params *DeleteTerminolog addawsAwsjson11_serdeOpDeleteTerminologyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/translate/api_op_DescribeTextTranslationJob.go b/service/translate/api_op_DescribeTextTranslationJob.go index a623d034f89..cc2225b391d 100644 --- a/service/translate/api_op_DescribeTextTranslationJob.go +++ b/service/translate/api_op_DescribeTextTranslationJob.go @@ -5,7 +5,6 @@ package translate import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/translate/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeTextTranslationJob(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeTextTranslationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/translate/api_op_GetTerminology.go b/service/translate/api_op_GetTerminology.go index eb53995690f..b34a24f4735 100644 --- a/service/translate/api_op_GetTerminology.go +++ b/service/translate/api_op_GetTerminology.go @@ -5,7 +5,6 @@ package translate import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/translate/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetTerminology(ctx context.Context, params *GetTerminologyInput addawsAwsjson11_serdeOpGetTerminologyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/translate/api_op_ImportTerminology.go b/service/translate/api_op_ImportTerminology.go index 129e9b70a91..110988f6376 100644 --- a/service/translate/api_op_ImportTerminology.go +++ b/service/translate/api_op_ImportTerminology.go @@ -5,7 +5,6 @@ package translate import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/translate/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) ImportTerminology(ctx context.Context, params *ImportTerminolog addawsAwsjson11_serdeOpImportTerminologyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/translate/api_op_ListTerminologies.go b/service/translate/api_op_ListTerminologies.go index 4ba0ce9f818..28e3f7a6268 100644 --- a/service/translate/api_op_ListTerminologies.go +++ b/service/translate/api_op_ListTerminologies.go @@ -5,7 +5,6 @@ package translate import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/translate/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTerminologies(ctx context.Context, params *ListTerminologie addawsAwsjson11_serdeOpListTerminologiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/translate/api_op_ListTextTranslationJobs.go b/service/translate/api_op_ListTextTranslationJobs.go index 7dfa8fc6bcc..20c036cd277 100644 --- a/service/translate/api_op_ListTextTranslationJobs.go +++ b/service/translate/api_op_ListTextTranslationJobs.go @@ -5,7 +5,6 @@ package translate import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/translate/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListTextTranslationJobs(ctx context.Context, params *ListTextTr addawsAwsjson11_serdeOpListTextTranslationJobsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/translate/api_op_StartTextTranslationJob.go b/service/translate/api_op_StartTextTranslationJob.go index 39b891ebf2c..9c8c5faf602 100644 --- a/service/translate/api_op_StartTextTranslationJob.go +++ b/service/translate/api_op_StartTextTranslationJob.go @@ -6,7 +6,6 @@ import ( "context" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/translate/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) StartTextTranslationJob(ctx context.Context, params *StartTextT addawsAwsjson11_serdeOpStartTextTranslationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/translate/api_op_StopTextTranslationJob.go b/service/translate/api_op_StopTextTranslationJob.go index a78194c40e9..ca2d560c1aa 100644 --- a/service/translate/api_op_StopTextTranslationJob.go +++ b/service/translate/api_op_StopTextTranslationJob.go @@ -5,7 +5,6 @@ package translate import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/translate/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) StopTextTranslationJob(ctx context.Context, params *StopTextTra addawsAwsjson11_serdeOpStopTextTranslationJobMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/translate/api_op_TranslateText.go b/service/translate/api_op_TranslateText.go index 356d50cb25f..9888804344a 100644 --- a/service/translate/api_op_TranslateText.go +++ b/service/translate/api_op_TranslateText.go @@ -5,7 +5,6 @@ package translate import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/translate/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) TranslateText(ctx context.Context, params *TranslateTextInput, addawsAwsjson11_serdeOpTranslateTextMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/translate/endpoints.go b/service/translate/endpoints.go index 4e30b6c1085..dbde33096f1 100644 --- a/service/translate/endpoints.go +++ b/service/translate/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/waf/api_client.go b/service/waf/api_client.go index 421dde7d0f2..a948444696e 100644 --- a/service/waf/api_client.go +++ b/service/waf/api_client.go @@ -92,30 +92,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -181,6 +157,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/waf/api_op_CreateByteMatchSet.go b/service/waf/api_op_CreateByteMatchSet.go index ef9151ac81c..61a7b7ee24e 100644 --- a/service/waf/api_op_CreateByteMatchSet.go +++ b/service/waf/api_op_CreateByteMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -53,9 +52,9 @@ func (c *Client) CreateByteMatchSet(ctx context.Context, params *CreateByteMatch addawsAwsjson11_serdeOpCreateByteMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_CreateGeoMatchSet.go b/service/waf/api_op_CreateGeoMatchSet.go index ef4cb6e9b99..5bf224e82d4 100644 --- a/service/waf/api_op_CreateGeoMatchSet.go +++ b/service/waf/api_op_CreateGeoMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -52,9 +51,9 @@ func (c *Client) CreateGeoMatchSet(ctx context.Context, params *CreateGeoMatchSe addawsAwsjson11_serdeOpCreateGeoMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_CreateIPSet.go b/service/waf/api_op_CreateIPSet.go index e8304ebd030..6e444f556b7 100644 --- a/service/waf/api_op_CreateIPSet.go +++ b/service/waf/api_op_CreateIPSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -52,9 +51,9 @@ func (c *Client) CreateIPSet(ctx context.Context, params *CreateIPSetInput, optF addawsAwsjson11_serdeOpCreateIPSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_CreateRateBasedRule.go b/service/waf/api_op_CreateRateBasedRule.go index af8929eaaf1..b744830c4e4 100644 --- a/service/waf/api_op_CreateRateBasedRule.go +++ b/service/waf/api_op_CreateRateBasedRule.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -77,9 +76,9 @@ func (c *Client) CreateRateBasedRule(ctx context.Context, params *CreateRateBase addawsAwsjson11_serdeOpCreateRateBasedRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_CreateRegexMatchSet.go b/service/waf/api_op_CreateRegexMatchSet.go index 4da5c4fae0f..1d7785629f5 100644 --- a/service/waf/api_op_CreateRegexMatchSet.go +++ b/service/waf/api_op_CreateRegexMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -54,9 +53,9 @@ func (c *Client) CreateRegexMatchSet(ctx context.Context, params *CreateRegexMat addawsAwsjson11_serdeOpCreateRegexMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_CreateRegexPatternSet.go b/service/waf/api_op_CreateRegexPatternSet.go index 5003ec65327..b0395c668dd 100644 --- a/service/waf/api_op_CreateRegexPatternSet.go +++ b/service/waf/api_op_CreateRegexPatternSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -50,9 +49,9 @@ func (c *Client) CreateRegexPatternSet(ctx context.Context, params *CreateRegexP addawsAwsjson11_serdeOpCreateRegexPatternSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_CreateRule.go b/service/waf/api_op_CreateRule.go index 2843d1fb5d2..92e3c5c847f 100644 --- a/service/waf/api_op_CreateRule.go +++ b/service/waf/api_op_CreateRule.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -69,9 +68,9 @@ func (c *Client) CreateRule(ctx context.Context, params *CreateRuleInput, optFns addawsAwsjson11_serdeOpCreateRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_CreateRuleGroup.go b/service/waf/api_op_CreateRuleGroup.go index b12e710808f..4c6227dcc0f 100644 --- a/service/waf/api_op_CreateRuleGroup.go +++ b/service/waf/api_op_CreateRuleGroup.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) CreateRuleGroup(ctx context.Context, params *CreateRuleGroupInp addawsAwsjson11_serdeOpCreateRuleGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_CreateSizeConstraintSet.go b/service/waf/api_op_CreateSizeConstraintSet.go index b10872ad4f6..3a37949f676 100644 --- a/service/waf/api_op_CreateSizeConstraintSet.go +++ b/service/waf/api_op_CreateSizeConstraintSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -54,9 +53,9 @@ func (c *Client) CreateSizeConstraintSet(ctx context.Context, params *CreateSize addawsAwsjson11_serdeOpCreateSizeConstraintSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_CreateSqlInjectionMatchSet.go b/service/waf/api_op_CreateSqlInjectionMatchSet.go index e5d36ef5ad7..ac9036c1d19 100644 --- a/service/waf/api_op_CreateSqlInjectionMatchSet.go +++ b/service/waf/api_op_CreateSqlInjectionMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -52,9 +51,9 @@ func (c *Client) CreateSqlInjectionMatchSet(ctx context.Context, params *CreateS addawsAwsjson11_serdeOpCreateSqlInjectionMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_CreateWebACL.go b/service/waf/api_op_CreateWebACL.go index 67bd5a6611c..04f80a8a71d 100644 --- a/service/waf/api_op_CreateWebACL.go +++ b/service/waf/api_op_CreateWebACL.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -63,9 +62,9 @@ func (c *Client) CreateWebACL(ctx context.Context, params *CreateWebACLInput, op addawsAwsjson11_serdeOpCreateWebACLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_CreateWebACLMigrationStack.go b/service/waf/api_op_CreateWebACLMigrationStack.go index 8fbdfa45585..d648532b563 100644 --- a/service/waf/api_op_CreateWebACLMigrationStack.go +++ b/service/waf/api_op_CreateWebACLMigrationStack.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) CreateWebACLMigrationStack(ctx context.Context, params *CreateW addawsAwsjson11_serdeOpCreateWebACLMigrationStackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_CreateXssMatchSet.go b/service/waf/api_op_CreateXssMatchSet.go index 74500f68bc4..4f4edff5804 100644 --- a/service/waf/api_op_CreateXssMatchSet.go +++ b/service/waf/api_op_CreateXssMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -51,9 +50,9 @@ func (c *Client) CreateXssMatchSet(ctx context.Context, params *CreateXssMatchSe addawsAwsjson11_serdeOpCreateXssMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_DeleteByteMatchSet.go b/service/waf/api_op_DeleteByteMatchSet.go index c12f5a3b627..d458861bfc6 100644 --- a/service/waf/api_op_DeleteByteMatchSet.go +++ b/service/waf/api_op_DeleteByteMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -42,9 +41,9 @@ func (c *Client) DeleteByteMatchSet(ctx context.Context, params *DeleteByteMatch addawsAwsjson11_serdeOpDeleteByteMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_DeleteGeoMatchSet.go b/service/waf/api_op_DeleteGeoMatchSet.go index 31758818992..856f4570f9f 100644 --- a/service/waf/api_op_DeleteGeoMatchSet.go +++ b/service/waf/api_op_DeleteGeoMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) DeleteGeoMatchSet(ctx context.Context, params *DeleteGeoMatchSe addawsAwsjson11_serdeOpDeleteGeoMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_DeleteIPSet.go b/service/waf/api_op_DeleteIPSet.go index e848c62e103..769734eb8f2 100644 --- a/service/waf/api_op_DeleteIPSet.go +++ b/service/waf/api_op_DeleteIPSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) DeleteIPSet(ctx context.Context, params *DeleteIPSetInput, optF addawsAwsjson11_serdeOpDeleteIPSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_DeleteLoggingConfiguration.go b/service/waf/api_op_DeleteLoggingConfiguration.go index 1796c497225..f63caf9e327 100644 --- a/service/waf/api_op_DeleteLoggingConfiguration.go +++ b/service/waf/api_op_DeleteLoggingConfiguration.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DeleteLoggingConfiguration(ctx context.Context, params *DeleteL addawsAwsjson11_serdeOpDeleteLoggingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_DeletePermissionPolicy.go b/service/waf/api_op_DeletePermissionPolicy.go index 6fe9ae37517..6d70d00b950 100644 --- a/service/waf/api_op_DeletePermissionPolicy.go +++ b/service/waf/api_op_DeletePermissionPolicy.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DeletePermissionPolicy(ctx context.Context, params *DeletePermi addawsAwsjson11_serdeOpDeletePermissionPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_DeleteRateBasedRule.go b/service/waf/api_op_DeleteRateBasedRule.go index 568652b60ed..7d78ffef2fc 100644 --- a/service/waf/api_op_DeleteRateBasedRule.go +++ b/service/waf/api_op_DeleteRateBasedRule.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) DeleteRateBasedRule(ctx context.Context, params *DeleteRateBase addawsAwsjson11_serdeOpDeleteRateBasedRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_DeleteRegexMatchSet.go b/service/waf/api_op_DeleteRegexMatchSet.go index f16cda5f297..e52e6ff40f3 100644 --- a/service/waf/api_op_DeleteRegexMatchSet.go +++ b/service/waf/api_op_DeleteRegexMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -42,9 +41,9 @@ func (c *Client) DeleteRegexMatchSet(ctx context.Context, params *DeleteRegexMat addawsAwsjson11_serdeOpDeleteRegexMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_DeleteRegexPatternSet.go b/service/waf/api_op_DeleteRegexPatternSet.go index a523b4b685d..f526b5c4b74 100644 --- a/service/waf/api_op_DeleteRegexPatternSet.go +++ b/service/waf/api_op_DeleteRegexPatternSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) DeleteRegexPatternSet(ctx context.Context, params *DeleteRegexP addawsAwsjson11_serdeOpDeleteRegexPatternSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_DeleteRule.go b/service/waf/api_op_DeleteRule.go index 55dfaf8b0fc..35c288acb5d 100644 --- a/service/waf/api_op_DeleteRule.go +++ b/service/waf/api_op_DeleteRule.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) DeleteRule(ctx context.Context, params *DeleteRuleInput, optFns addawsAwsjson11_serdeOpDeleteRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_DeleteRuleGroup.go b/service/waf/api_op_DeleteRuleGroup.go index be902d172b8..cb373b00d30 100644 --- a/service/waf/api_op_DeleteRuleGroup.go +++ b/service/waf/api_op_DeleteRuleGroup.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) DeleteRuleGroup(ctx context.Context, params *DeleteRuleGroupInp addawsAwsjson11_serdeOpDeleteRuleGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_DeleteSizeConstraintSet.go b/service/waf/api_op_DeleteSizeConstraintSet.go index 41b108d62b9..74ba3996249 100644 --- a/service/waf/api_op_DeleteSizeConstraintSet.go +++ b/service/waf/api_op_DeleteSizeConstraintSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -42,9 +41,9 @@ func (c *Client) DeleteSizeConstraintSet(ctx context.Context, params *DeleteSize addawsAwsjson11_serdeOpDeleteSizeConstraintSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_DeleteSqlInjectionMatchSet.go b/service/waf/api_op_DeleteSqlInjectionMatchSet.go index 492e18c6b2b..b5e8bb98528 100644 --- a/service/waf/api_op_DeleteSqlInjectionMatchSet.go +++ b/service/waf/api_op_DeleteSqlInjectionMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -43,9 +42,9 @@ func (c *Client) DeleteSqlInjectionMatchSet(ctx context.Context, params *DeleteS addawsAwsjson11_serdeOpDeleteSqlInjectionMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_DeleteWebACL.go b/service/waf/api_op_DeleteWebACL.go index ead1d9f8da1..a728fe1158f 100644 --- a/service/waf/api_op_DeleteWebACL.go +++ b/service/waf/api_op_DeleteWebACL.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -39,9 +38,9 @@ func (c *Client) DeleteWebACL(ctx context.Context, params *DeleteWebACLInput, op addawsAwsjson11_serdeOpDeleteWebACLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_DeleteXssMatchSet.go b/service/waf/api_op_DeleteXssMatchSet.go index 71ad6c8b94f..557810e7896 100644 --- a/service/waf/api_op_DeleteXssMatchSet.go +++ b/service/waf/api_op_DeleteXssMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) DeleteXssMatchSet(ctx context.Context, params *DeleteXssMatchSe addawsAwsjson11_serdeOpDeleteXssMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_GetByteMatchSet.go b/service/waf/api_op_GetByteMatchSet.go index 6b762bf1b63..70db876e50d 100644 --- a/service/waf/api_op_GetByteMatchSet.go +++ b/service/waf/api_op_GetByteMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetByteMatchSet(ctx context.Context, params *GetByteMatchSetInp addawsAwsjson11_serdeOpGetByteMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_GetChangeToken.go b/service/waf/api_op_GetChangeToken.go index 634bd8204f9..856d0c65490 100644 --- a/service/waf/api_op_GetChangeToken.go +++ b/service/waf/api_op_GetChangeToken.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -38,9 +37,9 @@ func (c *Client) GetChangeToken(ctx context.Context, params *GetChangeTokenInput addawsAwsjson11_serdeOpGetChangeTokenMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_GetChangeTokenStatus.go b/service/waf/api_op_GetChangeTokenStatus.go index 3dc5f1e4a1c..784296877b0 100644 --- a/service/waf/api_op_GetChangeTokenStatus.go +++ b/service/waf/api_op_GetChangeTokenStatus.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) GetChangeTokenStatus(ctx context.Context, params *GetChangeToke addawsAwsjson11_serdeOpGetChangeTokenStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_GetGeoMatchSet.go b/service/waf/api_op_GetGeoMatchSet.go index 817fd915ff8..43172ebcae5 100644 --- a/service/waf/api_op_GetGeoMatchSet.go +++ b/service/waf/api_op_GetGeoMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetGeoMatchSet(ctx context.Context, params *GetGeoMatchSetInput addawsAwsjson11_serdeOpGetGeoMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_GetIPSet.go b/service/waf/api_op_GetIPSet.go index 19015b228de..dbfa8883161 100644 --- a/service/waf/api_op_GetIPSet.go +++ b/service/waf/api_op_GetIPSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetIPSet(ctx context.Context, params *GetIPSetInput, optFns ... addawsAwsjson11_serdeOpGetIPSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_GetLoggingConfiguration.go b/service/waf/api_op_GetLoggingConfiguration.go index f63a707cb2c..cc151a27fc8 100644 --- a/service/waf/api_op_GetLoggingConfiguration.go +++ b/service/waf/api_op_GetLoggingConfiguration.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetLoggingConfiguration(ctx context.Context, params *GetLogging addawsAwsjson11_serdeOpGetLoggingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_GetPermissionPolicy.go b/service/waf/api_op_GetPermissionPolicy.go index 6ecfeb9d871..fe233df4b02 100644 --- a/service/waf/api_op_GetPermissionPolicy.go +++ b/service/waf/api_op_GetPermissionPolicy.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) GetPermissionPolicy(ctx context.Context, params *GetPermissionP addawsAwsjson11_serdeOpGetPermissionPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_GetRateBasedRule.go b/service/waf/api_op_GetRateBasedRule.go index e92ba5d7eda..5fb42d54843 100644 --- a/service/waf/api_op_GetRateBasedRule.go +++ b/service/waf/api_op_GetRateBasedRule.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetRateBasedRule(ctx context.Context, params *GetRateBasedRuleI addawsAwsjson11_serdeOpGetRateBasedRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_GetRateBasedRuleManagedKeys.go b/service/waf/api_op_GetRateBasedRuleManagedKeys.go index 46fcc58d8ff..4f1c27054be 100644 --- a/service/waf/api_op_GetRateBasedRuleManagedKeys.go +++ b/service/waf/api_op_GetRateBasedRuleManagedKeys.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) GetRateBasedRuleManagedKeys(ctx context.Context, params *GetRat addawsAwsjson11_serdeOpGetRateBasedRuleManagedKeysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_GetRegexMatchSet.go b/service/waf/api_op_GetRegexMatchSet.go index 2ca713378e2..2c9937fe9ae 100644 --- a/service/waf/api_op_GetRegexMatchSet.go +++ b/service/waf/api_op_GetRegexMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetRegexMatchSet(ctx context.Context, params *GetRegexMatchSetI addawsAwsjson11_serdeOpGetRegexMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_GetRegexPatternSet.go b/service/waf/api_op_GetRegexPatternSet.go index 54ee48ec82d..24682d6c472 100644 --- a/service/waf/api_op_GetRegexPatternSet.go +++ b/service/waf/api_op_GetRegexPatternSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetRegexPatternSet(ctx context.Context, params *GetRegexPattern addawsAwsjson11_serdeOpGetRegexPatternSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_GetRule.go b/service/waf/api_op_GetRule.go index 23d41fc4d3c..6cde50908d9 100644 --- a/service/waf/api_op_GetRule.go +++ b/service/waf/api_op_GetRule.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetRule(ctx context.Context, params *GetRuleInput, optFns ...fu addawsAwsjson11_serdeOpGetRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_GetRuleGroup.go b/service/waf/api_op_GetRuleGroup.go index 198275969d2..c4defbeaa48 100644 --- a/service/waf/api_op_GetRuleGroup.go +++ b/service/waf/api_op_GetRuleGroup.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) GetRuleGroup(ctx context.Context, params *GetRuleGroupInput, op addawsAwsjson11_serdeOpGetRuleGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_GetSampledRequests.go b/service/waf/api_op_GetSampledRequests.go index d7c2f31ff43..c4d6cf44ada 100644 --- a/service/waf/api_op_GetSampledRequests.go +++ b/service/waf/api_op_GetSampledRequests.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) GetSampledRequests(ctx context.Context, params *GetSampledReque addawsAwsjson11_serdeOpGetSampledRequestsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_GetSizeConstraintSet.go b/service/waf/api_op_GetSizeConstraintSet.go index 2e2b1626608..d2f7dc72808 100644 --- a/service/waf/api_op_GetSizeConstraintSet.go +++ b/service/waf/api_op_GetSizeConstraintSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetSizeConstraintSet(ctx context.Context, params *GetSizeConstr addawsAwsjson11_serdeOpGetSizeConstraintSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_GetSqlInjectionMatchSet.go b/service/waf/api_op_GetSqlInjectionMatchSet.go index 67af5bb4844..1760f61da9a 100644 --- a/service/waf/api_op_GetSqlInjectionMatchSet.go +++ b/service/waf/api_op_GetSqlInjectionMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetSqlInjectionMatchSet(ctx context.Context, params *GetSqlInje addawsAwsjson11_serdeOpGetSqlInjectionMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_GetWebACL.go b/service/waf/api_op_GetWebACL.go index 9441be3bdc0..4d68f55dffb 100644 --- a/service/waf/api_op_GetWebACL.go +++ b/service/waf/api_op_GetWebACL.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetWebACL(ctx context.Context, params *GetWebACLInput, optFns . addawsAwsjson11_serdeOpGetWebACLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_GetXssMatchSet.go b/service/waf/api_op_GetXssMatchSet.go index 8dd6fdb74df..ecb6320c4e3 100644 --- a/service/waf/api_op_GetXssMatchSet.go +++ b/service/waf/api_op_GetXssMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetXssMatchSet(ctx context.Context, params *GetXssMatchSetInput addawsAwsjson11_serdeOpGetXssMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_ListActivatedRulesInRuleGroup.go b/service/waf/api_op_ListActivatedRulesInRuleGroup.go index 6994daed5c0..7583b978a24 100644 --- a/service/waf/api_op_ListActivatedRulesInRuleGroup.go +++ b/service/waf/api_op_ListActivatedRulesInRuleGroup.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListActivatedRulesInRuleGroup(ctx context.Context, params *List addawsAwsjson11_serdeOpListActivatedRulesInRuleGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_ListByteMatchSets.go b/service/waf/api_op_ListByteMatchSets.go index 97328bed8fe..6383721cfd9 100644 --- a/service/waf/api_op_ListByteMatchSets.go +++ b/service/waf/api_op_ListByteMatchSets.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListByteMatchSets(ctx context.Context, params *ListByteMatchSet addawsAwsjson11_serdeOpListByteMatchSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_ListGeoMatchSets.go b/service/waf/api_op_ListGeoMatchSets.go index 9ff2823d3ec..7eddec46ba7 100644 --- a/service/waf/api_op_ListGeoMatchSets.go +++ b/service/waf/api_op_ListGeoMatchSets.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListGeoMatchSets(ctx context.Context, params *ListGeoMatchSetsI addawsAwsjson11_serdeOpListGeoMatchSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_ListIPSets.go b/service/waf/api_op_ListIPSets.go index 992150b6359..b88d35713e4 100644 --- a/service/waf/api_op_ListIPSets.go +++ b/service/waf/api_op_ListIPSets.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListIPSets(ctx context.Context, params *ListIPSetsInput, optFns addawsAwsjson11_serdeOpListIPSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_ListLoggingConfigurations.go b/service/waf/api_op_ListLoggingConfigurations.go index 93b87906b6f..b1e6eadfd2d 100644 --- a/service/waf/api_op_ListLoggingConfigurations.go +++ b/service/waf/api_op_ListLoggingConfigurations.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListLoggingConfigurations(ctx context.Context, params *ListLogg addawsAwsjson11_serdeOpListLoggingConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_ListRateBasedRules.go b/service/waf/api_op_ListRateBasedRules.go index 7149b5d6997..c4a50a40e3e 100644 --- a/service/waf/api_op_ListRateBasedRules.go +++ b/service/waf/api_op_ListRateBasedRules.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListRateBasedRules(ctx context.Context, params *ListRateBasedRu addawsAwsjson11_serdeOpListRateBasedRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_ListRegexMatchSets.go b/service/waf/api_op_ListRegexMatchSets.go index 1a00e839a3b..283587dd471 100644 --- a/service/waf/api_op_ListRegexMatchSets.go +++ b/service/waf/api_op_ListRegexMatchSets.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListRegexMatchSets(ctx context.Context, params *ListRegexMatchS addawsAwsjson11_serdeOpListRegexMatchSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_ListRegexPatternSets.go b/service/waf/api_op_ListRegexPatternSets.go index 094b274cfd2..f4a4daf604b 100644 --- a/service/waf/api_op_ListRegexPatternSets.go +++ b/service/waf/api_op_ListRegexPatternSets.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListRegexPatternSets(ctx context.Context, params *ListRegexPatt addawsAwsjson11_serdeOpListRegexPatternSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_ListRuleGroups.go b/service/waf/api_op_ListRuleGroups.go index 0eab9ffd77d..8b0062d5300 100644 --- a/service/waf/api_op_ListRuleGroups.go +++ b/service/waf/api_op_ListRuleGroups.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListRuleGroups(ctx context.Context, params *ListRuleGroupsInput addawsAwsjson11_serdeOpListRuleGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_ListRules.go b/service/waf/api_op_ListRules.go index 27bb99ed5cd..fa8688c8491 100644 --- a/service/waf/api_op_ListRules.go +++ b/service/waf/api_op_ListRules.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListRules(ctx context.Context, params *ListRulesInput, optFns . addawsAwsjson11_serdeOpListRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_ListSizeConstraintSets.go b/service/waf/api_op_ListSizeConstraintSets.go index 1ded74d4075..70fabab4836 100644 --- a/service/waf/api_op_ListSizeConstraintSets.go +++ b/service/waf/api_op_ListSizeConstraintSets.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListSizeConstraintSets(ctx context.Context, params *ListSizeCon addawsAwsjson11_serdeOpListSizeConstraintSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_ListSqlInjectionMatchSets.go b/service/waf/api_op_ListSqlInjectionMatchSets.go index 0d46e642b48..6fc97b8a7b0 100644 --- a/service/waf/api_op_ListSqlInjectionMatchSets.go +++ b/service/waf/api_op_ListSqlInjectionMatchSets.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListSqlInjectionMatchSets(ctx context.Context, params *ListSqlI addawsAwsjson11_serdeOpListSqlInjectionMatchSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_ListSubscribedRuleGroups.go b/service/waf/api_op_ListSubscribedRuleGroups.go index 36aacc14bfa..96dc37a0ce0 100644 --- a/service/waf/api_op_ListSubscribedRuleGroups.go +++ b/service/waf/api_op_ListSubscribedRuleGroups.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListSubscribedRuleGroups(ctx context.Context, params *ListSubsc addawsAwsjson11_serdeOpListSubscribedRuleGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_ListTagsForResource.go b/service/waf/api_op_ListTagsForResource.go index fbe1e012e40..1d44c4ddaa6 100644 --- a/service/waf/api_op_ListTagsForResource.go +++ b/service/waf/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_ListWebACLs.go b/service/waf/api_op_ListWebACLs.go index 0eef53cf078..40f3b39bfc1 100644 --- a/service/waf/api_op_ListWebACLs.go +++ b/service/waf/api_op_ListWebACLs.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListWebACLs(ctx context.Context, params *ListWebACLsInput, optF addawsAwsjson11_serdeOpListWebACLsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_ListXssMatchSets.go b/service/waf/api_op_ListXssMatchSets.go index da6c93aed4b..505346acf15 100644 --- a/service/waf/api_op_ListXssMatchSets.go +++ b/service/waf/api_op_ListXssMatchSets.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListXssMatchSets(ctx context.Context, params *ListXssMatchSetsI addawsAwsjson11_serdeOpListXssMatchSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_PutLoggingConfiguration.go b/service/waf/api_op_PutLoggingConfiguration.go index d0ff523c47c..cccdd28888c 100644 --- a/service/waf/api_op_PutLoggingConfiguration.go +++ b/service/waf/api_op_PutLoggingConfiguration.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) PutLoggingConfiguration(ctx context.Context, params *PutLogging addawsAwsjson11_serdeOpPutLoggingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_PutPermissionPolicy.go b/service/waf/api_op_PutPermissionPolicy.go index b96ff43cd97..d3279d7bd3e 100644 --- a/service/waf/api_op_PutPermissionPolicy.go +++ b/service/waf/api_op_PutPermissionPolicy.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -51,9 +50,9 @@ func (c *Client) PutPermissionPolicy(ctx context.Context, params *PutPermissionP addawsAwsjson11_serdeOpPutPermissionPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_TagResource.go b/service/waf/api_op_TagResource.go index b39abace123..92fed28dcd9 100644 --- a/service/waf/api_op_TagResource.go +++ b/service/waf/api_op_TagResource.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_UntagResource.go b/service/waf/api_op_UntagResource.go index e7f270631e7..f2061e16ba0 100644 --- a/service/waf/api_op_UntagResource.go +++ b/service/waf/api_op_UntagResource.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_UpdateByteMatchSet.go b/service/waf/api_op_UpdateByteMatchSet.go index e344948869d..352b53191c6 100644 --- a/service/waf/api_op_UpdateByteMatchSet.go +++ b/service/waf/api_op_UpdateByteMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -72,9 +71,9 @@ func (c *Client) UpdateByteMatchSet(ctx context.Context, params *UpdateByteMatch addawsAwsjson11_serdeOpUpdateByteMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_UpdateGeoMatchSet.go b/service/waf/api_op_UpdateGeoMatchSet.go index 85c3d3a3967..351aa84b2c1 100644 --- a/service/waf/api_op_UpdateGeoMatchSet.go +++ b/service/waf/api_op_UpdateGeoMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -55,9 +54,9 @@ func (c *Client) UpdateGeoMatchSet(ctx context.Context, params *UpdateGeoMatchSe addawsAwsjson11_serdeOpUpdateGeoMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_UpdateIPSet.go b/service/waf/api_op_UpdateIPSet.go index e3e366cdf82..8f5d0dc2fcf 100644 --- a/service/waf/api_op_UpdateIPSet.go +++ b/service/waf/api_op_UpdateIPSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -83,9 +82,9 @@ func (c *Client) UpdateIPSet(ctx context.Context, params *UpdateIPSetInput, optF addawsAwsjson11_serdeOpUpdateIPSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_UpdateRateBasedRule.go b/service/waf/api_op_UpdateRateBasedRule.go index 4ca65626f73..1faa058fa86 100644 --- a/service/waf/api_op_UpdateRateBasedRule.go +++ b/service/waf/api_op_UpdateRateBasedRule.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -58,9 +57,9 @@ func (c *Client) UpdateRateBasedRule(ctx context.Context, params *UpdateRateBase addawsAwsjson11_serdeOpUpdateRateBasedRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_UpdateRegexMatchSet.go b/service/waf/api_op_UpdateRegexMatchSet.go index 74091021ac9..638e337659c 100644 --- a/service/waf/api_op_UpdateRegexMatchSet.go +++ b/service/waf/api_op_UpdateRegexMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -68,9 +67,9 @@ func (c *Client) UpdateRegexMatchSet(ctx context.Context, params *UpdateRegexMat addawsAwsjson11_serdeOpUpdateRegexMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_UpdateRegexPatternSet.go b/service/waf/api_op_UpdateRegexPatternSet.go index 77db3205322..a2140a0a270 100644 --- a/service/waf/api_op_UpdateRegexPatternSet.go +++ b/service/waf/api_op_UpdateRegexPatternSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -67,9 +66,9 @@ func (c *Client) UpdateRegexPatternSet(ctx context.Context, params *UpdateRegexP addawsAwsjson11_serdeOpUpdateRegexPatternSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_UpdateRule.go b/service/waf/api_op_UpdateRule.go index ea509e7a34a..5de7fcf5a7f 100644 --- a/service/waf/api_op_UpdateRule.go +++ b/service/waf/api_op_UpdateRule.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -67,9 +66,9 @@ func (c *Client) UpdateRule(ctx context.Context, params *UpdateRuleInput, optFns addawsAwsjson11_serdeOpUpdateRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_UpdateRuleGroup.go b/service/waf/api_op_UpdateRuleGroup.go index f8f1f227bda..2bea5fdf6af 100644 --- a/service/waf/api_op_UpdateRuleGroup.go +++ b/service/waf/api_op_UpdateRuleGroup.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) UpdateRuleGroup(ctx context.Context, params *UpdateRuleGroupInp addawsAwsjson11_serdeOpUpdateRuleGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_UpdateSizeConstraintSet.go b/service/waf/api_op_UpdateSizeConstraintSet.go index f91d822a61c..18170725919 100644 --- a/service/waf/api_op_UpdateSizeConstraintSet.go +++ b/service/waf/api_op_UpdateSizeConstraintSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -75,9 +74,9 @@ func (c *Client) UpdateSizeConstraintSet(ctx context.Context, params *UpdateSize addawsAwsjson11_serdeOpUpdateSizeConstraintSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_UpdateSqlInjectionMatchSet.go b/service/waf/api_op_UpdateSqlInjectionMatchSet.go index 32ef1c93041..cf73f8a27c7 100644 --- a/service/waf/api_op_UpdateSqlInjectionMatchSet.go +++ b/service/waf/api_op_UpdateSqlInjectionMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -67,9 +66,9 @@ func (c *Client) UpdateSqlInjectionMatchSet(ctx context.Context, params *UpdateS addawsAwsjson11_serdeOpUpdateSqlInjectionMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_UpdateWebACL.go b/service/waf/api_op_UpdateWebACL.go index bd200af89d4..9d805613cc0 100644 --- a/service/waf/api_op_UpdateWebACL.go +++ b/service/waf/api_op_UpdateWebACL.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -81,9 +80,9 @@ func (c *Client) UpdateWebACL(ctx context.Context, params *UpdateWebACLInput, op addawsAwsjson11_serdeOpUpdateWebACLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/api_op_UpdateXssMatchSet.go b/service/waf/api_op_UpdateXssMatchSet.go index f31893fbeee..b02790dd1d4 100644 --- a/service/waf/api_op_UpdateXssMatchSet.go +++ b/service/waf/api_op_UpdateXssMatchSet.go @@ -5,7 +5,6 @@ package waf import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/waf/types" smithy "github.com/awslabs/smithy-go" @@ -66,9 +65,9 @@ func (c *Client) UpdateXssMatchSet(ctx context.Context, params *UpdateXssMatchSe addawsAwsjson11_serdeOpUpdateXssMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/waf/endpoints.go b/service/waf/endpoints.go index f514476092f..4a832b0be3c 100644 --- a/service/waf/endpoints.go +++ b/service/waf/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/wafregional/api_client.go b/service/wafregional/api_client.go index 331cc83332b..3b9f7b71d82 100644 --- a/service/wafregional/api_client.go +++ b/service/wafregional/api_client.go @@ -96,30 +96,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -185,6 +161,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/wafregional/api_op_AssociateWebACL.go b/service/wafregional/api_op_AssociateWebACL.go index bf91a187195..bce11deff88 100644 --- a/service/wafregional/api_op_AssociateWebACL.go +++ b/service/wafregional/api_op_AssociateWebACL.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) AssociateWebACL(ctx context.Context, params *AssociateWebACLInp addawsAwsjson11_serdeOpAssociateWebACLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_CreateByteMatchSet.go b/service/wafregional/api_op_CreateByteMatchSet.go index 6b6a25e8719..a83c37539fd 100644 --- a/service/wafregional/api_op_CreateByteMatchSet.go +++ b/service/wafregional/api_op_CreateByteMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -53,9 +52,9 @@ func (c *Client) CreateByteMatchSet(ctx context.Context, params *CreateByteMatch addawsAwsjson11_serdeOpCreateByteMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_CreateGeoMatchSet.go b/service/wafregional/api_op_CreateGeoMatchSet.go index 84e32483337..69fe05d2677 100644 --- a/service/wafregional/api_op_CreateGeoMatchSet.go +++ b/service/wafregional/api_op_CreateGeoMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -52,9 +51,9 @@ func (c *Client) CreateGeoMatchSet(ctx context.Context, params *CreateGeoMatchSe addawsAwsjson11_serdeOpCreateGeoMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_CreateIPSet.go b/service/wafregional/api_op_CreateIPSet.go index 0e3b9c66be8..072a49ec71a 100644 --- a/service/wafregional/api_op_CreateIPSet.go +++ b/service/wafregional/api_op_CreateIPSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -52,9 +51,9 @@ func (c *Client) CreateIPSet(ctx context.Context, params *CreateIPSetInput, optF addawsAwsjson11_serdeOpCreateIPSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_CreateRateBasedRule.go b/service/wafregional/api_op_CreateRateBasedRule.go index e089e1d4087..305de4f5454 100644 --- a/service/wafregional/api_op_CreateRateBasedRule.go +++ b/service/wafregional/api_op_CreateRateBasedRule.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -77,9 +76,9 @@ func (c *Client) CreateRateBasedRule(ctx context.Context, params *CreateRateBase addawsAwsjson11_serdeOpCreateRateBasedRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_CreateRegexMatchSet.go b/service/wafregional/api_op_CreateRegexMatchSet.go index a9058dbae15..11f883a89a4 100644 --- a/service/wafregional/api_op_CreateRegexMatchSet.go +++ b/service/wafregional/api_op_CreateRegexMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -54,9 +53,9 @@ func (c *Client) CreateRegexMatchSet(ctx context.Context, params *CreateRegexMat addawsAwsjson11_serdeOpCreateRegexMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_CreateRegexPatternSet.go b/service/wafregional/api_op_CreateRegexPatternSet.go index d5132e8d158..9d0e29bb90a 100644 --- a/service/wafregional/api_op_CreateRegexPatternSet.go +++ b/service/wafregional/api_op_CreateRegexPatternSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -50,9 +49,9 @@ func (c *Client) CreateRegexPatternSet(ctx context.Context, params *CreateRegexP addawsAwsjson11_serdeOpCreateRegexPatternSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_CreateRule.go b/service/wafregional/api_op_CreateRule.go index c1b8c829df9..1d9f7286537 100644 --- a/service/wafregional/api_op_CreateRule.go +++ b/service/wafregional/api_op_CreateRule.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -69,9 +68,9 @@ func (c *Client) CreateRule(ctx context.Context, params *CreateRuleInput, optFns addawsAwsjson11_serdeOpCreateRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_CreateRuleGroup.go b/service/wafregional/api_op_CreateRuleGroup.go index 5abb8d592e2..82e3e015c56 100644 --- a/service/wafregional/api_op_CreateRuleGroup.go +++ b/service/wafregional/api_op_CreateRuleGroup.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -44,9 +43,9 @@ func (c *Client) CreateRuleGroup(ctx context.Context, params *CreateRuleGroupInp addawsAwsjson11_serdeOpCreateRuleGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_CreateSizeConstraintSet.go b/service/wafregional/api_op_CreateSizeConstraintSet.go index a0671d7c9a3..a17ce847a30 100644 --- a/service/wafregional/api_op_CreateSizeConstraintSet.go +++ b/service/wafregional/api_op_CreateSizeConstraintSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -54,9 +53,9 @@ func (c *Client) CreateSizeConstraintSet(ctx context.Context, params *CreateSize addawsAwsjson11_serdeOpCreateSizeConstraintSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_CreateSqlInjectionMatchSet.go b/service/wafregional/api_op_CreateSqlInjectionMatchSet.go index fb6dd380355..2814a75d1aa 100644 --- a/service/wafregional/api_op_CreateSqlInjectionMatchSet.go +++ b/service/wafregional/api_op_CreateSqlInjectionMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -52,9 +51,9 @@ func (c *Client) CreateSqlInjectionMatchSet(ctx context.Context, params *CreateS addawsAwsjson11_serdeOpCreateSqlInjectionMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_CreateWebACL.go b/service/wafregional/api_op_CreateWebACL.go index 904cc088c8e..8cecb72cbb2 100644 --- a/service/wafregional/api_op_CreateWebACL.go +++ b/service/wafregional/api_op_CreateWebACL.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -63,9 +62,9 @@ func (c *Client) CreateWebACL(ctx context.Context, params *CreateWebACLInput, op addawsAwsjson11_serdeOpCreateWebACLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_CreateWebACLMigrationStack.go b/service/wafregional/api_op_CreateWebACLMigrationStack.go index 5cf49d9eafe..83b57e01b2e 100644 --- a/service/wafregional/api_op_CreateWebACLMigrationStack.go +++ b/service/wafregional/api_op_CreateWebACLMigrationStack.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) CreateWebACLMigrationStack(ctx context.Context, params *CreateW addawsAwsjson11_serdeOpCreateWebACLMigrationStackMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_CreateXssMatchSet.go b/service/wafregional/api_op_CreateXssMatchSet.go index 79ea034b299..57281e8139c 100644 --- a/service/wafregional/api_op_CreateXssMatchSet.go +++ b/service/wafregional/api_op_CreateXssMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -51,9 +50,9 @@ func (c *Client) CreateXssMatchSet(ctx context.Context, params *CreateXssMatchSe addawsAwsjson11_serdeOpCreateXssMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_DeleteByteMatchSet.go b/service/wafregional/api_op_DeleteByteMatchSet.go index 348fc1259a5..306ef473f52 100644 --- a/service/wafregional/api_op_DeleteByteMatchSet.go +++ b/service/wafregional/api_op_DeleteByteMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -42,9 +41,9 @@ func (c *Client) DeleteByteMatchSet(ctx context.Context, params *DeleteByteMatch addawsAwsjson11_serdeOpDeleteByteMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_DeleteGeoMatchSet.go b/service/wafregional/api_op_DeleteGeoMatchSet.go index 09386d29a00..e017923d590 100644 --- a/service/wafregional/api_op_DeleteGeoMatchSet.go +++ b/service/wafregional/api_op_DeleteGeoMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) DeleteGeoMatchSet(ctx context.Context, params *DeleteGeoMatchSe addawsAwsjson11_serdeOpDeleteGeoMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_DeleteIPSet.go b/service/wafregional/api_op_DeleteIPSet.go index f32d1f9c2dc..45df5df2149 100644 --- a/service/wafregional/api_op_DeleteIPSet.go +++ b/service/wafregional/api_op_DeleteIPSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) DeleteIPSet(ctx context.Context, params *DeleteIPSetInput, optF addawsAwsjson11_serdeOpDeleteIPSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_DeleteLoggingConfiguration.go b/service/wafregional/api_op_DeleteLoggingConfiguration.go index 7e7f12e47c1..8550914a228 100644 --- a/service/wafregional/api_op_DeleteLoggingConfiguration.go +++ b/service/wafregional/api_op_DeleteLoggingConfiguration.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DeleteLoggingConfiguration(ctx context.Context, params *DeleteL addawsAwsjson11_serdeOpDeleteLoggingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_DeletePermissionPolicy.go b/service/wafregional/api_op_DeletePermissionPolicy.go index 3df8a3dcceb..eac07f644fd 100644 --- a/service/wafregional/api_op_DeletePermissionPolicy.go +++ b/service/wafregional/api_op_DeletePermissionPolicy.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) DeletePermissionPolicy(ctx context.Context, params *DeletePermi addawsAwsjson11_serdeOpDeletePermissionPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_DeleteRateBasedRule.go b/service/wafregional/api_op_DeleteRateBasedRule.go index edecac0bf83..3675ed5777d 100644 --- a/service/wafregional/api_op_DeleteRateBasedRule.go +++ b/service/wafregional/api_op_DeleteRateBasedRule.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) DeleteRateBasedRule(ctx context.Context, params *DeleteRateBase addawsAwsjson11_serdeOpDeleteRateBasedRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_DeleteRegexMatchSet.go b/service/wafregional/api_op_DeleteRegexMatchSet.go index 64b9068d917..162466bb4a3 100644 --- a/service/wafregional/api_op_DeleteRegexMatchSet.go +++ b/service/wafregional/api_op_DeleteRegexMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -42,9 +41,9 @@ func (c *Client) DeleteRegexMatchSet(ctx context.Context, params *DeleteRegexMat addawsAwsjson11_serdeOpDeleteRegexMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_DeleteRegexPatternSet.go b/service/wafregional/api_op_DeleteRegexPatternSet.go index 06f208485a8..b53ce4f1042 100644 --- a/service/wafregional/api_op_DeleteRegexPatternSet.go +++ b/service/wafregional/api_op_DeleteRegexPatternSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) DeleteRegexPatternSet(ctx context.Context, params *DeleteRegexP addawsAwsjson11_serdeOpDeleteRegexPatternSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_DeleteRule.go b/service/wafregional/api_op_DeleteRule.go index 6098fd51978..712a828e9b5 100644 --- a/service/wafregional/api_op_DeleteRule.go +++ b/service/wafregional/api_op_DeleteRule.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) DeleteRule(ctx context.Context, params *DeleteRuleInput, optFns addawsAwsjson11_serdeOpDeleteRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_DeleteRuleGroup.go b/service/wafregional/api_op_DeleteRuleGroup.go index d847105ed75..6d297c793fb 100644 --- a/service/wafregional/api_op_DeleteRuleGroup.go +++ b/service/wafregional/api_op_DeleteRuleGroup.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) DeleteRuleGroup(ctx context.Context, params *DeleteRuleGroupInp addawsAwsjson11_serdeOpDeleteRuleGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_DeleteSizeConstraintSet.go b/service/wafregional/api_op_DeleteSizeConstraintSet.go index 699a049a926..46bdf1e83e9 100644 --- a/service/wafregional/api_op_DeleteSizeConstraintSet.go +++ b/service/wafregional/api_op_DeleteSizeConstraintSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -42,9 +41,9 @@ func (c *Client) DeleteSizeConstraintSet(ctx context.Context, params *DeleteSize addawsAwsjson11_serdeOpDeleteSizeConstraintSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_DeleteSqlInjectionMatchSet.go b/service/wafregional/api_op_DeleteSqlInjectionMatchSet.go index 80e7eb8e69f..5c423c0003b 100644 --- a/service/wafregional/api_op_DeleteSqlInjectionMatchSet.go +++ b/service/wafregional/api_op_DeleteSqlInjectionMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -43,9 +42,9 @@ func (c *Client) DeleteSqlInjectionMatchSet(ctx context.Context, params *DeleteS addawsAwsjson11_serdeOpDeleteSqlInjectionMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_DeleteWebACL.go b/service/wafregional/api_op_DeleteWebACL.go index 8fbb0328b6a..8974453f2f4 100644 --- a/service/wafregional/api_op_DeleteWebACL.go +++ b/service/wafregional/api_op_DeleteWebACL.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -39,9 +38,9 @@ func (c *Client) DeleteWebACL(ctx context.Context, params *DeleteWebACLInput, op addawsAwsjson11_serdeOpDeleteWebACLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_DeleteXssMatchSet.go b/service/wafregional/api_op_DeleteXssMatchSet.go index 3ab49ddb813..6146ddb42bc 100644 --- a/service/wafregional/api_op_DeleteXssMatchSet.go +++ b/service/wafregional/api_op_DeleteXssMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -41,9 +40,9 @@ func (c *Client) DeleteXssMatchSet(ctx context.Context, params *DeleteXssMatchSe addawsAwsjson11_serdeOpDeleteXssMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_DisassociateWebACL.go b/service/wafregional/api_op_DisassociateWebACL.go index 42a61535871..9ea386ae3dc 100644 --- a/service/wafregional/api_op_DisassociateWebACL.go +++ b/service/wafregional/api_op_DisassociateWebACL.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) DisassociateWebACL(ctx context.Context, params *DisassociateWeb addawsAwsjson11_serdeOpDisassociateWebACLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetByteMatchSet.go b/service/wafregional/api_op_GetByteMatchSet.go index b28b0105ee4..b3775f85061 100644 --- a/service/wafregional/api_op_GetByteMatchSet.go +++ b/service/wafregional/api_op_GetByteMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetByteMatchSet(ctx context.Context, params *GetByteMatchSetInp addawsAwsjson11_serdeOpGetByteMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetChangeToken.go b/service/wafregional/api_op_GetChangeToken.go index 9d49ba6cfd7..8d3558b18a4 100644 --- a/service/wafregional/api_op_GetChangeToken.go +++ b/service/wafregional/api_op_GetChangeToken.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -38,9 +37,9 @@ func (c *Client) GetChangeToken(ctx context.Context, params *GetChangeTokenInput addawsAwsjson11_serdeOpGetChangeTokenMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetChangeTokenStatus.go b/service/wafregional/api_op_GetChangeTokenStatus.go index fe02499f120..a2cbb1950c5 100644 --- a/service/wafregional/api_op_GetChangeTokenStatus.go +++ b/service/wafregional/api_op_GetChangeTokenStatus.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -40,9 +39,9 @@ func (c *Client) GetChangeTokenStatus(ctx context.Context, params *GetChangeToke addawsAwsjson11_serdeOpGetChangeTokenStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetGeoMatchSet.go b/service/wafregional/api_op_GetGeoMatchSet.go index 15b93518530..0471aea4aac 100644 --- a/service/wafregional/api_op_GetGeoMatchSet.go +++ b/service/wafregional/api_op_GetGeoMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetGeoMatchSet(ctx context.Context, params *GetGeoMatchSetInput addawsAwsjson11_serdeOpGetGeoMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetIPSet.go b/service/wafregional/api_op_GetIPSet.go index 1ae085f88e6..b3a17056be9 100644 --- a/service/wafregional/api_op_GetIPSet.go +++ b/service/wafregional/api_op_GetIPSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetIPSet(ctx context.Context, params *GetIPSetInput, optFns ... addawsAwsjson11_serdeOpGetIPSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetLoggingConfiguration.go b/service/wafregional/api_op_GetLoggingConfiguration.go index fee5e0896a1..c5ad0d32459 100644 --- a/service/wafregional/api_op_GetLoggingConfiguration.go +++ b/service/wafregional/api_op_GetLoggingConfiguration.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetLoggingConfiguration(ctx context.Context, params *GetLogging addawsAwsjson11_serdeOpGetLoggingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetPermissionPolicy.go b/service/wafregional/api_op_GetPermissionPolicy.go index 9e1d722508d..f09c9422da2 100644 --- a/service/wafregional/api_op_GetPermissionPolicy.go +++ b/service/wafregional/api_op_GetPermissionPolicy.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) GetPermissionPolicy(ctx context.Context, params *GetPermissionP addawsAwsjson11_serdeOpGetPermissionPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetRateBasedRule.go b/service/wafregional/api_op_GetRateBasedRule.go index 8c9bc153eb7..5672c4acfb6 100644 --- a/service/wafregional/api_op_GetRateBasedRule.go +++ b/service/wafregional/api_op_GetRateBasedRule.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetRateBasedRule(ctx context.Context, params *GetRateBasedRuleI addawsAwsjson11_serdeOpGetRateBasedRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetRateBasedRuleManagedKeys.go b/service/wafregional/api_op_GetRateBasedRuleManagedKeys.go index 8cc39bb79fa..b31dcac86aa 100644 --- a/service/wafregional/api_op_GetRateBasedRuleManagedKeys.go +++ b/service/wafregional/api_op_GetRateBasedRuleManagedKeys.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -31,9 +30,9 @@ func (c *Client) GetRateBasedRuleManagedKeys(ctx context.Context, params *GetRat addawsAwsjson11_serdeOpGetRateBasedRuleManagedKeysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetRegexMatchSet.go b/service/wafregional/api_op_GetRegexMatchSet.go index 2fdd42c7ad2..98a334fd692 100644 --- a/service/wafregional/api_op_GetRegexMatchSet.go +++ b/service/wafregional/api_op_GetRegexMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetRegexMatchSet(ctx context.Context, params *GetRegexMatchSetI addawsAwsjson11_serdeOpGetRegexMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetRegexPatternSet.go b/service/wafregional/api_op_GetRegexPatternSet.go index f944bd924be..c27a0cbd8fc 100644 --- a/service/wafregional/api_op_GetRegexPatternSet.go +++ b/service/wafregional/api_op_GetRegexPatternSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetRegexPatternSet(ctx context.Context, params *GetRegexPattern addawsAwsjson11_serdeOpGetRegexPatternSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetRule.go b/service/wafregional/api_op_GetRule.go index f6199384226..91daa84ab92 100644 --- a/service/wafregional/api_op_GetRule.go +++ b/service/wafregional/api_op_GetRule.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetRule(ctx context.Context, params *GetRuleInput, optFns ...fu addawsAwsjson11_serdeOpGetRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetRuleGroup.go b/service/wafregional/api_op_GetRuleGroup.go index 8457002e5f3..880a3fc1ef1 100644 --- a/service/wafregional/api_op_GetRuleGroup.go +++ b/service/wafregional/api_op_GetRuleGroup.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) GetRuleGroup(ctx context.Context, params *GetRuleGroupInput, op addawsAwsjson11_serdeOpGetRuleGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetSampledRequests.go b/service/wafregional/api_op_GetSampledRequests.go index b0eaa65fa61..a7babf91188 100644 --- a/service/wafregional/api_op_GetSampledRequests.go +++ b/service/wafregional/api_op_GetSampledRequests.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -38,9 +37,9 @@ func (c *Client) GetSampledRequests(ctx context.Context, params *GetSampledReque addawsAwsjson11_serdeOpGetSampledRequestsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetSizeConstraintSet.go b/service/wafregional/api_op_GetSizeConstraintSet.go index 9b311dce9c7..342590c847f 100644 --- a/service/wafregional/api_op_GetSizeConstraintSet.go +++ b/service/wafregional/api_op_GetSizeConstraintSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetSizeConstraintSet(ctx context.Context, params *GetSizeConstr addawsAwsjson11_serdeOpGetSizeConstraintSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetSqlInjectionMatchSet.go b/service/wafregional/api_op_GetSqlInjectionMatchSet.go index b783918ae65..20a95185b71 100644 --- a/service/wafregional/api_op_GetSqlInjectionMatchSet.go +++ b/service/wafregional/api_op_GetSqlInjectionMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetSqlInjectionMatchSet(ctx context.Context, params *GetSqlInje addawsAwsjson11_serdeOpGetSqlInjectionMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetWebACL.go b/service/wafregional/api_op_GetWebACL.go index e65dd81b514..8d484b6e21b 100644 --- a/service/wafregional/api_op_GetWebACL.go +++ b/service/wafregional/api_op_GetWebACL.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetWebACL(ctx context.Context, params *GetWebACLInput, optFns . addawsAwsjson11_serdeOpGetWebACLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetWebACLForResource.go b/service/wafregional/api_op_GetWebACLForResource.go index f3558ebe9b6..6285b0b4baa 100644 --- a/service/wafregional/api_op_GetWebACLForResource.go +++ b/service/wafregional/api_op_GetWebACLForResource.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) GetWebACLForResource(ctx context.Context, params *GetWebACLForR addawsAwsjson11_serdeOpGetWebACLForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_GetXssMatchSet.go b/service/wafregional/api_op_GetXssMatchSet.go index 85b8e8d3378..fd19bfc920e 100644 --- a/service/wafregional/api_op_GetXssMatchSet.go +++ b/service/wafregional/api_op_GetXssMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetXssMatchSet(ctx context.Context, params *GetXssMatchSetInput addawsAwsjson11_serdeOpGetXssMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_ListActivatedRulesInRuleGroup.go b/service/wafregional/api_op_ListActivatedRulesInRuleGroup.go index 8353673e82e..7d7fb6cf772 100644 --- a/service/wafregional/api_op_ListActivatedRulesInRuleGroup.go +++ b/service/wafregional/api_op_ListActivatedRulesInRuleGroup.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListActivatedRulesInRuleGroup(ctx context.Context, params *List addawsAwsjson11_serdeOpListActivatedRulesInRuleGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_ListByteMatchSets.go b/service/wafregional/api_op_ListByteMatchSets.go index 331dc23604a..81df4fb8163 100644 --- a/service/wafregional/api_op_ListByteMatchSets.go +++ b/service/wafregional/api_op_ListByteMatchSets.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListByteMatchSets(ctx context.Context, params *ListByteMatchSet addawsAwsjson11_serdeOpListByteMatchSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_ListGeoMatchSets.go b/service/wafregional/api_op_ListGeoMatchSets.go index 325ae1168a5..689bf6c2807 100644 --- a/service/wafregional/api_op_ListGeoMatchSets.go +++ b/service/wafregional/api_op_ListGeoMatchSets.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListGeoMatchSets(ctx context.Context, params *ListGeoMatchSetsI addawsAwsjson11_serdeOpListGeoMatchSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_ListIPSets.go b/service/wafregional/api_op_ListIPSets.go index 0384f825d29..c64a57e47ac 100644 --- a/service/wafregional/api_op_ListIPSets.go +++ b/service/wafregional/api_op_ListIPSets.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListIPSets(ctx context.Context, params *ListIPSetsInput, optFns addawsAwsjson11_serdeOpListIPSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_ListLoggingConfigurations.go b/service/wafregional/api_op_ListLoggingConfigurations.go index e38fb073029..a2c177cd68e 100644 --- a/service/wafregional/api_op_ListLoggingConfigurations.go +++ b/service/wafregional/api_op_ListLoggingConfigurations.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListLoggingConfigurations(ctx context.Context, params *ListLogg addawsAwsjson11_serdeOpListLoggingConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_ListRateBasedRules.go b/service/wafregional/api_op_ListRateBasedRules.go index 787de04b716..1ba4480c784 100644 --- a/service/wafregional/api_op_ListRateBasedRules.go +++ b/service/wafregional/api_op_ListRateBasedRules.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListRateBasedRules(ctx context.Context, params *ListRateBasedRu addawsAwsjson11_serdeOpListRateBasedRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_ListRegexMatchSets.go b/service/wafregional/api_op_ListRegexMatchSets.go index 966e4b6aa35..4a3dc8173db 100644 --- a/service/wafregional/api_op_ListRegexMatchSets.go +++ b/service/wafregional/api_op_ListRegexMatchSets.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListRegexMatchSets(ctx context.Context, params *ListRegexMatchS addawsAwsjson11_serdeOpListRegexMatchSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_ListRegexPatternSets.go b/service/wafregional/api_op_ListRegexPatternSets.go index 0731353a103..628d5dc8717 100644 --- a/service/wafregional/api_op_ListRegexPatternSets.go +++ b/service/wafregional/api_op_ListRegexPatternSets.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListRegexPatternSets(ctx context.Context, params *ListRegexPatt addawsAwsjson11_serdeOpListRegexPatternSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_ListResourcesForWebACL.go b/service/wafregional/api_op_ListResourcesForWebACL.go index 909e75aba89..5b106e8bb1b 100644 --- a/service/wafregional/api_op_ListResourcesForWebACL.go +++ b/service/wafregional/api_op_ListResourcesForWebACL.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListResourcesForWebACL(ctx context.Context, params *ListResourc addawsAwsjson11_serdeOpListResourcesForWebACLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_ListRuleGroups.go b/service/wafregional/api_op_ListRuleGroups.go index aea93a64e36..57fef4318cc 100644 --- a/service/wafregional/api_op_ListRuleGroups.go +++ b/service/wafregional/api_op_ListRuleGroups.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListRuleGroups(ctx context.Context, params *ListRuleGroupsInput addawsAwsjson11_serdeOpListRuleGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_ListRules.go b/service/wafregional/api_op_ListRules.go index cfd9e073667..c470cfe47fb 100644 --- a/service/wafregional/api_op_ListRules.go +++ b/service/wafregional/api_op_ListRules.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListRules(ctx context.Context, params *ListRulesInput, optFns . addawsAwsjson11_serdeOpListRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_ListSizeConstraintSets.go b/service/wafregional/api_op_ListSizeConstraintSets.go index be30b26243d..1afde9cd0b0 100644 --- a/service/wafregional/api_op_ListSizeConstraintSets.go +++ b/service/wafregional/api_op_ListSizeConstraintSets.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListSizeConstraintSets(ctx context.Context, params *ListSizeCon addawsAwsjson11_serdeOpListSizeConstraintSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_ListSqlInjectionMatchSets.go b/service/wafregional/api_op_ListSqlInjectionMatchSets.go index d1dc41319b0..b68d2386975 100644 --- a/service/wafregional/api_op_ListSqlInjectionMatchSets.go +++ b/service/wafregional/api_op_ListSqlInjectionMatchSets.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListSqlInjectionMatchSets(ctx context.Context, params *ListSqlI addawsAwsjson11_serdeOpListSqlInjectionMatchSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_ListSubscribedRuleGroups.go b/service/wafregional/api_op_ListSubscribedRuleGroups.go index 4e6c72c02f0..7df90a222a3 100644 --- a/service/wafregional/api_op_ListSubscribedRuleGroups.go +++ b/service/wafregional/api_op_ListSubscribedRuleGroups.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListSubscribedRuleGroups(ctx context.Context, params *ListSubsc addawsAwsjson11_serdeOpListSubscribedRuleGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_ListTagsForResource.go b/service/wafregional/api_op_ListTagsForResource.go index 41fa89ec913..1dd23c23790 100644 --- a/service/wafregional/api_op_ListTagsForResource.go +++ b/service/wafregional/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_ListWebACLs.go b/service/wafregional/api_op_ListWebACLs.go index b1e521d0de9..84fbe9e9cbd 100644 --- a/service/wafregional/api_op_ListWebACLs.go +++ b/service/wafregional/api_op_ListWebACLs.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListWebACLs(ctx context.Context, params *ListWebACLsInput, optF addawsAwsjson11_serdeOpListWebACLsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_ListXssMatchSets.go b/service/wafregional/api_op_ListXssMatchSets.go index 4937095fefa..19be8d277e2 100644 --- a/service/wafregional/api_op_ListXssMatchSets.go +++ b/service/wafregional/api_op_ListXssMatchSets.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListXssMatchSets(ctx context.Context, params *ListXssMatchSetsI addawsAwsjson11_serdeOpListXssMatchSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_PutLoggingConfiguration.go b/service/wafregional/api_op_PutLoggingConfiguration.go index cad8175e97e..a2f7d78bd8d 100644 --- a/service/wafregional/api_op_PutLoggingConfiguration.go +++ b/service/wafregional/api_op_PutLoggingConfiguration.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) PutLoggingConfiguration(ctx context.Context, params *PutLogging addawsAwsjson11_serdeOpPutLoggingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_PutPermissionPolicy.go b/service/wafregional/api_op_PutPermissionPolicy.go index f21734be1a0..e7e9d24ce8d 100644 --- a/service/wafregional/api_op_PutPermissionPolicy.go +++ b/service/wafregional/api_op_PutPermissionPolicy.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -51,9 +50,9 @@ func (c *Client) PutPermissionPolicy(ctx context.Context, params *PutPermissionP addawsAwsjson11_serdeOpPutPermissionPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_TagResource.go b/service/wafregional/api_op_TagResource.go index e875f90fd16..b90eccdeed9 100644 --- a/service/wafregional/api_op_TagResource.go +++ b/service/wafregional/api_op_TagResource.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -36,9 +35,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_UntagResource.go b/service/wafregional/api_op_UntagResource.go index 416933166ab..cd587355886 100644 --- a/service/wafregional/api_op_UntagResource.go +++ b/service/wafregional/api_op_UntagResource.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_UpdateByteMatchSet.go b/service/wafregional/api_op_UpdateByteMatchSet.go index 52c6efa6946..9b81dcfd1cf 100644 --- a/service/wafregional/api_op_UpdateByteMatchSet.go +++ b/service/wafregional/api_op_UpdateByteMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -72,9 +71,9 @@ func (c *Client) UpdateByteMatchSet(ctx context.Context, params *UpdateByteMatch addawsAwsjson11_serdeOpUpdateByteMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_UpdateGeoMatchSet.go b/service/wafregional/api_op_UpdateGeoMatchSet.go index c70fc2ce946..c6395926b7a 100644 --- a/service/wafregional/api_op_UpdateGeoMatchSet.go +++ b/service/wafregional/api_op_UpdateGeoMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -55,9 +54,9 @@ func (c *Client) UpdateGeoMatchSet(ctx context.Context, params *UpdateGeoMatchSe addawsAwsjson11_serdeOpUpdateGeoMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_UpdateIPSet.go b/service/wafregional/api_op_UpdateIPSet.go index 8485bb6cd99..245f4d0e6d8 100644 --- a/service/wafregional/api_op_UpdateIPSet.go +++ b/service/wafregional/api_op_UpdateIPSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -83,9 +82,9 @@ func (c *Client) UpdateIPSet(ctx context.Context, params *UpdateIPSetInput, optF addawsAwsjson11_serdeOpUpdateIPSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_UpdateRateBasedRule.go b/service/wafregional/api_op_UpdateRateBasedRule.go index 04f58a744b0..bbdaadf7c40 100644 --- a/service/wafregional/api_op_UpdateRateBasedRule.go +++ b/service/wafregional/api_op_UpdateRateBasedRule.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -58,9 +57,9 @@ func (c *Client) UpdateRateBasedRule(ctx context.Context, params *UpdateRateBase addawsAwsjson11_serdeOpUpdateRateBasedRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_UpdateRegexMatchSet.go b/service/wafregional/api_op_UpdateRegexMatchSet.go index dfe0f2168e2..aac2af13e90 100644 --- a/service/wafregional/api_op_UpdateRegexMatchSet.go +++ b/service/wafregional/api_op_UpdateRegexMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -68,9 +67,9 @@ func (c *Client) UpdateRegexMatchSet(ctx context.Context, params *UpdateRegexMat addawsAwsjson11_serdeOpUpdateRegexMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_UpdateRegexPatternSet.go b/service/wafregional/api_op_UpdateRegexPatternSet.go index 498e094a561..9d8a38e534a 100644 --- a/service/wafregional/api_op_UpdateRegexPatternSet.go +++ b/service/wafregional/api_op_UpdateRegexPatternSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -67,9 +66,9 @@ func (c *Client) UpdateRegexPatternSet(ctx context.Context, params *UpdateRegexP addawsAwsjson11_serdeOpUpdateRegexPatternSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_UpdateRule.go b/service/wafregional/api_op_UpdateRule.go index d60297d99c6..6cea032b015 100644 --- a/service/wafregional/api_op_UpdateRule.go +++ b/service/wafregional/api_op_UpdateRule.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -67,9 +66,9 @@ func (c *Client) UpdateRule(ctx context.Context, params *UpdateRuleInput, optFns addawsAwsjson11_serdeOpUpdateRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_UpdateRuleGroup.go b/service/wafregional/api_op_UpdateRuleGroup.go index 8e2f9a7d0dc..d9a641db99d 100644 --- a/service/wafregional/api_op_UpdateRuleGroup.go +++ b/service/wafregional/api_op_UpdateRuleGroup.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -45,9 +44,9 @@ func (c *Client) UpdateRuleGroup(ctx context.Context, params *UpdateRuleGroupInp addawsAwsjson11_serdeOpUpdateRuleGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_UpdateSizeConstraintSet.go b/service/wafregional/api_op_UpdateSizeConstraintSet.go index de44d16aa75..dd20cc53368 100644 --- a/service/wafregional/api_op_UpdateSizeConstraintSet.go +++ b/service/wafregional/api_op_UpdateSizeConstraintSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -75,9 +74,9 @@ func (c *Client) UpdateSizeConstraintSet(ctx context.Context, params *UpdateSize addawsAwsjson11_serdeOpUpdateSizeConstraintSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_UpdateSqlInjectionMatchSet.go b/service/wafregional/api_op_UpdateSqlInjectionMatchSet.go index 7959d40fc6f..8d4c87f897b 100644 --- a/service/wafregional/api_op_UpdateSqlInjectionMatchSet.go +++ b/service/wafregional/api_op_UpdateSqlInjectionMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -67,9 +66,9 @@ func (c *Client) UpdateSqlInjectionMatchSet(ctx context.Context, params *UpdateS addawsAwsjson11_serdeOpUpdateSqlInjectionMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_UpdateWebACL.go b/service/wafregional/api_op_UpdateWebACL.go index 7c04417fa74..b270a68c5c9 100644 --- a/service/wafregional/api_op_UpdateWebACL.go +++ b/service/wafregional/api_op_UpdateWebACL.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -81,9 +80,9 @@ func (c *Client) UpdateWebACL(ctx context.Context, params *UpdateWebACLInput, op addawsAwsjson11_serdeOpUpdateWebACLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/api_op_UpdateXssMatchSet.go b/service/wafregional/api_op_UpdateXssMatchSet.go index 8b7b1a5b1bf..b703702a0f2 100644 --- a/service/wafregional/api_op_UpdateXssMatchSet.go +++ b/service/wafregional/api_op_UpdateXssMatchSet.go @@ -5,7 +5,6 @@ package wafregional import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafregional/types" smithy "github.com/awslabs/smithy-go" @@ -66,9 +65,9 @@ func (c *Client) UpdateXssMatchSet(ctx context.Context, params *UpdateXssMatchSe addawsAwsjson11_serdeOpUpdateXssMatchSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafregional/endpoints.go b/service/wafregional/endpoints.go index 86a62c68f9f..cdc40b40042 100644 --- a/service/wafregional/endpoints.go +++ b/service/wafregional/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/wafv2/api_client.go b/service/wafv2/api_client.go index 9e096098a20..8920aa18729 100644 --- a/service/wafv2/api_client.go +++ b/service/wafv2/api_client.go @@ -131,30 +131,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -220,6 +196,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/wafv2/api_op_AssociateWebACL.go b/service/wafv2/api_op_AssociateWebACL.go index 31a7e79815d..b334269e2e3 100644 --- a/service/wafv2/api_op_AssociateWebACL.go +++ b/service/wafv2/api_op_AssociateWebACL.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) AssociateWebACL(ctx context.Context, params *AssociateWebACLInp addawsAwsjson11_serdeOpAssociateWebACLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_CheckCapacity.go b/service/wafv2/api_op_CheckCapacity.go index 4f120045b4b..d43a5e679d4 100644 --- a/service/wafv2/api_op_CheckCapacity.go +++ b/service/wafv2/api_op_CheckCapacity.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) CheckCapacity(ctx context.Context, params *CheckCapacityInput, addawsAwsjson11_serdeOpCheckCapacityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_CreateIPSet.go b/service/wafv2/api_op_CreateIPSet.go index 8f6944afae8..7d5e8e1f984 100644 --- a/service/wafv2/api_op_CreateIPSet.go +++ b/service/wafv2/api_op_CreateIPSet.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) CreateIPSet(ctx context.Context, params *CreateIPSetInput, optF addawsAwsjson11_serdeOpCreateIPSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_CreateRegexPatternSet.go b/service/wafv2/api_op_CreateRegexPatternSet.go index 71b185a9b65..ebcb033a73e 100644 --- a/service/wafv2/api_op_CreateRegexPatternSet.go +++ b/service/wafv2/api_op_CreateRegexPatternSet.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateRegexPatternSet(ctx context.Context, params *CreateRegexP addawsAwsjson11_serdeOpCreateRegexPatternSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_CreateRuleGroup.go b/service/wafv2/api_op_CreateRuleGroup.go index a6c03660c2b..8f52a23d46d 100644 --- a/service/wafv2/api_op_CreateRuleGroup.go +++ b/service/wafv2/api_op_CreateRuleGroup.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) CreateRuleGroup(ctx context.Context, params *CreateRuleGroupInp addawsAwsjson11_serdeOpCreateRuleGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_CreateWebACL.go b/service/wafv2/api_op_CreateWebACL.go index e357ed3742f..458749f5151 100644 --- a/service/wafv2/api_op_CreateWebACL.go +++ b/service/wafv2/api_op_CreateWebACL.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) CreateWebACL(ctx context.Context, params *CreateWebACLInput, op addawsAwsjson11_serdeOpCreateWebACLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_DeleteFirewallManagerRuleGroups.go b/service/wafv2/api_op_DeleteFirewallManagerRuleGroups.go index 02b0e32ad68..0b11d7f4c34 100644 --- a/service/wafv2/api_op_DeleteFirewallManagerRuleGroups.go +++ b/service/wafv2/api_op_DeleteFirewallManagerRuleGroups.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteFirewallManagerRuleGroups(ctx context.Context, params *De addawsAwsjson11_serdeOpDeleteFirewallManagerRuleGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_DeleteIPSet.go b/service/wafv2/api_op_DeleteIPSet.go index 1c87d33dda1..5ec133c6595 100644 --- a/service/wafv2/api_op_DeleteIPSet.go +++ b/service/wafv2/api_op_DeleteIPSet.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeleteIPSet(ctx context.Context, params *DeleteIPSetInput, optF addawsAwsjson11_serdeOpDeleteIPSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_DeleteLoggingConfiguration.go b/service/wafv2/api_op_DeleteLoggingConfiguration.go index 57c9b444d93..dbfd81020b6 100644 --- a/service/wafv2/api_op_DeleteLoggingConfiguration.go +++ b/service/wafv2/api_op_DeleteLoggingConfiguration.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteLoggingConfiguration(ctx context.Context, params *DeleteL addawsAwsjson11_serdeOpDeleteLoggingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_DeletePermissionPolicy.go b/service/wafv2/api_op_DeletePermissionPolicy.go index 5a49425e7c4..8b4e967fb5b 100644 --- a/service/wafv2/api_op_DeletePermissionPolicy.go +++ b/service/wafv2/api_op_DeletePermissionPolicy.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeletePermissionPolicy(ctx context.Context, params *DeletePermi addawsAwsjson11_serdeOpDeletePermissionPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_DeleteRegexPatternSet.go b/service/wafv2/api_op_DeleteRegexPatternSet.go index 502e3c995c4..db6c966f29a 100644 --- a/service/wafv2/api_op_DeleteRegexPatternSet.go +++ b/service/wafv2/api_op_DeleteRegexPatternSet.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeleteRegexPatternSet(ctx context.Context, params *DeleteRegexP addawsAwsjson11_serdeOpDeleteRegexPatternSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_DeleteRuleGroup.go b/service/wafv2/api_op_DeleteRuleGroup.go index f432d7d7509..730a6539865 100644 --- a/service/wafv2/api_op_DeleteRuleGroup.go +++ b/service/wafv2/api_op_DeleteRuleGroup.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DeleteRuleGroup(ctx context.Context, params *DeleteRuleGroupInp addawsAwsjson11_serdeOpDeleteRuleGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_DeleteWebACL.go b/service/wafv2/api_op_DeleteWebACL.go index 210a364c44f..c914f4ce90b 100644 --- a/service/wafv2/api_op_DeleteWebACL.go +++ b/service/wafv2/api_op_DeleteWebACL.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DeleteWebACL(ctx context.Context, params *DeleteWebACLInput, op addawsAwsjson11_serdeOpDeleteWebACLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_DescribeManagedRuleGroup.go b/service/wafv2/api_op_DescribeManagedRuleGroup.go index 74d798fc457..877ff14290f 100644 --- a/service/wafv2/api_op_DescribeManagedRuleGroup.go +++ b/service/wafv2/api_op_DescribeManagedRuleGroup.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) DescribeManagedRuleGroup(ctx context.Context, params *DescribeM addawsAwsjson11_serdeOpDescribeManagedRuleGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_DisassociateWebACL.go b/service/wafv2/api_op_DisassociateWebACL.go index c8a6c22b492..a9c156c4897 100644 --- a/service/wafv2/api_op_DisassociateWebACL.go +++ b/service/wafv2/api_op_DisassociateWebACL.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -32,9 +31,9 @@ func (c *Client) DisassociateWebACL(ctx context.Context, params *DisassociateWeb addawsAwsjson11_serdeOpDisassociateWebACLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_GetIPSet.go b/service/wafv2/api_op_GetIPSet.go index be3a51b00c1..5fed9fa1d6b 100644 --- a/service/wafv2/api_op_GetIPSet.go +++ b/service/wafv2/api_op_GetIPSet.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetIPSet(ctx context.Context, params *GetIPSetInput, optFns ... addawsAwsjson11_serdeOpGetIPSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_GetLoggingConfiguration.go b/service/wafv2/api_op_GetLoggingConfiguration.go index 612b751cc4f..eace54b191e 100644 --- a/service/wafv2/api_op_GetLoggingConfiguration.go +++ b/service/wafv2/api_op_GetLoggingConfiguration.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetLoggingConfiguration(ctx context.Context, params *GetLogging addawsAwsjson11_serdeOpGetLoggingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_GetPermissionPolicy.go b/service/wafv2/api_op_GetPermissionPolicy.go index 0e98783fc29..87581e9d11e 100644 --- a/service/wafv2/api_op_GetPermissionPolicy.go +++ b/service/wafv2/api_op_GetPermissionPolicy.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetPermissionPolicy(ctx context.Context, params *GetPermissionP addawsAwsjson11_serdeOpGetPermissionPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_GetRateBasedStatementManagedKeys.go b/service/wafv2/api_op_GetRateBasedStatementManagedKeys.go index 66596215608..f75c22bcd00 100644 --- a/service/wafv2/api_op_GetRateBasedStatementManagedKeys.go +++ b/service/wafv2/api_op_GetRateBasedStatementManagedKeys.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) GetRateBasedStatementManagedKeys(ctx context.Context, params *G addawsAwsjson11_serdeOpGetRateBasedStatementManagedKeysMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_GetRegexPatternSet.go b/service/wafv2/api_op_GetRegexPatternSet.go index 2e99dda86f6..58b3187a83b 100644 --- a/service/wafv2/api_op_GetRegexPatternSet.go +++ b/service/wafv2/api_op_GetRegexPatternSet.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetRegexPatternSet(ctx context.Context, params *GetRegexPattern addawsAwsjson11_serdeOpGetRegexPatternSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_GetRuleGroup.go b/service/wafv2/api_op_GetRuleGroup.go index 4859d88cc05..5d040f9a9a6 100644 --- a/service/wafv2/api_op_GetRuleGroup.go +++ b/service/wafv2/api_op_GetRuleGroup.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetRuleGroup(ctx context.Context, params *GetRuleGroupInput, op addawsAwsjson11_serdeOpGetRuleGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_GetSampledRequests.go b/service/wafv2/api_op_GetSampledRequests.go index 5d652dc40fd..67fb69ab4d7 100644 --- a/service/wafv2/api_op_GetSampledRequests.go +++ b/service/wafv2/api_op_GetSampledRequests.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -35,9 +34,9 @@ func (c *Client) GetSampledRequests(ctx context.Context, params *GetSampledReque addawsAwsjson11_serdeOpGetSampledRequestsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_GetWebACL.go b/service/wafv2/api_op_GetWebACL.go index ce7ff523c89..6851865adb7 100644 --- a/service/wafv2/api_op_GetWebACL.go +++ b/service/wafv2/api_op_GetWebACL.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetWebACL(ctx context.Context, params *GetWebACLInput, optFns . addawsAwsjson11_serdeOpGetWebACLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_GetWebACLForResource.go b/service/wafv2/api_op_GetWebACLForResource.go index 13943e709ef..90c3527ca05 100644 --- a/service/wafv2/api_op_GetWebACLForResource.go +++ b/service/wafv2/api_op_GetWebACLForResource.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetWebACLForResource(ctx context.Context, params *GetWebACLForR addawsAwsjson11_serdeOpGetWebACLForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_ListAvailableManagedRuleGroups.go b/service/wafv2/api_op_ListAvailableManagedRuleGroups.go index 18798a63e20..33f8a671455 100644 --- a/service/wafv2/api_op_ListAvailableManagedRuleGroups.go +++ b/service/wafv2/api_op_ListAvailableManagedRuleGroups.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) ListAvailableManagedRuleGroups(ctx context.Context, params *Lis addawsAwsjson11_serdeOpListAvailableManagedRuleGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_ListIPSets.go b/service/wafv2/api_op_ListIPSets.go index 70ff51afff4..77671d86b9e 100644 --- a/service/wafv2/api_op_ListIPSets.go +++ b/service/wafv2/api_op_ListIPSets.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListIPSets(ctx context.Context, params *ListIPSetsInput, optFns addawsAwsjson11_serdeOpListIPSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_ListLoggingConfigurations.go b/service/wafv2/api_op_ListLoggingConfigurations.go index 3574a6f0a9d..58db8e65a3f 100644 --- a/service/wafv2/api_op_ListLoggingConfigurations.go +++ b/service/wafv2/api_op_ListLoggingConfigurations.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListLoggingConfigurations(ctx context.Context, params *ListLogg addawsAwsjson11_serdeOpListLoggingConfigurationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_ListRegexPatternSets.go b/service/wafv2/api_op_ListRegexPatternSets.go index e4d043ef95f..c7ae2e4d745 100644 --- a/service/wafv2/api_op_ListRegexPatternSets.go +++ b/service/wafv2/api_op_ListRegexPatternSets.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListRegexPatternSets(ctx context.Context, params *ListRegexPatt addawsAwsjson11_serdeOpListRegexPatternSetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_ListResourcesForWebACL.go b/service/wafv2/api_op_ListResourcesForWebACL.go index c7350a7f811..08b9a758c49 100644 --- a/service/wafv2/api_op_ListResourcesForWebACL.go +++ b/service/wafv2/api_op_ListResourcesForWebACL.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) ListResourcesForWebACL(ctx context.Context, params *ListResourc addawsAwsjson11_serdeOpListResourcesForWebACLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_ListRuleGroups.go b/service/wafv2/api_op_ListRuleGroups.go index ea95f68f63e..ea30db04ac6 100644 --- a/service/wafv2/api_op_ListRuleGroups.go +++ b/service/wafv2/api_op_ListRuleGroups.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) ListRuleGroups(ctx context.Context, params *ListRuleGroupsInput addawsAwsjson11_serdeOpListRuleGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_ListTagsForResource.go b/service/wafv2/api_op_ListTagsForResource.go index ff0aa17483b..2edd2c82bbe 100644 --- a/service/wafv2/api_op_ListTagsForResource.go +++ b/service/wafv2/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsAwsjson11_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_ListWebACLs.go b/service/wafv2/api_op_ListWebACLs.go index a230a018ad2..f79d9236748 100644 --- a/service/wafv2/api_op_ListWebACLs.go +++ b/service/wafv2/api_op_ListWebACLs.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ListWebACLs(ctx context.Context, params *ListWebACLsInput, optF addawsAwsjson11_serdeOpListWebACLsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_PutLoggingConfiguration.go b/service/wafv2/api_op_PutLoggingConfiguration.go index f2718efc8ea..f2f7b301528 100644 --- a/service/wafv2/api_op_PutLoggingConfiguration.go +++ b/service/wafv2/api_op_PutLoggingConfiguration.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -47,9 +46,9 @@ func (c *Client) PutLoggingConfiguration(ctx context.Context, params *PutLogging addawsAwsjson11_serdeOpPutLoggingConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_PutPermissionPolicy.go b/service/wafv2/api_op_PutPermissionPolicy.go index 34aaf508169..4555938773d 100644 --- a/service/wafv2/api_op_PutPermissionPolicy.go +++ b/service/wafv2/api_op_PutPermissionPolicy.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -34,9 +33,9 @@ func (c *Client) PutPermissionPolicy(ctx context.Context, params *PutPermissionP addawsAwsjson11_serdeOpPutPermissionPolicyMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_TagResource.go b/service/wafv2/api_op_TagResource.go index 47cfb881a3a..972d98e533c 100644 --- a/service/wafv2/api_op_TagResource.go +++ b/service/wafv2/api_op_TagResource.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -33,9 +32,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsAwsjson11_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_UntagResource.go b/service/wafv2/api_op_UntagResource.go index 01030420a15..9575a917e2e 100644 --- a/service/wafv2/api_op_UntagResource.go +++ b/service/wafv2/api_op_UntagResource.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -29,9 +28,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsAwsjson11_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_UpdateIPSet.go b/service/wafv2/api_op_UpdateIPSet.go index a76c4ec04f1..9f2603673cf 100644 --- a/service/wafv2/api_op_UpdateIPSet.go +++ b/service/wafv2/api_op_UpdateIPSet.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateIPSet(ctx context.Context, params *UpdateIPSetInput, optF addawsAwsjson11_serdeOpUpdateIPSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_UpdateRegexPatternSet.go b/service/wafv2/api_op_UpdateRegexPatternSet.go index 048b741bfcd..05eef89ca08 100644 --- a/service/wafv2/api_op_UpdateRegexPatternSet.go +++ b/service/wafv2/api_op_UpdateRegexPatternSet.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) UpdateRegexPatternSet(ctx context.Context, params *UpdateRegexP addawsAwsjson11_serdeOpUpdateRegexPatternSetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_UpdateRuleGroup.go b/service/wafv2/api_op_UpdateRuleGroup.go index 16fe449aed6..2b9bd0b0cf9 100644 --- a/service/wafv2/api_op_UpdateRuleGroup.go +++ b/service/wafv2/api_op_UpdateRuleGroup.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -31,9 +30,9 @@ func (c *Client) UpdateRuleGroup(ctx context.Context, params *UpdateRuleGroupInp addawsAwsjson11_serdeOpUpdateRuleGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/api_op_UpdateWebACL.go b/service/wafv2/api_op_UpdateWebACL.go index 00db60441de..e7820f18bf1 100644 --- a/service/wafv2/api_op_UpdateWebACL.go +++ b/service/wafv2/api_op_UpdateWebACL.go @@ -5,7 +5,6 @@ package wafv2 import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/wafv2/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) UpdateWebACL(ctx context.Context, params *UpdateWebACLInput, op addawsAwsjson11_serdeOpUpdateWebACLMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/wafv2/endpoints.go b/service/wafv2/endpoints.go index 4eb72c0bcac..1f35758fe80 100644 --- a/service/wafv2/endpoints.go +++ b/service/wafv2/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/workdocs/api_client.go b/service/workdocs/api_client.go index 103507b6945..fb52eb28cce 100644 --- a/service/workdocs/api_client.go +++ b/service/workdocs/api_client.go @@ -108,30 +108,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -197,6 +173,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/workdocs/api_op_AbortDocumentVersionUpload.go b/service/workdocs/api_op_AbortDocumentVersionUpload.go index dcb5d434f3d..2c328850c27 100644 --- a/service/workdocs/api_op_AbortDocumentVersionUpload.go +++ b/service/workdocs/api_op_AbortDocumentVersionUpload.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) AbortDocumentVersionUpload(ctx context.Context, params *AbortDo addawsRestjson1_serdeOpAbortDocumentVersionUploadMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_ActivateUser.go b/service/workdocs/api_op_ActivateUser.go index 2669f2d2226..6e93a7e59ff 100644 --- a/service/workdocs/api_op_ActivateUser.go +++ b/service/workdocs/api_op_ActivateUser.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ActivateUser(ctx context.Context, params *ActivateUserInput, op addawsRestjson1_serdeOpActivateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_AddResourcePermissions.go b/service/workdocs/api_op_AddResourcePermissions.go index 68d0107b823..4c491680e45 100644 --- a/service/workdocs/api_op_AddResourcePermissions.go +++ b/service/workdocs/api_op_AddResourcePermissions.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) AddResourcePermissions(ctx context.Context, params *AddResource addawsRestjson1_serdeOpAddResourcePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_CreateComment.go b/service/workdocs/api_op_CreateComment.go index 63c4914d968..13e5c6bbf4f 100644 --- a/service/workdocs/api_op_CreateComment.go +++ b/service/workdocs/api_op_CreateComment.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateComment(ctx context.Context, params *CreateCommentInput, addawsRestjson1_serdeOpCreateCommentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_CreateCustomMetadata.go b/service/workdocs/api_op_CreateCustomMetadata.go index 12552269002..c4bad63f090 100644 --- a/service/workdocs/api_op_CreateCustomMetadata.go +++ b/service/workdocs/api_op_CreateCustomMetadata.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateCustomMetadata(ctx context.Context, params *CreateCustomM addawsRestjson1_serdeOpCreateCustomMetadataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_CreateFolder.go b/service/workdocs/api_op_CreateFolder.go index 688ac0a76c6..6fc29d661ce 100644 --- a/service/workdocs/api_op_CreateFolder.go +++ b/service/workdocs/api_op_CreateFolder.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateFolder(ctx context.Context, params *CreateFolderInput, op addawsRestjson1_serdeOpCreateFolderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_CreateLabels.go b/service/workdocs/api_op_CreateLabels.go index 9581a369cb3..8e966de29c8 100644 --- a/service/workdocs/api_op_CreateLabels.go +++ b/service/workdocs/api_op_CreateLabels.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateLabels(ctx context.Context, params *CreateLabelsInput, op addawsRestjson1_serdeOpCreateLabelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_CreateNotificationSubscription.go b/service/workdocs/api_op_CreateNotificationSubscription.go index 6bc84d4d6b8..f73c500f3ff 100644 --- a/service/workdocs/api_op_CreateNotificationSubscription.go +++ b/service/workdocs/api_op_CreateNotificationSubscription.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) CreateNotificationSubscription(ctx context.Context, params *Cre addawsRestjson1_serdeOpCreateNotificationSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_CreateUser.go b/service/workdocs/api_op_CreateUser.go index d5c8372a8c1..2b63890b69b 100644 --- a/service/workdocs/api_op_CreateUser.go +++ b/service/workdocs/api_op_CreateUser.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateUser(ctx context.Context, params *CreateUserInput, optFns addawsRestjson1_serdeOpCreateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_DeactivateUser.go b/service/workdocs/api_op_DeactivateUser.go index ea907b43f6f..842e7eff814 100644 --- a/service/workdocs/api_op_DeactivateUser.go +++ b/service/workdocs/api_op_DeactivateUser.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeactivateUser(ctx context.Context, params *DeactivateUserInput addawsRestjson1_serdeOpDeactivateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_DeleteComment.go b/service/workdocs/api_op_DeleteComment.go index 099e5607824..cb2e055a5f5 100644 --- a/service/workdocs/api_op_DeleteComment.go +++ b/service/workdocs/api_op_DeleteComment.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteComment(ctx context.Context, params *DeleteCommentInput, addawsRestjson1_serdeOpDeleteCommentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_DeleteCustomMetadata.go b/service/workdocs/api_op_DeleteCustomMetadata.go index e77e7a9a171..41a4c850deb 100644 --- a/service/workdocs/api_op_DeleteCustomMetadata.go +++ b/service/workdocs/api_op_DeleteCustomMetadata.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteCustomMetadata(ctx context.Context, params *DeleteCustomM addawsRestjson1_serdeOpDeleteCustomMetadataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_DeleteDocument.go b/service/workdocs/api_op_DeleteDocument.go index aa1dabcd51f..95ee9bc57ff 100644 --- a/service/workdocs/api_op_DeleteDocument.go +++ b/service/workdocs/api_op_DeleteDocument.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteDocument(ctx context.Context, params *DeleteDocumentInput addawsRestjson1_serdeOpDeleteDocumentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_DeleteFolder.go b/service/workdocs/api_op_DeleteFolder.go index 48345b10a5f..da4a0723940 100644 --- a/service/workdocs/api_op_DeleteFolder.go +++ b/service/workdocs/api_op_DeleteFolder.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteFolder(ctx context.Context, params *DeleteFolderInput, op addawsRestjson1_serdeOpDeleteFolderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_DeleteFolderContents.go b/service/workdocs/api_op_DeleteFolderContents.go index 335ca585f80..cbb877afca8 100644 --- a/service/workdocs/api_op_DeleteFolderContents.go +++ b/service/workdocs/api_op_DeleteFolderContents.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteFolderContents(ctx context.Context, params *DeleteFolderC addawsRestjson1_serdeOpDeleteFolderContentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_DeleteLabels.go b/service/workdocs/api_op_DeleteLabels.go index f324eb0c444..5fe5a05a54d 100644 --- a/service/workdocs/api_op_DeleteLabels.go +++ b/service/workdocs/api_op_DeleteLabels.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteLabels(ctx context.Context, params *DeleteLabelsInput, op addawsRestjson1_serdeOpDeleteLabelsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_DeleteNotificationSubscription.go b/service/workdocs/api_op_DeleteNotificationSubscription.go index c81526a6320..b9347c00ef0 100644 --- a/service/workdocs/api_op_DeleteNotificationSubscription.go +++ b/service/workdocs/api_op_DeleteNotificationSubscription.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteNotificationSubscription(ctx context.Context, params *Del addawsRestjson1_serdeOpDeleteNotificationSubscriptionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_DeleteUser.go b/service/workdocs/api_op_DeleteUser.go index 6046c4b397c..40312d22164 100644 --- a/service/workdocs/api_op_DeleteUser.go +++ b/service/workdocs/api_op_DeleteUser.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteUser(ctx context.Context, params *DeleteUserInput, optFns addawsRestjson1_serdeOpDeleteUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_DescribeActivities.go b/service/workdocs/api_op_DescribeActivities.go index 1c19895aa1d..7f24463b9d4 100644 --- a/service/workdocs/api_op_DescribeActivities.go +++ b/service/workdocs/api_op_DescribeActivities.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeActivities(ctx context.Context, params *DescribeActivit addawsRestjson1_serdeOpDescribeActivitiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_DescribeComments.go b/service/workdocs/api_op_DescribeComments.go index ceca3830e53..6d992c81740 100644 --- a/service/workdocs/api_op_DescribeComments.go +++ b/service/workdocs/api_op_DescribeComments.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeComments(ctx context.Context, params *DescribeCommentsI addawsRestjson1_serdeOpDescribeCommentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_DescribeDocumentVersions.go b/service/workdocs/api_op_DescribeDocumentVersions.go index 64deb8cc52b..ba56143d217 100644 --- a/service/workdocs/api_op_DescribeDocumentVersions.go +++ b/service/workdocs/api_op_DescribeDocumentVersions.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDocumentVersions(ctx context.Context, params *DescribeD addawsRestjson1_serdeOpDescribeDocumentVersionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_DescribeFolderContents.go b/service/workdocs/api_op_DescribeFolderContents.go index 4b80f1dcedd..fba5894de12 100644 --- a/service/workdocs/api_op_DescribeFolderContents.go +++ b/service/workdocs/api_op_DescribeFolderContents.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) DescribeFolderContents(ctx context.Context, params *DescribeFol addawsRestjson1_serdeOpDescribeFolderContentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_DescribeGroups.go b/service/workdocs/api_op_DescribeGroups.go index 87ea81fbc5e..b63d44a59a1 100644 --- a/service/workdocs/api_op_DescribeGroups.go +++ b/service/workdocs/api_op_DescribeGroups.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeGroups(ctx context.Context, params *DescribeGroupsInput addawsRestjson1_serdeOpDescribeGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_DescribeNotificationSubscriptions.go b/service/workdocs/api_op_DescribeNotificationSubscriptions.go index 5706f74ea33..33ff23be576 100644 --- a/service/workdocs/api_op_DescribeNotificationSubscriptions.go +++ b/service/workdocs/api_op_DescribeNotificationSubscriptions.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeNotificationSubscriptions(ctx context.Context, params * addawsRestjson1_serdeOpDescribeNotificationSubscriptionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_DescribeResourcePermissions.go b/service/workdocs/api_op_DescribeResourcePermissions.go index e2ba3122de3..5137d9705a2 100644 --- a/service/workdocs/api_op_DescribeResourcePermissions.go +++ b/service/workdocs/api_op_DescribeResourcePermissions.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeResourcePermissions(ctx context.Context, params *Descri addawsRestjson1_serdeOpDescribeResourcePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_DescribeRootFolders.go b/service/workdocs/api_op_DescribeRootFolders.go index 5b41dadb63f..395a179713e 100644 --- a/service/workdocs/api_op_DescribeRootFolders.go +++ b/service/workdocs/api_op_DescribeRootFolders.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -30,9 +29,9 @@ func (c *Client) DescribeRootFolders(ctx context.Context, params *DescribeRootFo addawsRestjson1_serdeOpDescribeRootFoldersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_DescribeUsers.go b/service/workdocs/api_op_DescribeUsers.go index 0a1a18ac6cf..2ff1a456716 100644 --- a/service/workdocs/api_op_DescribeUsers.go +++ b/service/workdocs/api_op_DescribeUsers.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) DescribeUsers(ctx context.Context, params *DescribeUsersInput, addawsRestjson1_serdeOpDescribeUsersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_GetCurrentUser.go b/service/workdocs/api_op_GetCurrentUser.go index cebe838625f..964aba0db2c 100644 --- a/service/workdocs/api_op_GetCurrentUser.go +++ b/service/workdocs/api_op_GetCurrentUser.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetCurrentUser(ctx context.Context, params *GetCurrentUserInput addawsRestjson1_serdeOpGetCurrentUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_GetDocument.go b/service/workdocs/api_op_GetDocument.go index d45da5d0dbf..aa9682c0ec7 100644 --- a/service/workdocs/api_op_GetDocument.go +++ b/service/workdocs/api_op_GetDocument.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDocument(ctx context.Context, params *GetDocumentInput, optF addawsRestjson1_serdeOpGetDocumentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_GetDocumentPath.go b/service/workdocs/api_op_GetDocumentPath.go index 3490199cfcd..98f7019e513 100644 --- a/service/workdocs/api_op_GetDocumentPath.go +++ b/service/workdocs/api_op_GetDocumentPath.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetDocumentPath(ctx context.Context, params *GetDocumentPathInp addawsRestjson1_serdeOpGetDocumentPathMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_GetDocumentVersion.go b/service/workdocs/api_op_GetDocumentVersion.go index d8493d6d4ef..1b6dc795e11 100644 --- a/service/workdocs/api_op_GetDocumentVersion.go +++ b/service/workdocs/api_op_GetDocumentVersion.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetDocumentVersion(ctx context.Context, params *GetDocumentVers addawsRestjson1_serdeOpGetDocumentVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_GetFolder.go b/service/workdocs/api_op_GetFolder.go index 137bae3bbd5..ca743567c89 100644 --- a/service/workdocs/api_op_GetFolder.go +++ b/service/workdocs/api_op_GetFolder.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetFolder(ctx context.Context, params *GetFolderInput, optFns . addawsRestjson1_serdeOpGetFolderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_GetFolderPath.go b/service/workdocs/api_op_GetFolderPath.go index c68aee66cac..856fe868f16 100644 --- a/service/workdocs/api_op_GetFolderPath.go +++ b/service/workdocs/api_op_GetFolderPath.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) GetFolderPath(ctx context.Context, params *GetFolderPathInput, addawsRestjson1_serdeOpGetFolderPathMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_GetResources.go b/service/workdocs/api_op_GetResources.go index 8560e34a2b1..fa31bb6a398 100644 --- a/service/workdocs/api_op_GetResources.go +++ b/service/workdocs/api_op_GetResources.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetResources(ctx context.Context, params *GetResourcesInput, op addawsRestjson1_serdeOpGetResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_InitiateDocumentVersionUpload.go b/service/workdocs/api_op_InitiateDocumentVersionUpload.go index 01e0690f2f5..93213877cdb 100644 --- a/service/workdocs/api_op_InitiateDocumentVersionUpload.go +++ b/service/workdocs/api_op_InitiateDocumentVersionUpload.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) InitiateDocumentVersionUpload(ctx context.Context, params *Init addawsRestjson1_serdeOpInitiateDocumentVersionUploadMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_RemoveAllResourcePermissions.go b/service/workdocs/api_op_RemoveAllResourcePermissions.go index 444888c4318..03f420d7660 100644 --- a/service/workdocs/api_op_RemoveAllResourcePermissions.go +++ b/service/workdocs/api_op_RemoveAllResourcePermissions.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RemoveAllResourcePermissions(ctx context.Context, params *Remov addawsRestjson1_serdeOpRemoveAllResourcePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_RemoveResourcePermission.go b/service/workdocs/api_op_RemoveResourcePermission.go index a14c12f15de..e341b89641b 100644 --- a/service/workdocs/api_op_RemoveResourcePermission.go +++ b/service/workdocs/api_op_RemoveResourcePermission.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) RemoveResourcePermission(ctx context.Context, params *RemoveRes addawsRestjson1_serdeOpRemoveResourcePermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_UpdateDocument.go b/service/workdocs/api_op_UpdateDocument.go index 40ce347d7cd..b0cac2d13a2 100644 --- a/service/workdocs/api_op_UpdateDocument.go +++ b/service/workdocs/api_op_UpdateDocument.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateDocument(ctx context.Context, params *UpdateDocumentInput addawsRestjson1_serdeOpUpdateDocumentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_UpdateDocumentVersion.go b/service/workdocs/api_op_UpdateDocumentVersion.go index 5cd8a6d1b50..6913b8f4166 100644 --- a/service/workdocs/api_op_UpdateDocumentVersion.go +++ b/service/workdocs/api_op_UpdateDocumentVersion.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) UpdateDocumentVersion(ctx context.Context, params *UpdateDocume addawsRestjson1_serdeOpUpdateDocumentVersionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_UpdateFolder.go b/service/workdocs/api_op_UpdateFolder.go index 492081ba32a..5c1537aed09 100644 --- a/service/workdocs/api_op_UpdateFolder.go +++ b/service/workdocs/api_op_UpdateFolder.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateFolder(ctx context.Context, params *UpdateFolderInput, op addawsRestjson1_serdeOpUpdateFolderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/api_op_UpdateUser.go b/service/workdocs/api_op_UpdateUser.go index 92c75882ff2..a3538033a83 100644 --- a/service/workdocs/api_op_UpdateUser.go +++ b/service/workdocs/api_op_UpdateUser.go @@ -5,7 +5,6 @@ package workdocs import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workdocs/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateUser(ctx context.Context, params *UpdateUserInput, optFns addawsRestjson1_serdeOpUpdateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workdocs/endpoints.go b/service/workdocs/endpoints.go index 275fd0395a2..297da2a53ce 100644 --- a/service/workdocs/endpoints.go +++ b/service/workdocs/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/worklink/api_client.go b/service/worklink/api_client.go index 5d49b532861..e77a93c7896 100644 --- a/service/worklink/api_client.go +++ b/service/worklink/api_client.go @@ -84,30 +84,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -173,6 +149,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/worklink/api_op_AssociateDomain.go b/service/worklink/api_op_AssociateDomain.go index a098765ee59..c90440dc23c 100644 --- a/service/worklink/api_op_AssociateDomain.go +++ b/service/worklink/api_op_AssociateDomain.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AssociateDomain(ctx context.Context, params *AssociateDomainInp addawsRestjson1_serdeOpAssociateDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_AssociateWebsiteAuthorizationProvider.go b/service/worklink/api_op_AssociateWebsiteAuthorizationProvider.go index 0e83c06d9c2..e95c87d76fe 100644 --- a/service/worklink/api_op_AssociateWebsiteAuthorizationProvider.go +++ b/service/worklink/api_op_AssociateWebsiteAuthorizationProvider.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/worklink/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) AssociateWebsiteAuthorizationProvider(ctx context.Context, para addawsRestjson1_serdeOpAssociateWebsiteAuthorizationProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_AssociateWebsiteCertificateAuthority.go b/service/worklink/api_op_AssociateWebsiteCertificateAuthority.go index ad3ff52e334..aa7af256e1d 100644 --- a/service/worklink/api_op_AssociateWebsiteCertificateAuthority.go +++ b/service/worklink/api_op_AssociateWebsiteCertificateAuthority.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) AssociateWebsiteCertificateAuthority(ctx context.Context, param addawsRestjson1_serdeOpAssociateWebsiteCertificateAuthorityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_CreateFleet.go b/service/worklink/api_op_CreateFleet.go index 187f5a7a742..aa83ec48a71 100644 --- a/service/worklink/api_op_CreateFleet.go +++ b/service/worklink/api_op_CreateFleet.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) CreateFleet(ctx context.Context, params *CreateFleetInput, optF addawsRestjson1_serdeOpCreateFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_DeleteFleet.go b/service/worklink/api_op_DeleteFleet.go index fa34081a827..bdb5ffbfe79 100644 --- a/service/worklink/api_op_DeleteFleet.go +++ b/service/worklink/api_op_DeleteFleet.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteFleet(ctx context.Context, params *DeleteFleetInput, optF addawsRestjson1_serdeOpDeleteFleetMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_DescribeAuditStreamConfiguration.go b/service/worklink/api_op_DescribeAuditStreamConfiguration.go index b97410230f2..c9d2c1f5702 100644 --- a/service/worklink/api_op_DescribeAuditStreamConfiguration.go +++ b/service/worklink/api_op_DescribeAuditStreamConfiguration.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DescribeAuditStreamConfiguration(ctx context.Context, params *D addawsRestjson1_serdeOpDescribeAuditStreamConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_DescribeCompanyNetworkConfiguration.go b/service/worklink/api_op_DescribeCompanyNetworkConfiguration.go index 476068caae4..08e5aa58b15 100644 --- a/service/worklink/api_op_DescribeCompanyNetworkConfiguration.go +++ b/service/worklink/api_op_DescribeCompanyNetworkConfiguration.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DescribeCompanyNetworkConfiguration(ctx context.Context, params addawsRestjson1_serdeOpDescribeCompanyNetworkConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_DescribeDevice.go b/service/worklink/api_op_DescribeDevice.go index 085dc7dddc0..57b15f9020d 100644 --- a/service/worklink/api_op_DescribeDevice.go +++ b/service/worklink/api_op_DescribeDevice.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/worklink/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDevice(ctx context.Context, params *DescribeDeviceInput addawsRestjson1_serdeOpDescribeDeviceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_DescribeDevicePolicyConfiguration.go b/service/worklink/api_op_DescribeDevicePolicyConfiguration.go index 4addaa21cc0..ecc29611e50 100644 --- a/service/worklink/api_op_DescribeDevicePolicyConfiguration.go +++ b/service/worklink/api_op_DescribeDevicePolicyConfiguration.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DescribeDevicePolicyConfiguration(ctx context.Context, params * addawsRestjson1_serdeOpDescribeDevicePolicyConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_DescribeDomain.go b/service/worklink/api_op_DescribeDomain.go index 0021a88cab6..15e0f297b29 100644 --- a/service/worklink/api_op_DescribeDomain.go +++ b/service/worklink/api_op_DescribeDomain.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/worklink/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeDomain(ctx context.Context, params *DescribeDomainInput addawsRestjson1_serdeOpDescribeDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_DescribeFleetMetadata.go b/service/worklink/api_op_DescribeFleetMetadata.go index 20162be3c13..a9a2e883e1d 100644 --- a/service/worklink/api_op_DescribeFleetMetadata.go +++ b/service/worklink/api_op_DescribeFleetMetadata.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/worklink/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeFleetMetadata(ctx context.Context, params *DescribeFlee addawsRestjson1_serdeOpDescribeFleetMetadataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_DescribeIdentityProviderConfiguration.go b/service/worklink/api_op_DescribeIdentityProviderConfiguration.go index 3444e411d21..d0ea353a8d4 100644 --- a/service/worklink/api_op_DescribeIdentityProviderConfiguration.go +++ b/service/worklink/api_op_DescribeIdentityProviderConfiguration.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/worklink/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeIdentityProviderConfiguration(ctx context.Context, para addawsRestjson1_serdeOpDescribeIdentityProviderConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_DescribeWebsiteCertificateAuthority.go b/service/worklink/api_op_DescribeWebsiteCertificateAuthority.go index 148890c4db9..db76d0b2dcc 100644 --- a/service/worklink/api_op_DescribeWebsiteCertificateAuthority.go +++ b/service/worklink/api_op_DescribeWebsiteCertificateAuthority.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DescribeWebsiteCertificateAuthority(ctx context.Context, params addawsRestjson1_serdeOpDescribeWebsiteCertificateAuthorityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_DisassociateDomain.go b/service/worklink/api_op_DisassociateDomain.go index 2f8f9eda6bb..c6676787346 100644 --- a/service/worklink/api_op_DisassociateDomain.go +++ b/service/worklink/api_op_DisassociateDomain.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisassociateDomain(ctx context.Context, params *DisassociateDom addawsRestjson1_serdeOpDisassociateDomainMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_DisassociateWebsiteAuthorizationProvider.go b/service/worklink/api_op_DisassociateWebsiteAuthorizationProvider.go index 1d66d4c175b..1ac511d7c04 100644 --- a/service/worklink/api_op_DisassociateWebsiteAuthorizationProvider.go +++ b/service/worklink/api_op_DisassociateWebsiteAuthorizationProvider.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DisassociateWebsiteAuthorizationProvider(ctx context.Context, p addawsRestjson1_serdeOpDisassociateWebsiteAuthorizationProviderMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_DisassociateWebsiteCertificateAuthority.go b/service/worklink/api_op_DisassociateWebsiteCertificateAuthority.go index 4c330628f9d..033fb3d340d 100644 --- a/service/worklink/api_op_DisassociateWebsiteCertificateAuthority.go +++ b/service/worklink/api_op_DisassociateWebsiteCertificateAuthority.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisassociateWebsiteCertificateAuthority(ctx context.Context, pa addawsRestjson1_serdeOpDisassociateWebsiteCertificateAuthorityMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_ListDevices.go b/service/worklink/api_op_ListDevices.go index fb0ae243cb5..07b5aff848f 100644 --- a/service/worklink/api_op_ListDevices.go +++ b/service/worklink/api_op_ListDevices.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/worklink/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDevices(ctx context.Context, params *ListDevicesInput, optF addawsRestjson1_serdeOpListDevicesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_ListDomains.go b/service/worklink/api_op_ListDomains.go index 2115e6f69f0..d1aacc7a4dc 100644 --- a/service/worklink/api_op_ListDomains.go +++ b/service/worklink/api_op_ListDomains.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/worklink/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListDomains(ctx context.Context, params *ListDomainsInput, optF addawsRestjson1_serdeOpListDomainsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_ListFleets.go b/service/worklink/api_op_ListFleets.go index c74ff7624d1..be26993bde0 100644 --- a/service/worklink/api_op_ListFleets.go +++ b/service/worklink/api_op_ListFleets.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/worklink/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListFleets(ctx context.Context, params *ListFleetsInput, optFns addawsRestjson1_serdeOpListFleetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_ListTagsForResource.go b/service/worklink/api_op_ListTagsForResource.go index dbc4b831581..871724731e4 100644 --- a/service/worklink/api_op_ListTagsForResource.go +++ b/service/worklink/api_op_ListTagsForResource.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListTagsForResource(ctx context.Context, params *ListTagsForRes addawsRestjson1_serdeOpListTagsForResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_ListWebsiteAuthorizationProviders.go b/service/worklink/api_op_ListWebsiteAuthorizationProviders.go index 39415e6820d..1d10d2666d6 100644 --- a/service/worklink/api_op_ListWebsiteAuthorizationProviders.go +++ b/service/worklink/api_op_ListWebsiteAuthorizationProviders.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/worklink/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListWebsiteAuthorizationProviders(ctx context.Context, params * addawsRestjson1_serdeOpListWebsiteAuthorizationProvidersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_ListWebsiteCertificateAuthorities.go b/service/worklink/api_op_ListWebsiteCertificateAuthorities.go index 60d637a6599..6984b054c44 100644 --- a/service/worklink/api_op_ListWebsiteCertificateAuthorities.go +++ b/service/worklink/api_op_ListWebsiteCertificateAuthorities.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/worklink/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListWebsiteCertificateAuthorities(ctx context.Context, params * addawsRestjson1_serdeOpListWebsiteCertificateAuthoritiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_RestoreDomainAccess.go b/service/worklink/api_op_RestoreDomainAccess.go index 3c012efd7ec..0c918eb8de7 100644 --- a/service/worklink/api_op_RestoreDomainAccess.go +++ b/service/worklink/api_op_RestoreDomainAccess.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RestoreDomainAccess(ctx context.Context, params *RestoreDomainA addawsRestjson1_serdeOpRestoreDomainAccessMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_RevokeDomainAccess.go b/service/worklink/api_op_RevokeDomainAccess.go index fa513f2bb58..7768af9d6e8 100644 --- a/service/worklink/api_op_RevokeDomainAccess.go +++ b/service/worklink/api_op_RevokeDomainAccess.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RevokeDomainAccess(ctx context.Context, params *RevokeDomainAcc addawsRestjson1_serdeOpRevokeDomainAccessMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_SignOutUser.go b/service/worklink/api_op_SignOutUser.go index b0b7b9f694c..10698641a7f 100644 --- a/service/worklink/api_op_SignOutUser.go +++ b/service/worklink/api_op_SignOutUser.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) SignOutUser(ctx context.Context, params *SignOutUserInput, optF addawsRestjson1_serdeOpSignOutUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_TagResource.go b/service/worklink/api_op_TagResource.go index 04230ed66fe..cbdc3c3f27c 100644 --- a/service/worklink/api_op_TagResource.go +++ b/service/worklink/api_op_TagResource.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) TagResource(ctx context.Context, params *TagResourceInput, optF addawsRestjson1_serdeOpTagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_UntagResource.go b/service/worklink/api_op_UntagResource.go index ee9e8b64c8f..86d69a6535e 100644 --- a/service/worklink/api_op_UntagResource.go +++ b/service/worklink/api_op_UntagResource.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UntagResource(ctx context.Context, params *UntagResourceInput, addawsRestjson1_serdeOpUntagResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_UpdateAuditStreamConfiguration.go b/service/worklink/api_op_UpdateAuditStreamConfiguration.go index 2b06a875f3e..a951e20c947 100644 --- a/service/worklink/api_op_UpdateAuditStreamConfiguration.go +++ b/service/worklink/api_op_UpdateAuditStreamConfiguration.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateAuditStreamConfiguration(ctx context.Context, params *Upd addawsRestjson1_serdeOpUpdateAuditStreamConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_UpdateCompanyNetworkConfiguration.go b/service/worklink/api_op_UpdateCompanyNetworkConfiguration.go index 80c7a15b85f..42efda66e5e 100644 --- a/service/worklink/api_op_UpdateCompanyNetworkConfiguration.go +++ b/service/worklink/api_op_UpdateCompanyNetworkConfiguration.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateCompanyNetworkConfiguration(ctx context.Context, params * addawsRestjson1_serdeOpUpdateCompanyNetworkConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_UpdateDevicePolicyConfiguration.go b/service/worklink/api_op_UpdateDevicePolicyConfiguration.go index fca59f2c17e..015c0b95b03 100644 --- a/service/worklink/api_op_UpdateDevicePolicyConfiguration.go +++ b/service/worklink/api_op_UpdateDevicePolicyConfiguration.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateDevicePolicyConfiguration(ctx context.Context, params *Up addawsRestjson1_serdeOpUpdateDevicePolicyConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_UpdateDomainMetadata.go b/service/worklink/api_op_UpdateDomainMetadata.go index 36a2bed5693..e3db287f23a 100644 --- a/service/worklink/api_op_UpdateDomainMetadata.go +++ b/service/worklink/api_op_UpdateDomainMetadata.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateDomainMetadata(ctx context.Context, params *UpdateDomainM addawsRestjson1_serdeOpUpdateDomainMetadataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_UpdateFleetMetadata.go b/service/worklink/api_op_UpdateFleetMetadata.go index 8d3c686eade..352119c958c 100644 --- a/service/worklink/api_op_UpdateFleetMetadata.go +++ b/service/worklink/api_op_UpdateFleetMetadata.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateFleetMetadata(ctx context.Context, params *UpdateFleetMet addawsRestjson1_serdeOpUpdateFleetMetadataMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/api_op_UpdateIdentityProviderConfiguration.go b/service/worklink/api_op_UpdateIdentityProviderConfiguration.go index 82329f2591b..6fd3364d98d 100644 --- a/service/worklink/api_op_UpdateIdentityProviderConfiguration.go +++ b/service/worklink/api_op_UpdateIdentityProviderConfiguration.go @@ -5,7 +5,6 @@ package worklink import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/worklink/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateIdentityProviderConfiguration(ctx context.Context, params addawsRestjson1_serdeOpUpdateIdentityProviderConfigurationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/worklink/endpoints.go b/service/worklink/endpoints.go index e10526446b3..9f2a222234e 100644 --- a/service/worklink/endpoints.go +++ b/service/worklink/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/workmail/api_client.go b/service/workmail/api_client.go index a04eb087bc4..8a17d3ac418 100644 --- a/service/workmail/api_client.go +++ b/service/workmail/api_client.go @@ -104,30 +104,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -193,6 +169,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/workmail/api_op_AssociateDelegateToResource.go b/service/workmail/api_op_AssociateDelegateToResource.go index 2fc797b02fe..a5a160e22be 100644 --- a/service/workmail/api_op_AssociateDelegateToResource.go +++ b/service/workmail/api_op_AssociateDelegateToResource.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AssociateDelegateToResource(ctx context.Context, params *Associ addawsAwsjson11_serdeOpAssociateDelegateToResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_AssociateMemberToGroup.go b/service/workmail/api_op_AssociateMemberToGroup.go index f27d7cb2424..2bd86db11de 100644 --- a/service/workmail/api_op_AssociateMemberToGroup.go +++ b/service/workmail/api_op_AssociateMemberToGroup.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AssociateMemberToGroup(ctx context.Context, params *AssociateMe addawsAwsjson11_serdeOpAssociateMemberToGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_CreateAlias.go b/service/workmail/api_op_CreateAlias.go index 0d93c9aea20..9e740afd575 100644 --- a/service/workmail/api_op_CreateAlias.go +++ b/service/workmail/api_op_CreateAlias.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) CreateAlias(ctx context.Context, params *CreateAliasInput, optF addawsAwsjson11_serdeOpCreateAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_CreateGroup.go b/service/workmail/api_op_CreateGroup.go index 324360ec5dc..a2eea9deb3f 100644 --- a/service/workmail/api_op_CreateGroup.go +++ b/service/workmail/api_op_CreateGroup.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateGroup(ctx context.Context, params *CreateGroupInput, optF addawsAwsjson11_serdeOpCreateGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_CreateResource.go b/service/workmail/api_op_CreateResource.go index 15fa53f1ed4..6a72f180036 100644 --- a/service/workmail/api_op_CreateResource.go +++ b/service/workmail/api_op_CreateResource.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workmail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateResource(ctx context.Context, params *CreateResourceInput addawsAwsjson11_serdeOpCreateResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_CreateUser.go b/service/workmail/api_op_CreateUser.go index 7880d169211..6cb83173664 100644 --- a/service/workmail/api_op_CreateUser.go +++ b/service/workmail/api_op_CreateUser.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) CreateUser(ctx context.Context, params *CreateUserInput, optFns addawsAwsjson11_serdeOpCreateUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_DeleteAlias.go b/service/workmail/api_op_DeleteAlias.go index 8378dd8aa00..d697e1ba415 100644 --- a/service/workmail/api_op_DeleteAlias.go +++ b/service/workmail/api_op_DeleteAlias.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteAlias(ctx context.Context, params *DeleteAliasInput, optF addawsAwsjson11_serdeOpDeleteAliasMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_DeleteGroup.go b/service/workmail/api_op_DeleteGroup.go index f59f42674c3..18c15bf81f0 100644 --- a/service/workmail/api_op_DeleteGroup.go +++ b/service/workmail/api_op_DeleteGroup.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteGroup(ctx context.Context, params *DeleteGroupInput, optF addawsAwsjson11_serdeOpDeleteGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_DeleteMailboxPermissions.go b/service/workmail/api_op_DeleteMailboxPermissions.go index c8b2fad1e56..8f1c8afdc2a 100644 --- a/service/workmail/api_op_DeleteMailboxPermissions.go +++ b/service/workmail/api_op_DeleteMailboxPermissions.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteMailboxPermissions(ctx context.Context, params *DeleteMai addawsAwsjson11_serdeOpDeleteMailboxPermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_DeleteResource.go b/service/workmail/api_op_DeleteResource.go index 1df81e3b7da..f6980bc0674 100644 --- a/service/workmail/api_op_DeleteResource.go +++ b/service/workmail/api_op_DeleteResource.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteResource(ctx context.Context, params *DeleteResourceInput addawsAwsjson11_serdeOpDeleteResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_DeleteUser.go b/service/workmail/api_op_DeleteUser.go index f4f8cd430b1..364894a371a 100644 --- a/service/workmail/api_op_DeleteUser.go +++ b/service/workmail/api_op_DeleteUser.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -26,9 +25,9 @@ func (c *Client) DeleteUser(ctx context.Context, params *DeleteUserInput, optFns addawsAwsjson11_serdeOpDeleteUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_DeregisterFromWorkMail.go b/service/workmail/api_op_DeregisterFromWorkMail.go index e7613588ea2..c657ede2842 100644 --- a/service/workmail/api_op_DeregisterFromWorkMail.go +++ b/service/workmail/api_op_DeregisterFromWorkMail.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) DeregisterFromWorkMail(ctx context.Context, params *DeregisterF addawsAwsjson11_serdeOpDeregisterFromWorkMailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_DescribeGroup.go b/service/workmail/api_op_DescribeGroup.go index e3dc43053c1..80f40e557ff 100644 --- a/service/workmail/api_op_DescribeGroup.go +++ b/service/workmail/api_op_DescribeGroup.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workmail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeGroup(ctx context.Context, params *DescribeGroupInput, addawsAwsjson11_serdeOpDescribeGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_DescribeOrganization.go b/service/workmail/api_op_DescribeOrganization.go index 8e4d9283dfe..834508ef0c1 100644 --- a/service/workmail/api_op_DescribeOrganization.go +++ b/service/workmail/api_op_DescribeOrganization.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DescribeOrganization(ctx context.Context, params *DescribeOrgan addawsAwsjson11_serdeOpDescribeOrganizationMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_DescribeResource.go b/service/workmail/api_op_DescribeResource.go index 4870cb6014e..27963867da8 100644 --- a/service/workmail/api_op_DescribeResource.go +++ b/service/workmail/api_op_DescribeResource.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workmail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeResource(ctx context.Context, params *DescribeResourceI addawsAwsjson11_serdeOpDescribeResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_DescribeUser.go b/service/workmail/api_op_DescribeUser.go index ee418b547d1..15545914299 100644 --- a/service/workmail/api_op_DescribeUser.go +++ b/service/workmail/api_op_DescribeUser.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workmail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeUser(ctx context.Context, params *DescribeUserInput, op addawsAwsjson11_serdeOpDescribeUserMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_DisassociateDelegateFromResource.go b/service/workmail/api_op_DisassociateDelegateFromResource.go index bf81e93200a..588c7ff2453 100644 --- a/service/workmail/api_op_DisassociateDelegateFromResource.go +++ b/service/workmail/api_op_DisassociateDelegateFromResource.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisassociateDelegateFromResource(ctx context.Context, params *D addawsAwsjson11_serdeOpDisassociateDelegateFromResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_DisassociateMemberFromGroup.go b/service/workmail/api_op_DisassociateMemberFromGroup.go index 2bada64af5d..d4da4a4fc41 100644 --- a/service/workmail/api_op_DisassociateMemberFromGroup.go +++ b/service/workmail/api_op_DisassociateMemberFromGroup.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DisassociateMemberFromGroup(ctx context.Context, params *Disass addawsAwsjson11_serdeOpDisassociateMemberFromGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_GetMailboxDetails.go b/service/workmail/api_op_GetMailboxDetails.go index 837e9166b2e..65dfdd6bea2 100644 --- a/service/workmail/api_op_GetMailboxDetails.go +++ b/service/workmail/api_op_GetMailboxDetails.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) GetMailboxDetails(ctx context.Context, params *GetMailboxDetail addawsAwsjson11_serdeOpGetMailboxDetailsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_ListAliases.go b/service/workmail/api_op_ListAliases.go index f3005fa1c16..432348c4739 100644 --- a/service/workmail/api_op_ListAliases.go +++ b/service/workmail/api_op_ListAliases.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ListAliases(ctx context.Context, params *ListAliasesInput, optF addawsAwsjson11_serdeOpListAliasesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_ListGroupMembers.go b/service/workmail/api_op_ListGroupMembers.go index 044ec0305bb..aacfc3d765a 100644 --- a/service/workmail/api_op_ListGroupMembers.go +++ b/service/workmail/api_op_ListGroupMembers.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workmail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListGroupMembers(ctx context.Context, params *ListGroupMembersI addawsAwsjson11_serdeOpListGroupMembersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_ListGroups.go b/service/workmail/api_op_ListGroups.go index 293fbf346cb..19d939362a5 100644 --- a/service/workmail/api_op_ListGroups.go +++ b/service/workmail/api_op_ListGroups.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workmail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListGroups(ctx context.Context, params *ListGroupsInput, optFns addawsAwsjson11_serdeOpListGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_ListMailboxPermissions.go b/service/workmail/api_op_ListMailboxPermissions.go index 9b34286a685..171dde19b75 100644 --- a/service/workmail/api_op_ListMailboxPermissions.go +++ b/service/workmail/api_op_ListMailboxPermissions.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workmail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListMailboxPermissions(ctx context.Context, params *ListMailbox addawsAwsjson11_serdeOpListMailboxPermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_ListOrganizations.go b/service/workmail/api_op_ListOrganizations.go index a03b65cb931..0a8db2cbd04 100644 --- a/service/workmail/api_op_ListOrganizations.go +++ b/service/workmail/api_op_ListOrganizations.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workmail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListOrganizations(ctx context.Context, params *ListOrganization addawsAwsjson11_serdeOpListOrganizationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_ListResourceDelegates.go b/service/workmail/api_op_ListResourceDelegates.go index a5f68058e7f..5737560c321 100644 --- a/service/workmail/api_op_ListResourceDelegates.go +++ b/service/workmail/api_op_ListResourceDelegates.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workmail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ListResourceDelegates(ctx context.Context, params *ListResource addawsAwsjson11_serdeOpListResourceDelegatesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_ListResources.go b/service/workmail/api_op_ListResources.go index 8239a989532..e32c61f6bd2 100644 --- a/service/workmail/api_op_ListResources.go +++ b/service/workmail/api_op_ListResources.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workmail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListResources(ctx context.Context, params *ListResourcesInput, addawsAwsjson11_serdeOpListResourcesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_ListUsers.go b/service/workmail/api_op_ListUsers.go index a75f65f0942..98ffc77c867 100644 --- a/service/workmail/api_op_ListUsers.go +++ b/service/workmail/api_op_ListUsers.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workmail/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ListUsers(ctx context.Context, params *ListUsersInput, optFns . addawsAwsjson11_serdeOpListUsersMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_PutMailboxPermissions.go b/service/workmail/api_op_PutMailboxPermissions.go index 9ac6e9e0b63..9f195b6a913 100644 --- a/service/workmail/api_op_PutMailboxPermissions.go +++ b/service/workmail/api_op_PutMailboxPermissions.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workmail/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) PutMailboxPermissions(ctx context.Context, params *PutMailboxPe addawsAwsjson11_serdeOpPutMailboxPermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_RegisterToWorkMail.go b/service/workmail/api_op_RegisterToWorkMail.go index d9fc6dfc62c..768f4270f6c 100644 --- a/service/workmail/api_op_RegisterToWorkMail.go +++ b/service/workmail/api_op_RegisterToWorkMail.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) RegisterToWorkMail(ctx context.Context, params *RegisterToWorkM addawsAwsjson11_serdeOpRegisterToWorkMailMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_ResetPassword.go b/service/workmail/api_op_ResetPassword.go index bd1f52f25f8..b700dcfcbe8 100644 --- a/service/workmail/api_op_ResetPassword.go +++ b/service/workmail/api_op_ResetPassword.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) ResetPassword(ctx context.Context, params *ResetPasswordInput, addawsAwsjson11_serdeOpResetPasswordMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_UpdateMailboxQuota.go b/service/workmail/api_op_UpdateMailboxQuota.go index 3747aba5af0..0c0f851040a 100644 --- a/service/workmail/api_op_UpdateMailboxQuota.go +++ b/service/workmail/api_op_UpdateMailboxQuota.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) UpdateMailboxQuota(ctx context.Context, params *UpdateMailboxQu addawsAwsjson11_serdeOpUpdateMailboxQuotaMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_UpdatePrimaryEmailAddress.go b/service/workmail/api_op_UpdatePrimaryEmailAddress.go index 52c09786fd8..fd664657a2e 100644 --- a/service/workmail/api_op_UpdatePrimaryEmailAddress.go +++ b/service/workmail/api_op_UpdatePrimaryEmailAddress.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -25,9 +24,9 @@ func (c *Client) UpdatePrimaryEmailAddress(ctx context.Context, params *UpdatePr addawsAwsjson11_serdeOpUpdatePrimaryEmailAddressMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/api_op_UpdateResource.go b/service/workmail/api_op_UpdateResource.go index 2fdb9e7b72d..6dfba7bf0bb 100644 --- a/service/workmail/api_op_UpdateResource.go +++ b/service/workmail/api_op_UpdateResource.go @@ -5,7 +5,6 @@ package workmail import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workmail/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) UpdateResource(ctx context.Context, params *UpdateResourceInput addawsAwsjson11_serdeOpUpdateResourceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmail/endpoints.go b/service/workmail/endpoints.go index 900dd519c52..0da0a4f982b 100644 --- a/service/workmail/endpoints.go +++ b/service/workmail/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/workmailmessageflow/api_client.go b/service/workmailmessageflow/api_client.go index 3987eac433f..c611bb8b6f8 100644 --- a/service/workmailmessageflow/api_client.go +++ b/service/workmailmessageflow/api_client.go @@ -78,30 +78,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -167,6 +143,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/workmailmessageflow/api_op_GetRawMessageContent.go b/service/workmailmessageflow/api_op_GetRawMessageContent.go index 5c22c350faf..f5960cec895 100644 --- a/service/workmailmessageflow/api_op_GetRawMessageContent.go +++ b/service/workmailmessageflow/api_op_GetRawMessageContent.go @@ -5,7 +5,6 @@ package workmailmessageflow import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) GetRawMessageContent(ctx context.Context, params *GetRawMessage addawsRestjson1_serdeOpGetRawMessageContentMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workmailmessageflow/endpoints.go b/service/workmailmessageflow/endpoints.go index 000d1b1e0d8..e8da1e796b5 100644 --- a/service/workmailmessageflow/endpoints.go +++ b/service/workmailmessageflow/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/workspaces/api_client.go b/service/workspaces/api_client.go index 125837d229d..b43e1c5f297 100644 --- a/service/workspaces/api_client.go +++ b/service/workspaces/api_client.go @@ -78,30 +78,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -167,6 +143,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/workspaces/api_op_AssociateIpGroups.go b/service/workspaces/api_op_AssociateIpGroups.go index e3e9da3eac9..f5707626484 100644 --- a/service/workspaces/api_op_AssociateIpGroups.go +++ b/service/workspaces/api_op_AssociateIpGroups.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) AssociateIpGroups(ctx context.Context, params *AssociateIpGroup addawsAwsjson11_serdeOpAssociateIpGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_AuthorizeIpRules.go b/service/workspaces/api_op_AuthorizeIpRules.go index 4c54687e04b..b45b080ea0f 100644 --- a/service/workspaces/api_op_AuthorizeIpRules.go +++ b/service/workspaces/api_op_AuthorizeIpRules.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) AuthorizeIpRules(ctx context.Context, params *AuthorizeIpRulesI addawsAwsjson11_serdeOpAuthorizeIpRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_CopyWorkspaceImage.go b/service/workspaces/api_op_CopyWorkspaceImage.go index 267290c8a44..f6d4f6d2bd7 100644 --- a/service/workspaces/api_op_CopyWorkspaceImage.go +++ b/service/workspaces/api_op_CopyWorkspaceImage.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CopyWorkspaceImage(ctx context.Context, params *CopyWorkspaceIm addawsAwsjson11_serdeOpCopyWorkspaceImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_CreateIpGroup.go b/service/workspaces/api_op_CreateIpGroup.go index 8e580c30c4d..06faac5dd22 100644 --- a/service/workspaces/api_op_CreateIpGroup.go +++ b/service/workspaces/api_op_CreateIpGroup.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -32,9 +31,9 @@ func (c *Client) CreateIpGroup(ctx context.Context, params *CreateIpGroupInput, addawsAwsjson11_serdeOpCreateIpGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_CreateTags.go b/service/workspaces/api_op_CreateTags.go index f217ab58337..aad068c767d 100644 --- a/service/workspaces/api_op_CreateTags.go +++ b/service/workspaces/api_op_CreateTags.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateTags(ctx context.Context, params *CreateTagsInput, optFns addawsAwsjson11_serdeOpCreateTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_CreateWorkspaces.go b/service/workspaces/api_op_CreateWorkspaces.go index faece8891e5..f9088edbf90 100644 --- a/service/workspaces/api_op_CreateWorkspaces.go +++ b/service/workspaces/api_op_CreateWorkspaces.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) CreateWorkspaces(ctx context.Context, params *CreateWorkspacesI addawsAwsjson11_serdeOpCreateWorkspacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_DeleteIpGroup.go b/service/workspaces/api_op_DeleteIpGroup.go index 7ab471bb124..54bf3132138 100644 --- a/service/workspaces/api_op_DeleteIpGroup.go +++ b/service/workspaces/api_op_DeleteIpGroup.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DeleteIpGroup(ctx context.Context, params *DeleteIpGroupInput, addawsAwsjson11_serdeOpDeleteIpGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_DeleteTags.go b/service/workspaces/api_op_DeleteTags.go index 237a186150a..4afc232d43d 100644 --- a/service/workspaces/api_op_DeleteTags.go +++ b/service/workspaces/api_op_DeleteTags.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteTags(ctx context.Context, params *DeleteTagsInput, optFns addawsAwsjson11_serdeOpDeleteTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_DeleteWorkspaceImage.go b/service/workspaces/api_op_DeleteWorkspaceImage.go index e41b0b2a852..8937cae8e5f 100644 --- a/service/workspaces/api_op_DeleteWorkspaceImage.go +++ b/service/workspaces/api_op_DeleteWorkspaceImage.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeleteWorkspaceImage(ctx context.Context, params *DeleteWorkspa addawsAwsjson11_serdeOpDeleteWorkspaceImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_DeregisterWorkspaceDirectory.go b/service/workspaces/api_op_DeregisterWorkspaceDirectory.go index c8463cf58d2..b96c47a6542 100644 --- a/service/workspaces/api_op_DeregisterWorkspaceDirectory.go +++ b/service/workspaces/api_op_DeregisterWorkspaceDirectory.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -24,9 +23,9 @@ func (c *Client) DeregisterWorkspaceDirectory(ctx context.Context, params *Dereg addawsAwsjson11_serdeOpDeregisterWorkspaceDirectoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_DescribeAccount.go b/service/workspaces/api_op_DescribeAccount.go index 4f37055c082..228682fefcf 100644 --- a/service/workspaces/api_op_DescribeAccount.go +++ b/service/workspaces/api_op_DescribeAccount.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAccount(ctx context.Context, params *DescribeAccountInp addawsAwsjson11_serdeOpDescribeAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_DescribeAccountModifications.go b/service/workspaces/api_op_DescribeAccountModifications.go index b6f81be8470..1bf20337dbc 100644 --- a/service/workspaces/api_op_DescribeAccountModifications.go +++ b/service/workspaces/api_op_DescribeAccountModifications.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeAccountModifications(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribeAccountModificationsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_DescribeClientProperties.go b/service/workspaces/api_op_DescribeClientProperties.go index f495550d9fa..03de57efe38 100644 --- a/service/workspaces/api_op_DescribeClientProperties.go +++ b/service/workspaces/api_op_DescribeClientProperties.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeClientProperties(ctx context.Context, params *DescribeC addawsAwsjson11_serdeOpDescribeClientPropertiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_DescribeIpGroups.go b/service/workspaces/api_op_DescribeIpGroups.go index b74b4e6b09e..6021a99020d 100644 --- a/service/workspaces/api_op_DescribeIpGroups.go +++ b/service/workspaces/api_op_DescribeIpGroups.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeIpGroups(ctx context.Context, params *DescribeIpGroupsI addawsAwsjson11_serdeOpDescribeIpGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_DescribeTags.go b/service/workspaces/api_op_DescribeTags.go index dff820b1f6e..e6258ec6875 100644 --- a/service/workspaces/api_op_DescribeTags.go +++ b/service/workspaces/api_op_DescribeTags.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeTags(ctx context.Context, params *DescribeTagsInput, op addawsAwsjson11_serdeOpDescribeTagsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_DescribeWorkspaceBundles.go b/service/workspaces/api_op_DescribeWorkspaceBundles.go index 685e8340c80..700ec84b7c9 100644 --- a/service/workspaces/api_op_DescribeWorkspaceBundles.go +++ b/service/workspaces/api_op_DescribeWorkspaceBundles.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeWorkspaceBundles(ctx context.Context, params *DescribeW addawsAwsjson11_serdeOpDescribeWorkspaceBundlesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_DescribeWorkspaceDirectories.go b/service/workspaces/api_op_DescribeWorkspaceDirectories.go index e7ce068ef69..3aa72bc442f 100644 --- a/service/workspaces/api_op_DescribeWorkspaceDirectories.go +++ b/service/workspaces/api_op_DescribeWorkspaceDirectories.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeWorkspaceDirectories(ctx context.Context, params *Descr addawsAwsjson11_serdeOpDescribeWorkspaceDirectoriesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_DescribeWorkspaceImagePermissions.go b/service/workspaces/api_op_DescribeWorkspaceImagePermissions.go index 5eca1f4b023..bd96383f39b 100644 --- a/service/workspaces/api_op_DescribeWorkspaceImagePermissions.go +++ b/service/workspaces/api_op_DescribeWorkspaceImagePermissions.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeWorkspaceImagePermissions(ctx context.Context, params * addawsAwsjson11_serdeOpDescribeWorkspaceImagePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_DescribeWorkspaceImages.go b/service/workspaces/api_op_DescribeWorkspaceImages.go index 45ec8321f80..86165efd5b5 100644 --- a/service/workspaces/api_op_DescribeWorkspaceImages.go +++ b/service/workspaces/api_op_DescribeWorkspaceImages.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) DescribeWorkspaceImages(ctx context.Context, params *DescribeWo addawsAwsjson11_serdeOpDescribeWorkspaceImagesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_DescribeWorkspaceSnapshots.go b/service/workspaces/api_op_DescribeWorkspaceSnapshots.go index 861348eeba7..7d19c559b34 100644 --- a/service/workspaces/api_op_DescribeWorkspaceSnapshots.go +++ b/service/workspaces/api_op_DescribeWorkspaceSnapshots.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeWorkspaceSnapshots(ctx context.Context, params *Describ addawsAwsjson11_serdeOpDescribeWorkspaceSnapshotsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_DescribeWorkspaces.go b/service/workspaces/api_op_DescribeWorkspaces.go index 0ce6004c8b7..b5dad0ef822 100644 --- a/service/workspaces/api_op_DescribeWorkspaces.go +++ b/service/workspaces/api_op_DescribeWorkspaces.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) DescribeWorkspaces(ctx context.Context, params *DescribeWorkspa addawsAwsjson11_serdeOpDescribeWorkspacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_DescribeWorkspacesConnectionStatus.go b/service/workspaces/api_op_DescribeWorkspacesConnectionStatus.go index d1ce89c560a..8a63b0280e3 100644 --- a/service/workspaces/api_op_DescribeWorkspacesConnectionStatus.go +++ b/service/workspaces/api_op_DescribeWorkspacesConnectionStatus.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DescribeWorkspacesConnectionStatus(ctx context.Context, params addawsAwsjson11_serdeOpDescribeWorkspacesConnectionStatusMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_DisassociateIpGroups.go b/service/workspaces/api_op_DisassociateIpGroups.go index 5eaa36126e0..c6d3f9e2764 100644 --- a/service/workspaces/api_op_DisassociateIpGroups.go +++ b/service/workspaces/api_op_DisassociateIpGroups.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -23,9 +22,9 @@ func (c *Client) DisassociateIpGroups(ctx context.Context, params *DisassociateI addawsAwsjson11_serdeOpDisassociateIpGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_ImportWorkspaceImage.go b/service/workspaces/api_op_ImportWorkspaceImage.go index 483460e8b9d..afbff07d426 100644 --- a/service/workspaces/api_op_ImportWorkspaceImage.go +++ b/service/workspaces/api_op_ImportWorkspaceImage.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ImportWorkspaceImage(ctx context.Context, params *ImportWorkspa addawsAwsjson11_serdeOpImportWorkspaceImageMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_ListAvailableManagementCidrRanges.go b/service/workspaces/api_op_ListAvailableManagementCidrRanges.go index b966716f16b..9a6f7b94f09 100644 --- a/service/workspaces/api_op_ListAvailableManagementCidrRanges.go +++ b/service/workspaces/api_op_ListAvailableManagementCidrRanges.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -27,9 +26,9 @@ func (c *Client) ListAvailableManagementCidrRanges(ctx context.Context, params * addawsAwsjson11_serdeOpListAvailableManagementCidrRangesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_MigrateWorkspace.go b/service/workspaces/api_op_MigrateWorkspace.go index 097fe3dfba6..aacf7bc3dbf 100644 --- a/service/workspaces/api_op_MigrateWorkspace.go +++ b/service/workspaces/api_op_MigrateWorkspace.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -33,9 +32,9 @@ func (c *Client) MigrateWorkspace(ctx context.Context, params *MigrateWorkspaceI addawsAwsjson11_serdeOpMigrateWorkspaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_ModifyAccount.go b/service/workspaces/api_op_ModifyAccount.go index c54070423a6..0566d3732ae 100644 --- a/service/workspaces/api_op_ModifyAccount.go +++ b/service/workspaces/api_op_ModifyAccount.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) ModifyAccount(ctx context.Context, params *ModifyAccountInput, addawsAwsjson11_serdeOpModifyAccountMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_ModifyClientProperties.go b/service/workspaces/api_op_ModifyClientProperties.go index c19df33b638..18182aae58d 100644 --- a/service/workspaces/api_op_ModifyClientProperties.go +++ b/service/workspaces/api_op_ModifyClientProperties.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifyClientProperties(ctx context.Context, params *ModifyClien addawsAwsjson11_serdeOpModifyClientPropertiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_ModifySelfservicePermissions.go b/service/workspaces/api_op_ModifySelfservicePermissions.go index c2e4ab17134..596829449df 100644 --- a/service/workspaces/api_op_ModifySelfservicePermissions.go +++ b/service/workspaces/api_op_ModifySelfservicePermissions.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -26,9 +25,9 @@ func (c *Client) ModifySelfservicePermissions(ctx context.Context, params *Modif addawsAwsjson11_serdeOpModifySelfservicePermissionsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_ModifyWorkspaceAccessProperties.go b/service/workspaces/api_op_ModifyWorkspaceAccessProperties.go index 659e50144dc..98d9620c342 100644 --- a/service/workspaces/api_op_ModifyWorkspaceAccessProperties.go +++ b/service/workspaces/api_op_ModifyWorkspaceAccessProperties.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ModifyWorkspaceAccessProperties(ctx context.Context, params *Mo addawsAwsjson11_serdeOpModifyWorkspaceAccessPropertiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_ModifyWorkspaceCreationProperties.go b/service/workspaces/api_op_ModifyWorkspaceCreationProperties.go index 1b86fbfb160..dc9a6181551 100644 --- a/service/workspaces/api_op_ModifyWorkspaceCreationProperties.go +++ b/service/workspaces/api_op_ModifyWorkspaceCreationProperties.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) ModifyWorkspaceCreationProperties(ctx context.Context, params * addawsAwsjson11_serdeOpModifyWorkspaceCreationPropertiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_ModifyWorkspaceProperties.go b/service/workspaces/api_op_ModifyWorkspaceProperties.go index c987ebe13b3..be30667f977 100644 --- a/service/workspaces/api_op_ModifyWorkspaceProperties.go +++ b/service/workspaces/api_op_ModifyWorkspaceProperties.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) ModifyWorkspaceProperties(ctx context.Context, params *ModifyWo addawsAwsjson11_serdeOpModifyWorkspacePropertiesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_ModifyWorkspaceState.go b/service/workspaces/api_op_ModifyWorkspaceState.go index e8c9a429048..2a3786e5644 100644 --- a/service/workspaces/api_op_ModifyWorkspaceState.go +++ b/service/workspaces/api_op_ModifyWorkspaceState.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -27,9 +26,9 @@ func (c *Client) ModifyWorkspaceState(ctx context.Context, params *ModifyWorkspa addawsAwsjson11_serdeOpModifyWorkspaceStateMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_RebootWorkspaces.go b/service/workspaces/api_op_RebootWorkspaces.go index 41efc9d68dd..d1d5d6fd4b1 100644 --- a/service/workspaces/api_op_RebootWorkspaces.go +++ b/service/workspaces/api_op_RebootWorkspaces.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) RebootWorkspaces(ctx context.Context, params *RebootWorkspacesI addawsAwsjson11_serdeOpRebootWorkspacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_RebuildWorkspaces.go b/service/workspaces/api_op_RebuildWorkspaces.go index 43111e547d5..aecdcc47da6 100644 --- a/service/workspaces/api_op_RebuildWorkspaces.go +++ b/service/workspaces/api_op_RebuildWorkspaces.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) RebuildWorkspaces(ctx context.Context, params *RebuildWorkspace addawsAwsjson11_serdeOpRebuildWorkspacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_RegisterWorkspaceDirectory.go b/service/workspaces/api_op_RegisterWorkspaceDirectory.go index b932088253c..9f5a4cff7c9 100644 --- a/service/workspaces/api_op_RegisterWorkspaceDirectory.go +++ b/service/workspaces/api_op_RegisterWorkspaceDirectory.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) RegisterWorkspaceDirectory(ctx context.Context, params *Registe addawsAwsjson11_serdeOpRegisterWorkspaceDirectoryMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_RestoreWorkspace.go b/service/workspaces/api_op_RestoreWorkspace.go index 7f4dcf2f174..86a71d3fd44 100644 --- a/service/workspaces/api_op_RestoreWorkspace.go +++ b/service/workspaces/api_op_RestoreWorkspace.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -28,9 +27,9 @@ func (c *Client) RestoreWorkspace(ctx context.Context, params *RestoreWorkspaceI addawsAwsjson11_serdeOpRestoreWorkspaceMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_RevokeIpRules.go b/service/workspaces/api_op_RevokeIpRules.go index 730e4d5e718..f938e708719 100644 --- a/service/workspaces/api_op_RevokeIpRules.go +++ b/service/workspaces/api_op_RevokeIpRules.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) RevokeIpRules(ctx context.Context, params *RevokeIpRulesInput, addawsAwsjson11_serdeOpRevokeIpRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_StartWorkspaces.go b/service/workspaces/api_op_StartWorkspaces.go index 9069a7f6072..94730afacd9 100644 --- a/service/workspaces/api_op_StartWorkspaces.go +++ b/service/workspaces/api_op_StartWorkspaces.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) StartWorkspaces(ctx context.Context, params *StartWorkspacesInp addawsAwsjson11_serdeOpStartWorkspacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_StopWorkspaces.go b/service/workspaces/api_op_StopWorkspaces.go index 90c5e1c6081..0f3ba9f8a2b 100644 --- a/service/workspaces/api_op_StopWorkspaces.go +++ b/service/workspaces/api_op_StopWorkspaces.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) StopWorkspaces(ctx context.Context, params *StopWorkspacesInput addawsAwsjson11_serdeOpStopWorkspacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_TerminateWorkspaces.go b/service/workspaces/api_op_TerminateWorkspaces.go index 5c612a9ce46..cdd8e2253b6 100644 --- a/service/workspaces/api_op_TerminateWorkspaces.go +++ b/service/workspaces/api_op_TerminateWorkspaces.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -28,9 +27,9 @@ func (c *Client) TerminateWorkspaces(ctx context.Context, params *TerminateWorks addawsAwsjson11_serdeOpTerminateWorkspacesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_UpdateRulesOfIpGroup.go b/service/workspaces/api_op_UpdateRulesOfIpGroup.go index 67edb060f03..99fa85f6c7d 100644 --- a/service/workspaces/api_op_UpdateRulesOfIpGroup.go +++ b/service/workspaces/api_op_UpdateRulesOfIpGroup.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/workspaces/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) UpdateRulesOfIpGroup(ctx context.Context, params *UpdateRulesOf addawsAwsjson11_serdeOpUpdateRulesOfIpGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/api_op_UpdateWorkspaceImagePermission.go b/service/workspaces/api_op_UpdateWorkspaceImagePermission.go index 02c58980d4d..19644712da5 100644 --- a/service/workspaces/api_op_UpdateWorkspaceImagePermission.go +++ b/service/workspaces/api_op_UpdateWorkspaceImagePermission.go @@ -5,7 +5,6 @@ package workspaces import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -30,9 +29,9 @@ func (c *Client) UpdateWorkspaceImagePermission(ctx context.Context, params *Upd addawsAwsjson11_serdeOpUpdateWorkspaceImagePermissionMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/workspaces/endpoints.go b/service/workspaces/endpoints.go index 5a3b10ad07d..c9e427bc102 100644 --- a/service/workspaces/endpoints.go +++ b/service/workspaces/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) } diff --git a/service/xray/api_client.go b/service/xray/api_client.go index 11bc6ecb889..892bdaede13 100644 --- a/service/xray/api_client.go +++ b/service/xray/api_client.go @@ -78,30 +78,6 @@ type Options struct { HTTPClient HTTPClient } -func (o Options) GetCredentials() aws.CredentialsProvider { - return o.Credentials -} - -func (o Options) GetEndpointOptions() ResolverOptions { - return o.EndpointOptions -} - -func (o Options) GetEndpointResolver() EndpointResolver { - return o.EndpointResolver -} - -func (o Options) GetHTTPSignerV4() HTTPSignerV4 { - return o.HTTPSignerV4 -} - -func (o Options) GetRegion() string { - return o.Region -} - -func (o Options) GetRetryer() retry.Retryer { - return o.Retryer -} - type HTTPClient interface { Do(*http.Request) (*http.Response, error) } @@ -167,6 +143,13 @@ func resolveHTTPSignerV4(o *Options) { o.HTTPSignerV4 = v4.NewSigner() } +func addRetryMiddlewares(stack *middleware.Stack, o Options) error { + mo := retry.AddRetryMiddlewaresOptions{ + Retryer: o.Retryer, + } + return retry.AddRetryMiddlewares(stack, mo) +} + func addRequestIDRetrieverMiddleware(stack *middleware.Stack) { awsmiddleware.AddRequestIDRetrieverMiddleware(stack) } diff --git a/service/xray/api_op_BatchGetTraces.go b/service/xray/api_op_BatchGetTraces.go index ef716bffac0..c7f396acb03 100644 --- a/service/xray/api_op_BatchGetTraces.go +++ b/service/xray/api_op_BatchGetTraces.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) BatchGetTraces(ctx context.Context, params *BatchGetTracesInput addawsRestjson1_serdeOpBatchGetTracesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_CreateGroup.go b/service/xray/api_op_CreateGroup.go index 6c5b652fd9e..d12136237c0 100644 --- a/service/xray/api_op_CreateGroup.go +++ b/service/xray/api_op_CreateGroup.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) CreateGroup(ctx context.Context, params *CreateGroupInput, optF addawsRestjson1_serdeOpCreateGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_CreateSamplingRule.go b/service/xray/api_op_CreateSamplingRule.go index bf6a72ad58c..1b869213f39 100644 --- a/service/xray/api_op_CreateSamplingRule.go +++ b/service/xray/api_op_CreateSamplingRule.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) CreateSamplingRule(ctx context.Context, params *CreateSamplingR addawsRestjson1_serdeOpCreateSamplingRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_DeleteGroup.go b/service/xray/api_op_DeleteGroup.go index 8fb16c2ab76..ecb4f956399 100644 --- a/service/xray/api_op_DeleteGroup.go +++ b/service/xray/api_op_DeleteGroup.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" smithy "github.com/awslabs/smithy-go" "github.com/awslabs/smithy-go/middleware" @@ -22,9 +21,9 @@ func (c *Client) DeleteGroup(ctx context.Context, params *DeleteGroupInput, optF addawsRestjson1_serdeOpDeleteGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_DeleteSamplingRule.go b/service/xray/api_op_DeleteSamplingRule.go index a96e1bc52d7..20ae99bd1f5 100644 --- a/service/xray/api_op_DeleteSamplingRule.go +++ b/service/xray/api_op_DeleteSamplingRule.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) DeleteSamplingRule(ctx context.Context, params *DeleteSamplingR addawsRestjson1_serdeOpDeleteSamplingRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_GetEncryptionConfig.go b/service/xray/api_op_GetEncryptionConfig.go index f53d4091ba5..d4a9d5cab12 100644 --- a/service/xray/api_op_GetEncryptionConfig.go +++ b/service/xray/api_op_GetEncryptionConfig.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetEncryptionConfig(ctx context.Context, params *GetEncryptionC addawsRestjson1_serdeOpGetEncryptionConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_GetGroup.go b/service/xray/api_op_GetGroup.go index 1091f93c205..c9001c46b3b 100644 --- a/service/xray/api_op_GetGroup.go +++ b/service/xray/api_op_GetGroup.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetGroup(ctx context.Context, params *GetGroupInput, optFns ... addawsRestjson1_serdeOpGetGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_GetGroups.go b/service/xray/api_op_GetGroups.go index 47a7c7ce7e8..b648411fc88 100644 --- a/service/xray/api_op_GetGroups.go +++ b/service/xray/api_op_GetGroups.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetGroups(ctx context.Context, params *GetGroupsInput, optFns . addawsRestjson1_serdeOpGetGroupsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_GetSamplingRules.go b/service/xray/api_op_GetSamplingRules.go index 4aa682aef94..77febe730ea 100644 --- a/service/xray/api_op_GetSamplingRules.go +++ b/service/xray/api_op_GetSamplingRules.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetSamplingRules(ctx context.Context, params *GetSamplingRulesI addawsRestjson1_serdeOpGetSamplingRulesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_GetSamplingStatisticSummaries.go b/service/xray/api_op_GetSamplingStatisticSummaries.go index 15e8980bb91..4a042caf716 100644 --- a/service/xray/api_op_GetSamplingStatisticSummaries.go +++ b/service/xray/api_op_GetSamplingStatisticSummaries.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetSamplingStatisticSummaries(ctx context.Context, params *GetS addawsRestjson1_serdeOpGetSamplingStatisticSummariesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_GetSamplingTargets.go b/service/xray/api_op_GetSamplingTargets.go index b7d55ace0fe..b44268779cd 100644 --- a/service/xray/api_op_GetSamplingTargets.go +++ b/service/xray/api_op_GetSamplingTargets.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -25,9 +24,9 @@ func (c *Client) GetSamplingTargets(ctx context.Context, params *GetSamplingTarg addawsRestjson1_serdeOpGetSamplingTargetsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_GetServiceGraph.go b/service/xray/api_op_GetServiceGraph.go index 0405687d9b2..2d71876f99c 100644 --- a/service/xray/api_op_GetServiceGraph.go +++ b/service/xray/api_op_GetServiceGraph.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -29,9 +28,9 @@ func (c *Client) GetServiceGraph(ctx context.Context, params *GetServiceGraphInp addawsRestjson1_serdeOpGetServiceGraphMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_GetTimeSeriesServiceStatistics.go b/service/xray/api_op_GetTimeSeriesServiceStatistics.go index e9413cbd321..860cf2a34a7 100644 --- a/service/xray/api_op_GetTimeSeriesServiceStatistics.go +++ b/service/xray/api_op_GetTimeSeriesServiceStatistics.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -24,9 +23,9 @@ func (c *Client) GetTimeSeriesServiceStatistics(ctx context.Context, params *Get addawsRestjson1_serdeOpGetTimeSeriesServiceStatisticsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_GetTraceGraph.go b/service/xray/api_op_GetTraceGraph.go index de7887dfa3d..24cc8673b50 100644 --- a/service/xray/api_op_GetTraceGraph.go +++ b/service/xray/api_op_GetTraceGraph.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) GetTraceGraph(ctx context.Context, params *GetTraceGraphInput, addawsRestjson1_serdeOpGetTraceGraphMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_GetTraceSummaries.go b/service/xray/api_op_GetTraceSummaries.go index 4910cbc0d52..b9487348371 100644 --- a/service/xray/api_op_GetTraceSummaries.go +++ b/service/xray/api_op_GetTraceSummaries.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -34,9 +33,9 @@ func (c *Client) GetTraceSummaries(ctx context.Context, params *GetTraceSummarie addawsRestjson1_serdeOpGetTraceSummariesMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_PutEncryptionConfig.go b/service/xray/api_op_PutEncryptionConfig.go index 2fbb424e3b8..a0e1c5bf6c8 100644 --- a/service/xray/api_op_PutEncryptionConfig.go +++ b/service/xray/api_op_PutEncryptionConfig.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutEncryptionConfig(ctx context.Context, params *PutEncryptionC addawsRestjson1_serdeOpPutEncryptionConfigMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_PutTelemetryRecords.go b/service/xray/api_op_PutTelemetryRecords.go index 286b5a382af..04c493a5a40 100644 --- a/service/xray/api_op_PutTelemetryRecords.go +++ b/service/xray/api_op_PutTelemetryRecords.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) PutTelemetryRecords(ctx context.Context, params *PutTelemetryRe addawsRestjson1_serdeOpPutTelemetryRecordsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_PutTraceSegments.go b/service/xray/api_op_PutTraceSegments.go index 5d9cc1a7d3a..cba6f4be9d4 100644 --- a/service/xray/api_op_PutTraceSegments.go +++ b/service/xray/api_op_PutTraceSegments.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -69,9 +68,9 @@ func (c *Client) PutTraceSegments(ctx context.Context, params *PutTraceSegmentsI addawsRestjson1_serdeOpPutTraceSegmentsMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_UpdateGroup.go b/service/xray/api_op_UpdateGroup.go index 14917f5e730..eb8c944fe4e 100644 --- a/service/xray/api_op_UpdateGroup.go +++ b/service/xray/api_op_UpdateGroup.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateGroup(ctx context.Context, params *UpdateGroupInput, optF addawsRestjson1_serdeOpUpdateGroupMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/api_op_UpdateSamplingRule.go b/service/xray/api_op_UpdateSamplingRule.go index 49d8e997104..1930aad8cf8 100644 --- a/service/xray/api_op_UpdateSamplingRule.go +++ b/service/xray/api_op_UpdateSamplingRule.go @@ -5,7 +5,6 @@ package xray import ( "context" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/xray/types" smithy "github.com/awslabs/smithy-go" @@ -23,9 +22,9 @@ func (c *Client) UpdateSamplingRule(ctx context.Context, params *UpdateSamplingR addawsRestjson1_serdeOpUpdateSamplingRuleMiddlewares(stack) awsmiddleware.AddRequestInvocationIDMiddleware(stack) smithyhttp.AddContentLengthMiddleware(stack) - AddResolveEndpointMiddleware(stack, options) + addResolveEndpointMiddleware(stack, options) v4.AddComputePayloadSHA256Middleware(stack) - retry.AddRetryMiddlewares(stack, options) + addRetryMiddlewares(stack, options) addHTTPSignerV4Middleware(stack, options) awsmiddleware.AddAttemptClockSkewMiddleware(stack) addClientUserAgent(stack) diff --git a/service/xray/endpoints.go b/service/xray/endpoints.go index 0ff45f930cb..b7004b77869 100644 --- a/service/xray/endpoints.go +++ b/service/xray/endpoints.go @@ -88,20 +88,14 @@ func (m *ResolveEndpoint) HandleSerialize(ctx context.Context, in middleware.Ser return next.HandleSerialize(ctx, in) } - -type ResolveEndpointMiddlewareOptions interface { - GetEndpointResolver() EndpointResolver - GetEndpointOptions() ResolverOptions -} - -func AddResolveEndpointMiddleware(stack *middleware.Stack, options ResolveEndpointMiddlewareOptions) { - stack.Serialize.Insert(&ResolveEndpoint{ - Resolver: options.GetEndpointResolver(), - Options: options.GetEndpointOptions(), +func addResolveEndpointMiddleware(stack *middleware.Stack, o Options) error { + return stack.Serialize.Insert(&ResolveEndpoint{ + Resolver: o.EndpointResolver, + Options: o.EndpointOptions, }, "OperationSerializer", middleware.Before) } -func RemoveResolveEndpointMiddleware(stack *middleware.Stack) error { +func removeResolveEndpointMiddleware(stack *middleware.Stack) error { return stack.Serialize.Remove((&ResolveEndpoint{}).ID()) }